From 88adb52b58f997746f36a5fd1ab51622998ce1f4 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Wed, 9 Aug 2023 08:25:07 -0500
Subject: [PATCH 01/63] re-enable instant transmission

---
 Archipelago/ArchipelagoClient.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
index 1c2d9a6..9e9f2ee 100644
--- a/Archipelago/ArchipelagoClient.cs
+++ b/Archipelago/ArchipelagoClient.cs
@@ -87,7 +87,7 @@ private static ArchipelagoSession CreateSession()
         {
             var session = ArchipelagoSessionFactory.CreateSession(ServerData.Uri, ServerData.Port);
             session.MessageLog.OnMessageReceived += OnMessageReceived;
-            // session.Items.ItemReceived += ItemReceived;
+            session.Items.ItemReceived += ItemReceived;
             session.Socket.ErrorReceived += SessionErrorReceived;
             session.Socket.SocketClosed += SessionSocketClosed;
             return session;
@@ -188,10 +188,18 @@ public static void SyncLocations()
 
         private static void ItemReceived(ReceivedItemsHelper helper)
         {
-            if (RandomizerStateManager.Instance.CurrentFileSlot == 0 || 
-                ServerData.Index >= Session.Items.AllItemsReceived.Count) return;
+            if (RandomizerStateManager.Instance.CurrentFileSlot == 0) return;
             Console.WriteLine("ItemReceived called");
-            ItemsAndLocationsHandler.Unlock(helper.DequeueItem().Item);
+            if (ServerData.Index > helper.Index)
+            {
+                helper.DequeueItem();
+                return;
+            }
+
+            var currentItem = helper.DequeueItem();
+            ItemsAndLocationsHandler.Unlock(currentItem.Item);
+            if (!currentItem.Player.Equals(Session.ConnectionInfo.Slot))
+                DialogChanger.CreateDialogBox($"Received {currentItem.ColorizeItem()}!");
             ServerData.Index++;
         }
 

From 5fad02cb43c71f16028db39c6680fadb18fbe96f Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Wed, 9 Aug 2023 08:35:02 -0500
Subject: [PATCH 02/63] update lib

---
 MessengerRando.csproj         | 8 ++++----
 Utils/RandomizerSaveMethod.cs | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/MessengerRando.csproj b/MessengerRando.csproj
index f5076ae..c57168d 100644
--- a/MessengerRando.csproj
+++ b/MessengerRando.csproj
@@ -35,8 +35,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Archipelago.MultiClient.Net, Version=5.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Archipelago.MultiClient.Net.5.0.3\lib\net35\Archipelago.MultiClient.Net.dll</HintPath>
+    <Reference Include="Archipelago.MultiClient.Net, Version=5.0.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Archipelago.MultiClient.Net.5.0.6\lib\net35\Archipelago.MultiClient.Net.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>C:\Program Files (x86)\Steam\steamapps\common\The Messenger\TheMessenger_Data\Managed\Assembly-CSharp.dll</HintPath>
@@ -59,7 +59,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Archipelago.MultiClient.Net.5.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
+      <HintPath>packages\Archipelago.MultiClient.Net.5.0.6\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine">
       <HintPath>C:\Program Files (x86)\Steam\steamapps\common\The Messenger\TheMessenger_Data\Managed\UnityEngine.dll</HintPath>
@@ -82,7 +82,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="websocket-sharp, Version=1.0.2.34775, Culture=neutral, PublicKeyToken=5660b08a1845a91e, processorArchitecture=MSIL">
-      <HintPath>packages\Archipelago.MultiClient.Net.5.0.3\lib\net35\websocket-sharp.dll</HintPath>
+      <HintPath>packages\Archipelago.MultiClient.Net.5.0.6\lib\net35\websocket-sharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Utils/RandomizerSaveMethod.cs b/Utils/RandomizerSaveMethod.cs
index aebda33..bfec3a4 100644
--- a/Utils/RandomizerSaveMethod.cs
+++ b/Utils/RandomizerSaveMethod.cs
@@ -1,11 +1,10 @@
 using System;
 using MessengerRando.Archipelago;
-using MessengerRando.Utils;
 using Newtonsoft.Json;
 
-namespace MessengerRando
+namespace MessengerRando.Utils
 {
-    public class RandomizerSaveMethod
+    public static class RandomizerSaveMethod
     {
         private const char SplitConst = '|';
 

From 53c03e11a2c22f9790a371b6c15fae72d76b27dd Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 3 Sep 2023 17:15:44 -0500
Subject: [PATCH 03/63] prelim work on new menus

---
 APRandomizerMain.cs              |  27 +-
 MessengerRando.csproj            |   1 +
 Utils/Constants/RoomConstants.cs |   2 +-
 Utils/RandoMenu.cs               | 464 +++++++++++++++++++++++++++++++
 4 files changed, 490 insertions(+), 4 deletions(-)
 create mode 100644 Utils/RandoMenu.cs

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 112d62c..e03316a 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -125,6 +125,20 @@ public override void Load()
             //Add Archipelago collect button
             archipelagoCollectButton = Courier.UI.RegisterSubMenuModOptionButton(() => "Collect remaining items", OnSelectArchipelagoCollect);
 
+            RandoMenu.ArchipelagoMenuButton = Courier.UI.RegisterSubMenuOptionButton(() => "Randomizer", RandoMenu.DisplayRandoMenu);
+            
+            PopulateRandoButtons();
+            
+            void PopulateRandoButtons()
+            {
+                RandoMenu.versionButton =
+                    RandoMenu.RegisterSubRandoButton(
+                        () => "Messenger AP Randomizer: v" + ItemRandomizerUtil.GetModVersion(), null);
+                RandoMenu.connectMenuButton = RandoMenu.RegisterSubRandoButton(() => "Connect to Archipelago", null);
+                RandoMenu.resetSaveButton = RandoMenu.RegisterMultipleRandoButton(() => "Reset Randomizer File Slot", null,
+                    ResetSaves, null, RandoMenu.GetTextForResetIndex);
+            }
+
             //Plug in my code :3
             On.InventoryManager.AddItem += InventoryManager_AddItem;
             On.ProgressionManager.SetChallengeRoomAsCompleted += ProgressionManager_SetChallengeRoomAsCompleted;
@@ -631,6 +645,12 @@ bool OnRandoFileResetConfirmation(string answer)
                 return true;
             }
 
+            ConfirmFileReset();
+            return true;
+        }
+        
+        void ConfirmFileReset()
+        {
             ArchipelagoData.ClearData();
             randoStateManager = new RandomizerStateManager();
             clearedData = true;
@@ -640,15 +660,16 @@ bool OnRandoFileResetConfirmation(string answer)
             {
                 sw.WriteLine(RandomizerConstants.SAVE_FILE_STRING);
             }
-            
+
             Manager<SaveManager>.Instance.LoadSaveGame();
             //Delete the existing save file selection ui since it really wants to hold on to the previous saves data.
             GameObject.Destroy(Manager<UIManager>.Instance.GetView<SaveGameSelectionScreen>().gameObject);
             //Reinit the save file selection ui.
-            SaveGameSelectionScreen selectionScreen = Manager<UIManager>.Instance.ShowView<SaveGameSelectionScreen>(EScreenLayers.MAIN, null, false, AnimatorUpdateMode.Normal);
+            SaveGameSelectionScreen selectionScreen =
+                Manager<UIManager>.Instance.ShowView<SaveGameSelectionScreen>(EScreenLayers.MAIN, null, false,
+                    AnimatorUpdateMode.Normal);
             selectionScreen.GoOffscreenInstant();
 
-            return true;
         }
 
         public static void OnToggleWindmillShuriken()
diff --git a/MessengerRando.csproj b/MessengerRando.csproj
index c57168d..73081df 100644
--- a/MessengerRando.csproj
+++ b/MessengerRando.csproj
@@ -103,6 +103,7 @@
     <Compile Include="Utils\Constants\BossConstants.cs" />
     <Compile Include="Utils\Constants\LevelConstants.cs" />
     <Compile Include="Utils\Constants\RoomConstants.cs" />
+    <Compile Include="Utils\RandoMenu.cs" />
     <Compile Include="Utils\RandoSave.cs" />
     <Compile Include="Utils\LocationInfo.cs" />
     <Compile Include="Utils\DialogChanger.cs" />
diff --git a/Utils/Constants/RoomConstants.cs b/Utils/Constants/RoomConstants.cs
index 4ac44bc..6ca789f 100644
--- a/Utils/Constants/RoomConstants.cs
+++ b/Utils/Constants/RoomConstants.cs
@@ -6,7 +6,7 @@
 
 namespace MessengerRando.Utils.Constants
 {
-    public class RoomConstants
+    public static class RoomConstants
     {
         public struct RoomTransition: IEquatable<RoomTransition>
         {
diff --git a/Utils/RandoMenu.cs b/Utils/RandoMenu.cs
new file mode 100644
index 0000000..b8fe3e0
--- /dev/null
+++ b/Utils/RandoMenu.cs
@@ -0,0 +1,464 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using MessengerRando.Archipelago;
+using Mod.Courier;
+using Mod.Courier.UI;
+using TMPro;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+namespace MessengerRando.Utils
+{
+    public class RandoMenu
+    {
+        public static OptionsButtonInfo ArchipelagoMenuButton;
+        private static RandoScreen randoScreen;
+
+        public static SubMenuButtonInfo versionButton;
+        public static SubMenuButtonInfo connectMenuButton;
+        public static MultipleOptionButtonInfo resetSaveButton;
+
+
+        public static void DisplayRandoMenu()
+        {
+            Manager<UIManager>.Instance.GetView<OptionScreen>().gameObject.SetActive(false);
+            if (!RandoScreen.RandoScreenLoaded)
+                randoScreen = RandoScreen.BuildModOptionScreen(Manager<UIManager>.Instance.GetView<OptionScreen>());
+
+            Courier.UI.ShowView(randoScreen, EScreenLayers.PROMPT, null, false);
+        }
+
+        public class RandoScreen : ModOptionScreen
+        {
+            public static bool RandoScreenLoaded;
+            public static readonly List<OptionsButtonInfo> OptionButtons = new List<OptionsButtonInfo>();
+
+            private static int OptionsCount()
+            {
+                return OptionButtons.Count(modOptionButton => modOptionButton.gameObject.activeInHierarchy);
+            }
+
+            private static int EnabledModOptionsBeforeButton(OptionsButtonInfo button)
+            {
+                int num = 0;
+                foreach (OptionsButtonInfo modOptionButton in OptionButtons)
+                {
+                    if (modOptionButton.Equals(button))
+                        return num;
+                    if (modOptionButton.gameObject.activeInHierarchy)
+                        ++num;
+                }
+
+                return -1;
+            }
+
+            public void InitOptionsViewWithModButtons()
+            {
+                var view = this;
+                OptionScreen optionScreen = Manager<UIManager>.Instance.GetView<OptionScreen>();
+                Transform parent = view.transform.Find("Container").Find("BackgroundFrame").Find("OptionsFrame")
+                    .Find("OptionMenuButtons");
+                foreach (OptionsButtonInfo button in OptionButtons)
+                {
+                    switch (button)
+                    {
+                        case ToggleButtonInfo _:
+                            button.gameObject = Instantiate(optionScreen.fullscreenOption, parent);
+                            break;
+                        case SubMenuButtonInfo _:
+                            button.gameObject = Instantiate(optionScreen.controlsButton.transform.parent.gameObject,
+                                parent);
+                            break;
+                        case MultipleOptionButtonInfo _:
+                            button.gameObject = Instantiate(optionScreen.languageOption, parent);
+                            break;
+                        default:
+                            CourierLogger.Log(LogType.Warning, "OptionsMenu",
+                                button.GetType()?.ToString() + " not a known type of OptionsButtonInfo!");
+                            break;
+                    }
+
+                    button.gameObject.transform.SetAsLastSibling();
+                    GameObject gameObject = button.gameObject;
+                    Func<string> getText = button.GetText;
+                    string str = getText?.Invoke() ?? "Nameless Modded Options Button";
+                    gameObject.name = str;
+                    button.addedTo = view;
+                    foreach (TextMeshProUGUI componentsInChild in button.gameObject
+                                 .GetComponentsInChildren<TextMeshProUGUI>())
+                    {
+                        if (componentsInChild.name.Equals("OptionState") || componentsInChild.name.Equals("Text"))
+                            button.stateTextMesh = componentsInChild;
+                        if (componentsInChild.name.Equals("OptionName"))
+                        {
+                            button.nameTextMesh = componentsInChild;
+                            TextLocalizer component = componentsInChild.GetComponent<TextLocalizer>();
+                            if (component != null)
+                                component.locID = "";
+                        }
+                    }
+
+                    Button component1 = button.gameObject.transform.Find("Button").GetComponent<Button>();
+                    component1.onClick = new Button.ButtonClickedEvent();
+                    component1.onClick.AddListener(button.onClick);
+                    button.OnInit(view);
+                }
+
+                parent.Find("Back")?.SetAsLastSibling();
+            }
+
+            public new static RandoScreen BuildModOptionScreen(OptionScreen optionScreen)
+            {
+                GameObject gameObject = new GameObject();
+                RandoScreen randoScreen = gameObject.AddComponent<RandoScreen>();
+                OptionScreen newScreen = Instantiate(optionScreen);
+                randoScreen.name = "RandoScreen";
+                // Swap everything under the option screen to the mod option screen
+                // Iterate backwards so elements don't shift as lower ones are removed
+                for (int i = newScreen.transform.childCount - 1; i >= 0; i--)
+                {
+                    newScreen.transform.GetChild(i).SetParent(randoScreen.transform, false);
+                }
+
+                randoScreen.optionMenuButtons = randoScreen.transform.Find("Container").Find("BackgroundFrame")
+                    .Find("OptionsFrame").Find("OptionMenuButtons");
+                randoScreen.backButton = randoScreen.optionMenuButtons.Find("Back");
+                // Delete OptionScreen buttons except for the Back button
+                foreach (Transform child in randoScreen.optionMenuButtons.GetChildren())
+                {
+                    if (!child.Equals(randoScreen.backButton))
+                        Destroy(child.gameObject);
+                }
+
+                //TODO put back if things brake
+                // randoScreen.optionMenuButtons.DetachChildren();
+                randoScreen.backButton.SetParent(randoScreen.optionMenuButtons);
+
+                // Make back button take you to the OptionScreen instead of the pause menu
+                Button button = randoScreen.backButton.GetComponentInChildren<Button>();
+                button.onClick = new Button.ButtonClickedEvent();
+                button.onClick.AddListener(randoScreen.BackToOptionMenu);
+
+                randoScreen.InitStuffUnityWouldDo();
+
+                randoScreen.gameObject.SetActive(false);
+                RandoScreenLoaded = true;
+                return randoScreen;
+            }
+
+            private void InitStuffUnityWouldDo()
+            {
+                //transform.position = new Vector3(0, Math.Max(-90 - heightPerButton * Courier.UI.ModOptionButtons.Count, startYMax));
+                backgroundFrame = (RectTransform)transform.Find("Container").Find("BackgroundFrame");
+                initialHeight = backgroundFrame.sizeDelta.y;
+                gameObject.AddComponent<Canvas>();
+            }
+
+            private void Start()
+            {
+                InitOptions();
+            }
+
+            public override void Init(IViewParams screenParams)
+            {
+                base.Init(screenParams);
+
+                InitOptionsViewWithModButtons();
+
+                // Make the border frames blue
+                Sprite borderSprite = backgroundFrame.GetComponent<Image>().sprite =
+                    Courier.EmbeddedSprites["Mod.Courier.UI.mod_options_frame"];
+                borderSprite.bounds.extents.Set(1.7f, 1.7f, 0.1f);
+                borderSprite.texture.filterMode = FilterMode.Point;
+
+                borderSprite = backgroundFrame.Find("OptionsFrame").GetComponent<Image>().sprite =
+                    Courier.EmbeddedSprites["Mod.Courier.UI.mod_options_frame"];
+                borderSprite.bounds.extents.Set(1.7f, 1.7f, 0.1f);
+                borderSprite.texture.filterMode = FilterMode.Point;
+
+                HideUnavailableOptions();
+                InitOptions();
+                SetInitialSelection();
+
+                // Make the selection frames blue
+                foreach (Image image in transform.GetComponentsInChildren<Image>()
+                             .Where((c) => c.name.Equals("SelectionFrame")))
+                {
+                    try
+                    {
+                        if (image.overrideSprite != null && image.overrideSprite.name != "Empty")
+                        {
+                            RenderTexture rt = new RenderTexture(image.overrideSprite.texture.width,
+                                image.overrideSprite.texture.height, 0);
+                            RenderTexture.active = rt;
+                            Graphics.Blit(image.overrideSprite.texture, rt);
+
+                            Texture2D res = new Texture2D(rt.width, rt.height, TextureFormat.RGBA32, true);
+                            res.ReadPixels(new Rect(0, 0, rt.width, rt.height), 0, 0, false);
+
+                            Color[] pxls = res.GetPixels();
+                            for (int i = 0; i < pxls.Length; i++)
+                            {
+                                if (Math.Abs(pxls[i].r - .973) < .01 && Math.Abs(pxls[i].g - .722) < .01)
+                                {
+                                    pxls[i].r = 0;
+                                    pxls[i].g = .633f;
+                                    pxls[i].b = 1;
+                                }
+                            }
+
+                            res.SetPixels(pxls);
+                            res.Apply();
+
+                            Sprite sprite = image.overrideSprite = Sprite.Create(res,
+                                new Rect(0, 0, res.width, res.height), new Vector2(16, 16), 20, 1,
+                                SpriteMeshType.FullRect, new Vector4(5, 5, 5, 5));
+                            sprite.bounds.extents.Set(.8f, .8f, 0.1f);
+                            sprite.texture.filterMode = FilterMode.Point;
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        CourierLogger.Log(LogType.Exception, "RandoScreen",
+                            "Image not Read/Writeable when recoloring selection frames in ModOptionScreen");
+                        e.LogDetailed();
+                    }
+                }
+            }
+
+            private IEnumerator WaitAndSelectInitialButton()
+            {
+                yield return null;
+                SetInitialSelection();
+            }
+
+            private void OnEnable()
+            {
+                if (transform.parent != null)
+                {
+                    Manager<UIManager>.Instance.SetParentAndAlign(gameObject, transform.parent.gameObject);
+                }
+
+                EventSystem.current.SetSelectedGameObject(null);
+            }
+
+            private void OnDisable()
+            {
+                transform.position = defaultPos;
+            }
+
+            private void HideUnavailableOptions()
+            {
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    buttonInfo.gameObject.SetActive(buttonInfo.IsEnabled?.Invoke() ?? true);
+                }
+
+                foreach (OptionsButtonInfo buttonInfo in Courier.UI.ModOptionButtons)
+                {
+                    buttonInfo.gameObject.SetActive(false);
+                }
+
+                StartCoroutine(WaitAndSelectInitialButton());
+                Vector2 sizeDelta = backgroundFrame.sizeDelta;
+                backgroundFrame.sizeDelta =
+                    new Vector2(sizeDelta.x, 110 + heightPerButton * OptionsCount());
+            }
+
+            private void SetInitialSelection()
+            {
+                GameObject defaultSelectionButton =
+                    (initialSelection ?? defaultSelection).transform.Find("Button").gameObject;
+                defaultSelectionButton.transform.GetComponent<UIObjectAudioHandler>().playAudio = false;
+                EventSystem.current.SetSelectedGameObject(defaultSelectionButton);
+                defaultSelectionButton.GetComponent<Button>().OnSelect(null);
+                defaultSelectionButton.GetComponent<UIObjectAudioHandler>().playAudio = true;
+                initialSelection = null;
+            }
+
+            public new void GoOffscreenInstant()
+            {
+                gameObject.SetActive(false);
+                RandoScreenLoaded = false;
+            }
+
+            public new int GetSelectedButtonIndex()
+            {
+                if (backButton.Find("Button").gameObject.Equals(EventSystem.current.currentSelectedGameObject))
+                    return OptionsCount();
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    if (buttonInfo.gameObject.transform.Find("Button").gameObject
+                        .Equals(EventSystem.current.currentSelectedGameObject))
+                    {
+                        return EnabledModOptionsBeforeButton(buttonInfo);
+                    }
+                }
+
+                return -1;
+            }
+
+            private void LateUpdate()
+            {
+                if (Manager<InputManager>.Instance.GetBackDown())
+                {
+                    BackToOptionMenu();
+                }
+
+                Vector3 windowOffset =
+                    new Vector3(0,
+                        Math.Min(GetSelectedButtonIndex(), Math.Max(0, OptionsCount() - 10)) *
+                        .9f) - new Vector3(0, Math.Max(0, OptionsCount() - 11) * .45f);
+                transform.position = defaultPos + windowOffset;
+
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    buttonInfo.UpdateNameText();
+                }
+
+                // Make the selection frames blue
+                // I should figure out if I can avoid doing this in LateUpdate()
+                foreach (Image image in transform.GetComponentsInChildren<Image>()
+                             .Where((c) => c.name.Equals("SelectionFrame")))
+                {
+                    try
+                    {
+                        if (image.overrideSprite != null && image.overrideSprite.name.Equals("ShopItemSelectionFrame"))
+                        {
+                            RenderTexture rt = new RenderTexture(image.overrideSprite.texture.width,
+                                image.overrideSprite.texture.height, 0);
+                            RenderTexture.active = rt;
+                            Graphics.Blit(image.overrideSprite.texture, rt);
+
+                            Texture2D res = new Texture2D(rt.width, rt.height, TextureFormat.RGBA32, true);
+                            res.ReadPixels(new Rect(0, 0, rt.width, rt.height), 0, 0, false);
+
+                            Color[] pxls = res.GetPixels();
+                            for (int i = 0; i < pxls.Length; i++)
+                            {
+                                if (Math.Abs(pxls[i].r - .973) < .01 && Math.Abs(pxls[i].g - .722) < .01)
+                                {
+                                    pxls[i].r = 0;
+                                    pxls[i].g = .633f;
+                                    pxls[i].b = 1;
+                                }
+                            }
+
+                            res.SetPixels(pxls);
+                            res.Apply();
+
+                            Sprite sprite = image.overrideSprite = Sprite.Create(res,
+                                new Rect(0, 0, res.width, res.height), new Vector2(16, 16), 20, 1,
+                                SpriteMeshType.FullRect, new Vector4(5, 5, 5, 5));
+                            sprite.bounds.extents.Set(.8f, .8f, 0.1f);
+                            sprite.texture.filterMode = FilterMode.Point;
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        CourierLogger.Log(LogType.Exception, "RandoScreen",
+                            "Image not Read/Writeable when recoloring selection frames in ModOptionScreen");
+                        CourierLogger.LogDetailed(e);
+                    }
+                }
+            }
+
+            private void InitOptions()
+            {
+                defaultSelection = backButton.gameObject;
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    if (buttonInfo.IsEnabled?.Invoke() ?? true)
+                    {
+                        defaultSelection = buttonInfo.gameObject;
+                        break;
+                    }
+                }
+
+                backgroundFrame.Find("Title").GetComponent<TextMeshProUGUI>().SetText("Randomizer Options");
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    buttonInfo.UpdateStateText();
+                }
+            }
+
+            public new void BackToOptionMenu()
+            {
+                Close(false);
+                Manager<UIManager>.Instance.GetView<OptionScreen>().gameObject.SetActive(true);
+                ArchipelagoMenuButton.gameObject.transform.Find("Button").GetComponent<UIObjectAudioHandler>()
+                    .playAudio = false;
+                EventSystem.current.SetSelectedGameObject(ArchipelagoMenuButton.gameObject.transform.Find("Button")
+                    .gameObject);
+                ArchipelagoMenuButton.gameObject.transform.Find("Button").GetComponent<UIObjectAudioHandler>()
+                    .playAudio = true;
+            }
+
+            public override void Close(bool transitionOut)
+            {
+                base.Close(transitionOut);
+                RandoScreenLoaded = false;
+            }
+        }
+
+        private static void RegisterRandoButton(OptionsButtonInfo buttonInfo) =>
+            RandoScreen.OptionButtons.Add(buttonInfo);
+
+        public static SubMenuButtonInfo RegisterSubRandoButton(Func<string> GetText, UnityAction onClick)
+        {
+            var buttonInfo = new SubMenuButtonInfo(GetText, onClick);
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static ToggleButtonInfo RegisterToggleRandoButton(Func<string> getText, UnityAction onClick,
+            Func<ToggleButtonInfo, bool> getState)
+        {
+            var buttonInfo = new ToggleButtonInfo(getText, onClick, getState,
+                optionScreen => Manager<LocalizationManager>.Instance.GetText(ModOptionScreen.onLocID),
+                optionScreen => Manager<LocalizationManager>.Instance.GetText(ModOptionScreen.offLocID));
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static TextEntryButtonInfo RegisterTextRandoButton(Func<string> getText, Func<string, bool> onEntry,
+            int maxCharacter = 15, Func<string> getEntryText = null, Func<string> getInitialText = null,
+            TextEntryButtonInfo.CharsetFlags charset = TextEntryButtonInfo.CharsetFlags.Letter |
+                                                       TextEntryButtonInfo.CharsetFlags.Number |
+                                                       TextEntryButtonInfo.CharsetFlags.Dash |
+                                                       TextEntryButtonInfo.CharsetFlags.Space)
+        {
+            var buttonInfo =
+                new TextEntryButtonInfo(getText, onEntry, maxCharacter, getEntryText, getInitialText, charset);
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static MultipleOptionButtonInfo RegisterMultipleRandoButton(Func<string> getText,
+            UnityAction onClick,
+            Action<int> onSwitch, Func<MultipleOptionButtonInfo, int> getIndex, Func<int, string> getTextForIndex)
+        {
+            var buttonInfo = new MultipleOptionButtonInfo(getText, onClick, onSwitch, getIndex, getTextForIndex);
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static string GetTextForResetIndex(int index)
+        {
+            switch (index)
+            {
+                case 0:
+                    return "No";
+                case 1:
+                    return "Yes";
+            }
+
+            return "???";
+        }
+    }
+}
\ No newline at end of file

From cbe0ec37c28c68c690f293fe4e354a9244b58735 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Wed, 9 Aug 2023 08:25:07 -0500
Subject: [PATCH 04/63] re-enable instant transmission

---
 Archipelago/ArchipelagoClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
index 9028e41..41f96ca 100644
--- a/Archipelago/ArchipelagoClient.cs
+++ b/Archipelago/ArchipelagoClient.cs
@@ -305,7 +305,7 @@ public static void SyncEvents()
         }
         private static void OnItemReceived(ReceivedItemsHelper helper)
         {
-            Console.WriteLine("OnItemReceived called");
+            // Console.WriteLine("OnItemReceived called");
             var itemToUnlock = helper.DequeueItem();
             if (helper.Index < ServerData.Index) return;
 

From aae74a17cfadae0202e726b9448b3c678085aa09 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Wed, 9 Aug 2023 08:35:02 -0500
Subject: [PATCH 05/63] update lib

---
 Utils/RandomizerSaveMethod.cs | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Utils/RandomizerSaveMethod.cs

diff --git a/Utils/RandomizerSaveMethod.cs b/Utils/RandomizerSaveMethod.cs
new file mode 100644
index 0000000..5f28270
--- /dev/null
+++ b/Utils/RandomizerSaveMethod.cs
@@ -0,0 +1 @@
+
\ No newline at end of file

From f530d67c6b1e5fb912fc0b3d59dc21c2ee4c0e8c Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 3 Sep 2023 17:15:44 -0500
Subject: [PATCH 06/63] prelim work on new menus

---
 APRandomizerMain.cs              |  27 +-
 MessengerRando.csproj            |   1 +
 Utils/Constants/RoomConstants.cs |   2 +-
 Utils/RandoMenu.cs               | 464 +++++++++++++++++++++++++++++++
 4 files changed, 490 insertions(+), 4 deletions(-)
 create mode 100644 Utils/RandoMenu.cs

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 2c9b960..2eacd03 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -213,6 +213,20 @@ public override void Load()
                     : "Enable Music Shuffle",
                 () => RandoMusicManager.ShuffleMusic = !RandoMusicManager.ShuffleMusic);
 
+            RandoMenu.ArchipelagoMenuButton = Courier.UI.RegisterSubMenuOptionButton(() => "Randomizer", RandoMenu.DisplayRandoMenu);
+            
+            PopulateRandoButtons();
+            
+            void PopulateRandoButtons()
+            {
+                RandoMenu.versionButton =
+                    RandoMenu.RegisterSubRandoButton(
+                        () => "Messenger AP Randomizer: v" + ItemRandomizerUtil.GetModVersion(), null);
+                RandoMenu.connectMenuButton = RandoMenu.RegisterSubRandoButton(() => "Connect to Archipelago", null);
+                RandoMenu.resetSaveButton = RandoMenu.RegisterMultipleRandoButton(() => "Reset Randomizer File Slot", null,
+                    ResetSaves, null, RandoMenu.GetTextForResetIndex);
+            }
+
             //Plug in my code :3
             On.InventoryManager.AddItem += InventoryManager_AddItem;
             On.ProgressionManager.SetChallengeRoomAsCompleted += ProgressionManager_SetChallengeRoomAsCompleted;
@@ -698,6 +712,12 @@ bool OnRandoFileResetConfirmation(string answer)
                 return true;
             }
 
+            ConfirmFileReset();
+            return true;
+        }
+        
+        void ConfirmFileReset()
+        {
             ArchipelagoData.ClearData();
             randoStateManager = new RandomizerStateManager();
             clearedData = true;
@@ -714,15 +734,16 @@ bool OnRandoFileResetConfirmation(string answer)
             {
                 sw.WriteLine(RandomizerConstants.SAVE_FILE_STRING);
             }
-            
+
             Manager<SaveManager>.Instance.LoadSaveGame();
             //Delete the existing save file selection ui since it really wants to hold on to the previous saves data.
             GameObject.Destroy(Manager<UIManager>.Instance.GetView<SaveGameSelectionScreen>().gameObject);
             //Reinit the save file selection ui.
-            SaveGameSelectionScreen selectionScreen = Manager<UIManager>.Instance.ShowView<SaveGameSelectionScreen>(EScreenLayers.MAIN, null, false, AnimatorUpdateMode.Normal);
+            SaveGameSelectionScreen selectionScreen =
+                Manager<UIManager>.Instance.ShowView<SaveGameSelectionScreen>(EScreenLayers.MAIN, null, false,
+                    AnimatorUpdateMode.Normal);
             selectionScreen.GoOffscreenInstant();
 
-            return true;
         }
 
         public static void OnToggleWindmillShuriken()
diff --git a/MessengerRando.csproj b/MessengerRando.csproj
index bb04190..4611de8 100644
--- a/MessengerRando.csproj
+++ b/MessengerRando.csproj
@@ -105,6 +105,7 @@
     <Compile Include="Utils\Constants\BossConstants.cs" />
     <Compile Include="Utils\Constants\LevelConstants.cs" />
     <Compile Include="Utils\Constants\RoomConstants.cs" />
+    <Compile Include="Utils\RandoMenu.cs" />
     <Compile Include="Utils\RandoSave.cs" />
     <Compile Include="Utils\LocationInfo.cs" />
     <Compile Include="Utils\DialogChanger.cs" />
diff --git a/Utils/Constants/RoomConstants.cs b/Utils/Constants/RoomConstants.cs
index 4ac44bc..6ca789f 100644
--- a/Utils/Constants/RoomConstants.cs
+++ b/Utils/Constants/RoomConstants.cs
@@ -6,7 +6,7 @@
 
 namespace MessengerRando.Utils.Constants
 {
-    public class RoomConstants
+    public static class RoomConstants
     {
         public struct RoomTransition: IEquatable<RoomTransition>
         {
diff --git a/Utils/RandoMenu.cs b/Utils/RandoMenu.cs
new file mode 100644
index 0000000..b8fe3e0
--- /dev/null
+++ b/Utils/RandoMenu.cs
@@ -0,0 +1,464 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using MessengerRando.Archipelago;
+using Mod.Courier;
+using Mod.Courier.UI;
+using TMPro;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+namespace MessengerRando.Utils
+{
+    public class RandoMenu
+    {
+        public static OptionsButtonInfo ArchipelagoMenuButton;
+        private static RandoScreen randoScreen;
+
+        public static SubMenuButtonInfo versionButton;
+        public static SubMenuButtonInfo connectMenuButton;
+        public static MultipleOptionButtonInfo resetSaveButton;
+
+
+        public static void DisplayRandoMenu()
+        {
+            Manager<UIManager>.Instance.GetView<OptionScreen>().gameObject.SetActive(false);
+            if (!RandoScreen.RandoScreenLoaded)
+                randoScreen = RandoScreen.BuildModOptionScreen(Manager<UIManager>.Instance.GetView<OptionScreen>());
+
+            Courier.UI.ShowView(randoScreen, EScreenLayers.PROMPT, null, false);
+        }
+
+        public class RandoScreen : ModOptionScreen
+        {
+            public static bool RandoScreenLoaded;
+            public static readonly List<OptionsButtonInfo> OptionButtons = new List<OptionsButtonInfo>();
+
+            private static int OptionsCount()
+            {
+                return OptionButtons.Count(modOptionButton => modOptionButton.gameObject.activeInHierarchy);
+            }
+
+            private static int EnabledModOptionsBeforeButton(OptionsButtonInfo button)
+            {
+                int num = 0;
+                foreach (OptionsButtonInfo modOptionButton in OptionButtons)
+                {
+                    if (modOptionButton.Equals(button))
+                        return num;
+                    if (modOptionButton.gameObject.activeInHierarchy)
+                        ++num;
+                }
+
+                return -1;
+            }
+
+            public void InitOptionsViewWithModButtons()
+            {
+                var view = this;
+                OptionScreen optionScreen = Manager<UIManager>.Instance.GetView<OptionScreen>();
+                Transform parent = view.transform.Find("Container").Find("BackgroundFrame").Find("OptionsFrame")
+                    .Find("OptionMenuButtons");
+                foreach (OptionsButtonInfo button in OptionButtons)
+                {
+                    switch (button)
+                    {
+                        case ToggleButtonInfo _:
+                            button.gameObject = Instantiate(optionScreen.fullscreenOption, parent);
+                            break;
+                        case SubMenuButtonInfo _:
+                            button.gameObject = Instantiate(optionScreen.controlsButton.transform.parent.gameObject,
+                                parent);
+                            break;
+                        case MultipleOptionButtonInfo _:
+                            button.gameObject = Instantiate(optionScreen.languageOption, parent);
+                            break;
+                        default:
+                            CourierLogger.Log(LogType.Warning, "OptionsMenu",
+                                button.GetType()?.ToString() + " not a known type of OptionsButtonInfo!");
+                            break;
+                    }
+
+                    button.gameObject.transform.SetAsLastSibling();
+                    GameObject gameObject = button.gameObject;
+                    Func<string> getText = button.GetText;
+                    string str = getText?.Invoke() ?? "Nameless Modded Options Button";
+                    gameObject.name = str;
+                    button.addedTo = view;
+                    foreach (TextMeshProUGUI componentsInChild in button.gameObject
+                                 .GetComponentsInChildren<TextMeshProUGUI>())
+                    {
+                        if (componentsInChild.name.Equals("OptionState") || componentsInChild.name.Equals("Text"))
+                            button.stateTextMesh = componentsInChild;
+                        if (componentsInChild.name.Equals("OptionName"))
+                        {
+                            button.nameTextMesh = componentsInChild;
+                            TextLocalizer component = componentsInChild.GetComponent<TextLocalizer>();
+                            if (component != null)
+                                component.locID = "";
+                        }
+                    }
+
+                    Button component1 = button.gameObject.transform.Find("Button").GetComponent<Button>();
+                    component1.onClick = new Button.ButtonClickedEvent();
+                    component1.onClick.AddListener(button.onClick);
+                    button.OnInit(view);
+                }
+
+                parent.Find("Back")?.SetAsLastSibling();
+            }
+
+            public new static RandoScreen BuildModOptionScreen(OptionScreen optionScreen)
+            {
+                GameObject gameObject = new GameObject();
+                RandoScreen randoScreen = gameObject.AddComponent<RandoScreen>();
+                OptionScreen newScreen = Instantiate(optionScreen);
+                randoScreen.name = "RandoScreen";
+                // Swap everything under the option screen to the mod option screen
+                // Iterate backwards so elements don't shift as lower ones are removed
+                for (int i = newScreen.transform.childCount - 1; i >= 0; i--)
+                {
+                    newScreen.transform.GetChild(i).SetParent(randoScreen.transform, false);
+                }
+
+                randoScreen.optionMenuButtons = randoScreen.transform.Find("Container").Find("BackgroundFrame")
+                    .Find("OptionsFrame").Find("OptionMenuButtons");
+                randoScreen.backButton = randoScreen.optionMenuButtons.Find("Back");
+                // Delete OptionScreen buttons except for the Back button
+                foreach (Transform child in randoScreen.optionMenuButtons.GetChildren())
+                {
+                    if (!child.Equals(randoScreen.backButton))
+                        Destroy(child.gameObject);
+                }
+
+                //TODO put back if things brake
+                // randoScreen.optionMenuButtons.DetachChildren();
+                randoScreen.backButton.SetParent(randoScreen.optionMenuButtons);
+
+                // Make back button take you to the OptionScreen instead of the pause menu
+                Button button = randoScreen.backButton.GetComponentInChildren<Button>();
+                button.onClick = new Button.ButtonClickedEvent();
+                button.onClick.AddListener(randoScreen.BackToOptionMenu);
+
+                randoScreen.InitStuffUnityWouldDo();
+
+                randoScreen.gameObject.SetActive(false);
+                RandoScreenLoaded = true;
+                return randoScreen;
+            }
+
+            private void InitStuffUnityWouldDo()
+            {
+                //transform.position = new Vector3(0, Math.Max(-90 - heightPerButton * Courier.UI.ModOptionButtons.Count, startYMax));
+                backgroundFrame = (RectTransform)transform.Find("Container").Find("BackgroundFrame");
+                initialHeight = backgroundFrame.sizeDelta.y;
+                gameObject.AddComponent<Canvas>();
+            }
+
+            private void Start()
+            {
+                InitOptions();
+            }
+
+            public override void Init(IViewParams screenParams)
+            {
+                base.Init(screenParams);
+
+                InitOptionsViewWithModButtons();
+
+                // Make the border frames blue
+                Sprite borderSprite = backgroundFrame.GetComponent<Image>().sprite =
+                    Courier.EmbeddedSprites["Mod.Courier.UI.mod_options_frame"];
+                borderSprite.bounds.extents.Set(1.7f, 1.7f, 0.1f);
+                borderSprite.texture.filterMode = FilterMode.Point;
+
+                borderSprite = backgroundFrame.Find("OptionsFrame").GetComponent<Image>().sprite =
+                    Courier.EmbeddedSprites["Mod.Courier.UI.mod_options_frame"];
+                borderSprite.bounds.extents.Set(1.7f, 1.7f, 0.1f);
+                borderSprite.texture.filterMode = FilterMode.Point;
+
+                HideUnavailableOptions();
+                InitOptions();
+                SetInitialSelection();
+
+                // Make the selection frames blue
+                foreach (Image image in transform.GetComponentsInChildren<Image>()
+                             .Where((c) => c.name.Equals("SelectionFrame")))
+                {
+                    try
+                    {
+                        if (image.overrideSprite != null && image.overrideSprite.name != "Empty")
+                        {
+                            RenderTexture rt = new RenderTexture(image.overrideSprite.texture.width,
+                                image.overrideSprite.texture.height, 0);
+                            RenderTexture.active = rt;
+                            Graphics.Blit(image.overrideSprite.texture, rt);
+
+                            Texture2D res = new Texture2D(rt.width, rt.height, TextureFormat.RGBA32, true);
+                            res.ReadPixels(new Rect(0, 0, rt.width, rt.height), 0, 0, false);
+
+                            Color[] pxls = res.GetPixels();
+                            for (int i = 0; i < pxls.Length; i++)
+                            {
+                                if (Math.Abs(pxls[i].r - .973) < .01 && Math.Abs(pxls[i].g - .722) < .01)
+                                {
+                                    pxls[i].r = 0;
+                                    pxls[i].g = .633f;
+                                    pxls[i].b = 1;
+                                }
+                            }
+
+                            res.SetPixels(pxls);
+                            res.Apply();
+
+                            Sprite sprite = image.overrideSprite = Sprite.Create(res,
+                                new Rect(0, 0, res.width, res.height), new Vector2(16, 16), 20, 1,
+                                SpriteMeshType.FullRect, new Vector4(5, 5, 5, 5));
+                            sprite.bounds.extents.Set(.8f, .8f, 0.1f);
+                            sprite.texture.filterMode = FilterMode.Point;
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        CourierLogger.Log(LogType.Exception, "RandoScreen",
+                            "Image not Read/Writeable when recoloring selection frames in ModOptionScreen");
+                        e.LogDetailed();
+                    }
+                }
+            }
+
+            private IEnumerator WaitAndSelectInitialButton()
+            {
+                yield return null;
+                SetInitialSelection();
+            }
+
+            private void OnEnable()
+            {
+                if (transform.parent != null)
+                {
+                    Manager<UIManager>.Instance.SetParentAndAlign(gameObject, transform.parent.gameObject);
+                }
+
+                EventSystem.current.SetSelectedGameObject(null);
+            }
+
+            private void OnDisable()
+            {
+                transform.position = defaultPos;
+            }
+
+            private void HideUnavailableOptions()
+            {
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    buttonInfo.gameObject.SetActive(buttonInfo.IsEnabled?.Invoke() ?? true);
+                }
+
+                foreach (OptionsButtonInfo buttonInfo in Courier.UI.ModOptionButtons)
+                {
+                    buttonInfo.gameObject.SetActive(false);
+                }
+
+                StartCoroutine(WaitAndSelectInitialButton());
+                Vector2 sizeDelta = backgroundFrame.sizeDelta;
+                backgroundFrame.sizeDelta =
+                    new Vector2(sizeDelta.x, 110 + heightPerButton * OptionsCount());
+            }
+
+            private void SetInitialSelection()
+            {
+                GameObject defaultSelectionButton =
+                    (initialSelection ?? defaultSelection).transform.Find("Button").gameObject;
+                defaultSelectionButton.transform.GetComponent<UIObjectAudioHandler>().playAudio = false;
+                EventSystem.current.SetSelectedGameObject(defaultSelectionButton);
+                defaultSelectionButton.GetComponent<Button>().OnSelect(null);
+                defaultSelectionButton.GetComponent<UIObjectAudioHandler>().playAudio = true;
+                initialSelection = null;
+            }
+
+            public new void GoOffscreenInstant()
+            {
+                gameObject.SetActive(false);
+                RandoScreenLoaded = false;
+            }
+
+            public new int GetSelectedButtonIndex()
+            {
+                if (backButton.Find("Button").gameObject.Equals(EventSystem.current.currentSelectedGameObject))
+                    return OptionsCount();
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    if (buttonInfo.gameObject.transform.Find("Button").gameObject
+                        .Equals(EventSystem.current.currentSelectedGameObject))
+                    {
+                        return EnabledModOptionsBeforeButton(buttonInfo);
+                    }
+                }
+
+                return -1;
+            }
+
+            private void LateUpdate()
+            {
+                if (Manager<InputManager>.Instance.GetBackDown())
+                {
+                    BackToOptionMenu();
+                }
+
+                Vector3 windowOffset =
+                    new Vector3(0,
+                        Math.Min(GetSelectedButtonIndex(), Math.Max(0, OptionsCount() - 10)) *
+                        .9f) - new Vector3(0, Math.Max(0, OptionsCount() - 11) * .45f);
+                transform.position = defaultPos + windowOffset;
+
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    buttonInfo.UpdateNameText();
+                }
+
+                // Make the selection frames blue
+                // I should figure out if I can avoid doing this in LateUpdate()
+                foreach (Image image in transform.GetComponentsInChildren<Image>()
+                             .Where((c) => c.name.Equals("SelectionFrame")))
+                {
+                    try
+                    {
+                        if (image.overrideSprite != null && image.overrideSprite.name.Equals("ShopItemSelectionFrame"))
+                        {
+                            RenderTexture rt = new RenderTexture(image.overrideSprite.texture.width,
+                                image.overrideSprite.texture.height, 0);
+                            RenderTexture.active = rt;
+                            Graphics.Blit(image.overrideSprite.texture, rt);
+
+                            Texture2D res = new Texture2D(rt.width, rt.height, TextureFormat.RGBA32, true);
+                            res.ReadPixels(new Rect(0, 0, rt.width, rt.height), 0, 0, false);
+
+                            Color[] pxls = res.GetPixels();
+                            for (int i = 0; i < pxls.Length; i++)
+                            {
+                                if (Math.Abs(pxls[i].r - .973) < .01 && Math.Abs(pxls[i].g - .722) < .01)
+                                {
+                                    pxls[i].r = 0;
+                                    pxls[i].g = .633f;
+                                    pxls[i].b = 1;
+                                }
+                            }
+
+                            res.SetPixels(pxls);
+                            res.Apply();
+
+                            Sprite sprite = image.overrideSprite = Sprite.Create(res,
+                                new Rect(0, 0, res.width, res.height), new Vector2(16, 16), 20, 1,
+                                SpriteMeshType.FullRect, new Vector4(5, 5, 5, 5));
+                            sprite.bounds.extents.Set(.8f, .8f, 0.1f);
+                            sprite.texture.filterMode = FilterMode.Point;
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        CourierLogger.Log(LogType.Exception, "RandoScreen",
+                            "Image not Read/Writeable when recoloring selection frames in ModOptionScreen");
+                        CourierLogger.LogDetailed(e);
+                    }
+                }
+            }
+
+            private void InitOptions()
+            {
+                defaultSelection = backButton.gameObject;
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    if (buttonInfo.IsEnabled?.Invoke() ?? true)
+                    {
+                        defaultSelection = buttonInfo.gameObject;
+                        break;
+                    }
+                }
+
+                backgroundFrame.Find("Title").GetComponent<TextMeshProUGUI>().SetText("Randomizer Options");
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    buttonInfo.UpdateStateText();
+                }
+            }
+
+            public new void BackToOptionMenu()
+            {
+                Close(false);
+                Manager<UIManager>.Instance.GetView<OptionScreen>().gameObject.SetActive(true);
+                ArchipelagoMenuButton.gameObject.transform.Find("Button").GetComponent<UIObjectAudioHandler>()
+                    .playAudio = false;
+                EventSystem.current.SetSelectedGameObject(ArchipelagoMenuButton.gameObject.transform.Find("Button")
+                    .gameObject);
+                ArchipelagoMenuButton.gameObject.transform.Find("Button").GetComponent<UIObjectAudioHandler>()
+                    .playAudio = true;
+            }
+
+            public override void Close(bool transitionOut)
+            {
+                base.Close(transitionOut);
+                RandoScreenLoaded = false;
+            }
+        }
+
+        private static void RegisterRandoButton(OptionsButtonInfo buttonInfo) =>
+            RandoScreen.OptionButtons.Add(buttonInfo);
+
+        public static SubMenuButtonInfo RegisterSubRandoButton(Func<string> GetText, UnityAction onClick)
+        {
+            var buttonInfo = new SubMenuButtonInfo(GetText, onClick);
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static ToggleButtonInfo RegisterToggleRandoButton(Func<string> getText, UnityAction onClick,
+            Func<ToggleButtonInfo, bool> getState)
+        {
+            var buttonInfo = new ToggleButtonInfo(getText, onClick, getState,
+                optionScreen => Manager<LocalizationManager>.Instance.GetText(ModOptionScreen.onLocID),
+                optionScreen => Manager<LocalizationManager>.Instance.GetText(ModOptionScreen.offLocID));
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static TextEntryButtonInfo RegisterTextRandoButton(Func<string> getText, Func<string, bool> onEntry,
+            int maxCharacter = 15, Func<string> getEntryText = null, Func<string> getInitialText = null,
+            TextEntryButtonInfo.CharsetFlags charset = TextEntryButtonInfo.CharsetFlags.Letter |
+                                                       TextEntryButtonInfo.CharsetFlags.Number |
+                                                       TextEntryButtonInfo.CharsetFlags.Dash |
+                                                       TextEntryButtonInfo.CharsetFlags.Space)
+        {
+            var buttonInfo =
+                new TextEntryButtonInfo(getText, onEntry, maxCharacter, getEntryText, getInitialText, charset);
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static MultipleOptionButtonInfo RegisterMultipleRandoButton(Func<string> getText,
+            UnityAction onClick,
+            Action<int> onSwitch, Func<MultipleOptionButtonInfo, int> getIndex, Func<int, string> getTextForIndex)
+        {
+            var buttonInfo = new MultipleOptionButtonInfo(getText, onClick, onSwitch, getIndex, getTextForIndex);
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static string GetTextForResetIndex(int index)
+        {
+            switch (index)
+            {
+                case 0:
+                    return "No";
+                case 1:
+                    return "Yes";
+            }
+
+            return "???";
+        }
+    }
+}
\ No newline at end of file

From be22510f6245d51bf88e1c0143532fdc99164839 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 7 Jan 2024 05:28:10 -0600
Subject: [PATCH 07/63] realize the power of loading into saves without having
 to do reset jank

---
 APRandomizerMain.cs             |   7 ++-
 Utils/RandomizerStateManager.cs | 101 ++++++++++++++++++++++++++------
 2 files changed, 86 insertions(+), 22 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 61f41ef..206a0e4 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -593,9 +593,10 @@ void SaveGameSelectionScreen_OnLoadGame(On.SaveGameSelectionScreen.orig_OnLoadGa
 
         void SaveGameSelectionScreen_OnNewGame(On.SaveGameSelectionScreen.orig_OnNewGame orig, SaveGameSelectionScreen self, SaveSlotUI slot)
         {
-            RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
-            // self.OnLoadGame(slot.slotIndex);
-            // orig(self, slot);
+            if (ArchipelagoClient.Authenticated)
+                RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
+            else
+                orig(self, slot);
         }
 
         private void SaveGameSelectionScreen_LaunchGame(On.SaveGameSelectionScreen.orig_LaunchGame orig, SaveGameSelectionScreen self, string leveltoload, CheckpointSaveInfo checkpointsaveinfo)
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 8cacd2a..a315cc2 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -1,10 +1,13 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using AdvancedInspector;
 using Archipelago.MultiClient.Net.Models;
 using Archipelago.MultiClient.Net.Packets;
 using MessengerRando.Archipelago;
 using MessengerRando.GameOverrideManagers;
+using MonoMod.Utils;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
 
@@ -135,23 +138,43 @@ public static bool HasCompletedCheck(long locationID)
 
         public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen, int slot)
         {
+            // create a fresh save slot
             var saveManager = Manager<SaveManager>.Instance;
             saveManager.SelectSaveGameSlot(slot);
             saveManager.NewGame();
             saveManager.GetCurrentSaveGameSlot().SlotName = "Test";
+            // add everything to the various managers that we need for our save slot, following the order in SaveGameSlot.UpdateSaveGameData()
             var progManager = Manager<ProgressionManager>.Instance;
-            progManager.secondQuest = true;
+            progManager.lastSaveTime = Time.time;
             progManager.checkpointSaveInfo = new CheckpointSaveInfo
             {
-                mana = 3,
+                mana = 0,
                 loadedLevelDimension = EBits.BITS_16,
                 playerLocationDimension = EBits.BITS_16,
-                loadedLevelName = ELevel.Level_13_TowerOfTimeHQ.ToString(),
+                loadedLevelName = ELevel.Level_02_AutumnHills.ToString(),
                 playerLocationSceneName = ELevel.Level_13_TowerOfTimeHQ.ToString(),
-                loadedLevelPlayerPosition = new Vector3(1160.79f, -42.5f, 0f),
+                loadedLevelPlayerPosition = new Vector3(485.03f, -101.5f, 0f),
                 loadedLevelCheckpointIndex = -1,
-                playerFacingDirection = -1f
+                playerFacingDirection = 1
+            };
+            var flagsToSet = new[]
+            {
+                "CloudStepTutorialDone", "RuxxtinEncounter_1", "RuxxtinEncounter_2", "ManfredChase_1_Done",
+                "ManfredChase_2_Done", "ManfredChase_3_Done", "TOTHQ_SmallMageFirstInterractionDone"
             };
+            foreach (var flag in flagsToSet)
+            {
+                progManager.SetFlag(flag, false);
+            }
+
+            var invManager = Manager<InventoryManager>.Instance;
+            invManager.ItemQuantityByItemId.Add(EItems.SCROLL_UPGRADE, 1);
+            invManager.ItemQuantityByItemId.Add(EItems.TIME_SHARD, 0);
+            invManager.ItemQuantityByItemId.Add(EItems.MAP, 1);
+            invManager.ItemQuantityByItemId.Add(EItems.CLIMBING_CLAWS, 1);
+            invManager.AllTimeItemQuantityByItemId = invManager.ItemQuantityByItemId;
+            
+            progManager.secondQuest = true;
             var discoveredLevels = new List<ELevel>
             {
                 ELevel.Level_01_NinjaVillage,
@@ -167,30 +190,70 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
                 ELevel.Level_11_A_CloudRuins,
                 ELevel.Level_12_UnderWorld,
                 ELevel.Level_13_TowerOfTimeHQ,
+                ELevel.Level_04_C_RiviereTurquoise,
+                ELevel.Level_05_B_SunkenShrine,
             };
             progManager.levelsDiscovered.AddRange(discoveredLevels);
             progManager.allTimeDiscoveredLevels.AddRange(discoveredLevels);
-            progManager.SetFlag(Flags.TOTHQ_SmallMageFirstInterractionDone, false);
-            progManager.SetFlag(Flags.CloudStepTutorialDone, false);
+            progManager.isLevelDiscoveredAwarded = true;
+            
             var skipCutscenes = new List<string>
             {
-                // "ClimbDownToCatacombsCutscene",
-                // "ClimbDownToSearingCragsCutscene",
-                // "ClimbUpFromCatacombsCutscene",
-                // "ClimbUpToForlornCutscene",
-                // "CloudStepIntroCutscene",
-                // "CloudStepComeBackCutscene",
-                // "CloudRuinsTowerEntranceCutscene",
-                // "GlacialPeakTowerOfTimeCutscene",
-                // "GlacialPeakTowerOutCutscene",
-                // "GlouciousEntranceFromSearingRopeCutscene",
+                "MessengerCutScene",
+                "CloudStepIntroCutScene",
                 "NinjaVillageElderCutScene",
+                "DemonGeneralCutScene",
                 "NinjaVillageIntroEndCutScene",
-                // "SearagToGlacialPeakEntranceCutscene",
+                "LeafGolemIntroCutScene",
+                "LeafGolemOutroCutScene",
+                "NecrophobicWorkerCutscene",
+                "NecromancerIntroCutscene",
+                "NecromancerOutroCutscene",
+                "HowlingGrottoBossIntroCutscene",
+                "HowlingGrottoBossOutroCutscene",
+                "HowlingGrottoToQuillshroomFirstQuestCutScene",
+                "QuillshroomMarshBossIntroCutscene",
+                "QuillshroomMarshBossOutroCutscene",
+                "SearingCragsBossIntroCutscene",
+                "SearingCragsBossOutroCutscene",
+                "SearagToGlacialPeakEntranceCutscene",
+                "GlacialPeakTowerOfTimeCutscene",
+                "GlacialPeakTowerOutCutscene",
+                "QuibbleIntroCutscene",
+                "TowerOfTimeBossIntroCutscene",
+                "TowerOfTimeBossOutroCutscene",
+                "Teleport16BitsRoomCutscene",
+                "To16BitsCutscene",
+                "TowerOfTimeTeleportToCloudRuinsCutscene",
+                "CloudRuinsTowerEntranceCutscene",
+                "ManfredBossIntroCutscene",
+                "ManfredBossOutroCutscene",
+                "DemonGeneralBossIntroCutscene",
+                "DemonGeneralBossOutroCutscene",
+                "UnderworldManfredEscapeCutscene",
+                "FutureMessengerCutscene",
                 "SecondQuestStartShopCutscene",
+                "ArmoireOpeningCutscene",
+                "DialogCutscene",
+                "GoToTotMageDialog",
+                "RiviereTurquoisePortalOpeningCutscene",
+                "EnterPortalCutscene",
+                "ExitPortalCutscene",
+                "ProphetIntroCutscene",
+                "PortalOpeningCutscene",
+                "SunkenShrinePortalOpeningCutscene",
+                "SearingCragsPortalOpeningCutscene",
+                "ExitPortalAwardMapCutscene"
             };
             progManager.cutscenesPlayed.AddRange(skipCutscenes);
-            Manager<LevelManager>.Instance.lastLevelLoaded = ELevel.Level_13_TowerOfTimeHQ.ToString();
+            
+            progManager.actionSequenceDone.AddRange(new []{
+                "AwardGrimplouSequence(Clone)",
+                "AwardGlidouSequence(Clone)",
+                "AwardGraplouSequence(Clone)"
+            });
+            // copy everything from the managers to the save slot
+            saveManager.GetCurrentSaveGameSlot().UpdateSaveGameData();
             saveManager.Save();
             try
             {

From a470ce467d0d54a6a83546a64535a0bbe63bb858 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 7 Jan 2024 05:29:46 -0600
Subject: [PATCH 08/63] pull the alias/slot name on entering the save instead
 of trying to update it every time we save

---
 APRandomizerMain.cs             | 5 -----
 Utils/RandomizerStateManager.cs | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 206a0e4..fa50b57 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -1022,11 +1022,6 @@ private void SaveManager_DoActualSave(On.SaveManager.orig_DoActualSaving orig, S
                 {
                     ArchipelagoClient.UpdateClientStatus(ArchipelagoClientState.ClientGoal);
                 }
-                if (randoStateManager.CurrentFileSlot == 0) return;
-                var saveSlot = self.GetCurrentSaveGameSlot();
-                var playerAlias =
-                    ArchipelagoClient.Session.Players.GetPlayerAlias(ArchipelagoClient.Session.ConnectionInfo.Slot);
-                saveSlot.SlotName = playerAlias;
             }
             Save?.Update();
             orig(self, applySaveDelay);
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index a315cc2..7783476 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -142,7 +142,8 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
             var saveManager = Manager<SaveManager>.Instance;
             saveManager.SelectSaveGameSlot(slot);
             saveManager.NewGame();
-            saveManager.GetCurrentSaveGameSlot().SlotName = "Test";
+            saveManager.GetCurrentSaveGameSlot().SlotName =
+                ArchipelagoClient.Session.Players.GetPlayerAlias(ArchipelagoClient.Session.ConnectionInfo.Slot);
             // add everything to the various managers that we need for our save slot, following the order in SaveGameSlot.UpdateSaveGameData()
             var progManager = Manager<ProgressionManager>.Instance;
             progManager.lastSaveTime = Time.time;

From 2bfb4daed03d8ff9ddf715705a6aa661e470845d Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 7 Jan 2024 06:28:41 -0600
Subject: [PATCH 09/63] add option to limit the starting portals

---
 APRandomizerMain.cs                        |   5 +
 GameOverrideManagers/RandoPortalManager.cs |  76 ++++++++++++++-
 Utils/RandomizerStateManager.cs            | 102 +++++++++++----------
 3 files changed, 133 insertions(+), 50 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index fa50b57..5df642b 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -278,6 +278,7 @@ public override void Load()
                 (orig, self, bossName) => RandoBossManager.SetBossAsDefeated(bossName);
             // level teleporting etc management
             On.Level.ChangeRoom += RandoRoomManager.Level_ChangeRoom;
+            // On.PortalOpeningCutscene.OnOpenPortalEvent += RandoPortalManager.OpenPortalEvent;
             //These functions let us override and manage power seals ourselves with 'fake' items
             On.ProgressionManager.TotalPowerSealCollected += ProgressionManager_TotalPowerSealCollected;
             On.ShopChestOpenCutscene.OnChestOpened += (orig, self) =>
@@ -593,10 +594,14 @@ void SaveGameSelectionScreen_OnLoadGame(On.SaveGameSelectionScreen.orig_OnLoadGa
 
         void SaveGameSelectionScreen_OnNewGame(On.SaveGameSelectionScreen.orig_OnNewGame orig, SaveGameSelectionScreen self, SaveSlotUI slot)
         {
+#if DEBUG
+            RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
+#elif RELEASE
             if (ArchipelagoClient.Authenticated)
                 RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
             else
                 orig(self, slot);
+#endif
         }
 
         private void SaveGameSelectionScreen_LaunchGame(On.SaveGameSelectionScreen.orig_LaunchGame orig, SaveGameSelectionScreen self, string leveltoload, CheckpointSaveInfo checkpointsaveinfo)
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 6401477..4a14d2b 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -1,10 +1,82 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using Object = UnityEngine.Object;
 
 namespace MessengerRando.GameOverrideManagers
 {
     public class RandoPortalManager
     {
-        public static List<string> OpenPortals = new List<string>();
+        public static bool LimitedPortals;
+        public static List<TowerOfTimePortal> OpenPortals;
+
+
+        public static void CreatePortals()
+        {
+            Console.WriteLine("Creating portals");
+            try
+            {
+                var portals = Object.FindObjectsOfType<TowerOfTimePortal>();
+                foreach (var VARIABLE in portals)
+                {
+                    Console.WriteLine(VARIABLE.name);
+                }
+                // var portalCutscene = Object.FindObjectOfType<PortalOpeningCutscene>();
+                // var rivierePortal = Object.FindObjectOfType<RiviereTurquoisePortalOpeningCutscene>().portal;
+                // var sunkenShrinePortal = Object.FindObjectOfType<SunkenShrinePortalOpeningCutscene>().portal;
+                // var searingCragsPortal = Object.FindObjectOfType<SearingCragsPortalOpeningCutscene>().portal;
+                // OpenPortals = new List<TowerOfTimePortal>
+                // {
+                //     portalCutscene.autumnHillsPortal, rivierePortal, portalCutscene.howlingGrottoPortal, sunkenShrinePortal,
+                //     searingCragsPortal, portalCutscene.glacialPeakPortal
+                // };
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
+            var rng = new Random();
+            var n = OpenPortals.Count;
+            while (n > 1)
+            {
+                var k = rng.Next(n);
+                n--;
+                var value = OpenPortals[k];
+                OpenPortals[k] = OpenPortals[n];
+                OpenPortals[n] = value;
+            }
+
+            foreach (var portal in OpenPortals)
+            {
+                Console.WriteLine(portal.name);
+            }
+        }
         
+        public static void OpenPortalEvent(On.PortalOpeningCutscene.orig_OnOpenPortalEvent orig, PortalOpeningCutscene self, string eventid)
+        {
+            // orig(self, eventid);
+            switch (eventid)
+            {
+                case "AutumnHills": // first portal
+                    UnlockPortal(self, OpenPortals[0]);
+                    break;
+                case "HowlingGrotto":
+                    UnlockPortal(self, OpenPortals[1]);
+                    break;
+                case "GlacialPeak":
+                    UnlockPortal(self, OpenPortals[2]);
+                    break;
+                default:
+                    orig(self, eventid);
+                    break;
+            }
+        }
+
+        private static void UnlockPortal(PortalOpeningCutscene cutscene, TowerOfTimePortal portal)
+        {
+            portal.locked = false;
+            portal.animator.SetTrigger("Open");
+            Manager<AudioManager>.Instance.PlaySoundEffect(cutscene.portalOpeningSFX);
+        }
+
     }
 }
\ No newline at end of file
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 7783476..9cce89a 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -75,6 +75,8 @@ public static void InitializeMultiSeed()
             Instance.SkipMusicBox = !Convert.ToBoolean(slotData["music_box"]);
             RandoShopManager.ShopPrices = ((JObject)slotData["shop"]).ToObject<Dictionary<EShopUpgradeID, int>>();
             RandoShopManager.FigurePrices = ((JObject)slotData["figures"]).ToObject<Dictionary<EFigurine, int>>();
+            RandoPortalManager.LimitedPortals =
+                Convert.ToBoolean(slotData.TryGetValue("limited_portals", out var limitPortal));
         }
 
         private static void SetupScoutedLocations(LocationInfoPacket scoutedLocationInfo)
@@ -142,8 +144,11 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
             var saveManager = Manager<SaveManager>.Instance;
             saveManager.SelectSaveGameSlot(slot);
             saveManager.NewGame();
-            saveManager.GetCurrentSaveGameSlot().SlotName =
-                ArchipelagoClient.Session.Players.GetPlayerAlias(ArchipelagoClient.Session.ConnectionInfo.Slot);
+            if (ArchipelagoClient.Authenticated)
+                saveManager.GetCurrentSaveGameSlot().SlotName =
+                    ArchipelagoClient.Session.Players.GetPlayerAlias(ArchipelagoClient.Session.ConnectionInfo.Slot);
+            else
+                saveManager.GetCurrentSaveGameSlot().SlotName = "Ayy Lmao";
             // add everything to the various managers that we need for our save slot, following the order in SaveGameSlot.UpdateSaveGameData()
             var progManager = Manager<ProgressionManager>.Instance;
             progManager.lastSaveTime = Time.time;
@@ -178,21 +183,21 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
             progManager.secondQuest = true;
             var discoveredLevels = new List<ELevel>
             {
-                ELevel.Level_01_NinjaVillage,
-                ELevel.Level_02_AutumnHills,
-                ELevel.Level_03_ForlornTemple,
-                ELevel.Level_04_Catacombs,
-                ELevel.Level_06_A_BambooCreek,
-                ELevel.Level_05_A_HowlingGrotto,
-                ELevel.Level_07_QuillshroomMarsh,
-                ELevel.Level_08_SearingCrags,
-                ELevel.Level_09_A_GlacialPeak,
-                ELevel.Level_10_A_TowerOfTime,
-                ELevel.Level_11_A_CloudRuins,
-                ELevel.Level_12_UnderWorld,
-                ELevel.Level_13_TowerOfTimeHQ,
-                ELevel.Level_04_C_RiviereTurquoise,
-                ELevel.Level_05_B_SunkenShrine,
+                // ELevel.Level_01_NinjaVillage,
+                // ELevel.Level_02_AutumnHills,
+                // ELevel.Level_03_ForlornTemple,
+                // ELevel.Level_04_Catacombs,
+                // ELevel.Level_06_A_BambooCreek,
+                // ELevel.Level_05_A_HowlingGrotto,
+                // ELevel.Level_07_QuillshroomMarsh,
+                // ELevel.Level_08_SearingCrags,
+                // ELevel.Level_09_A_GlacialPeak,
+                // ELevel.Level_10_A_TowerOfTime,
+                // ELevel.Level_11_A_CloudRuins,
+                // ELevel.Level_12_UnderWorld,
+                // ELevel.Level_13_TowerOfTimeHQ,
+                // ELevel.Level_04_C_RiviereTurquoise,
+                // ELevel.Level_05_B_SunkenShrine,
             };
             progManager.levelsDiscovered.AddRange(discoveredLevels);
             progManager.allTimeDiscoveredLevels.AddRange(discoveredLevels);
@@ -205,47 +210,48 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
                 "NinjaVillageElderCutScene",
                 "DemonGeneralCutScene",
                 "NinjaVillageIntroEndCutScene",
-                "LeafGolemIntroCutScene",
-                "LeafGolemOutroCutScene",
-                "NecrophobicWorkerCutscene",
-                "NecromancerIntroCutscene",
-                "NecromancerOutroCutscene",
-                "HowlingGrottoBossIntroCutscene",
-                "HowlingGrottoBossOutroCutscene",
-                "HowlingGrottoToQuillshroomFirstQuestCutScene",
-                "QuillshroomMarshBossIntroCutscene",
-                "QuillshroomMarshBossOutroCutscene",
-                "SearingCragsBossIntroCutscene",
-                "SearingCragsBossOutroCutscene",
-                "SearagToGlacialPeakEntranceCutscene",
-                "GlacialPeakTowerOfTimeCutscene",
-                "GlacialPeakTowerOutCutscene",
-                "QuibbleIntroCutscene",
-                "TowerOfTimeBossIntroCutscene",
-                "TowerOfTimeBossOutroCutscene",
+                // "LeafGolemIntroCutScene",
+                // "LeafGolemOutroCutScene",
+                // "NecrophobicWorkerCutscene",
+                // "NecromancerIntroCutscene",
+                // "NecromancerOutroCutscene",
+                // "HowlingGrottoBossIntroCutscene",
+                // "HowlingGrottoBossOutroCutscene",
+                // "HowlingGrottoToQuillshroomFirstQuestCutScene",
+                // "QuillshroomMarshBossIntroCutscene",
+                // "QuillshroomMarshBossOutroCutscene",
+                // "SearingCragsBossIntroCutscene",
+                // "SearingCragsBossOutroCutscene",
+                // "SearagToGlacialPeakEntranceCutscene",
+                // "GlacialPeakTowerOfTimeCutscene",
+                // "GlacialPeakTowerOutCutscene",
+                // "QuibbleIntroCutscene",
+                // "TowerOfTimeBossIntroCutscene",
+                // "TowerOfTimeBossOutroCutscene",
                 "Teleport16BitsRoomCutscene",
                 "To16BitsCutscene",
                 "TowerOfTimeTeleportToCloudRuinsCutscene",
-                "CloudRuinsTowerEntranceCutscene",
-                "ManfredBossIntroCutscene",
-                "ManfredBossOutroCutscene",
-                "DemonGeneralBossIntroCutscene",
-                "DemonGeneralBossOutroCutscene",
-                "UnderworldManfredEscapeCutscene",
-                "FutureMessengerCutscene",
+                // "CloudRuinsTowerEntranceCutscene",
+                // "ManfredBossIntroCutscene",
+                // "ManfredBossOutroCutscene",
+                // "DemonGeneralBossIntroCutscene",
+                // "DemonGeneralBossOutroCutscene",
+                // "UnderworldManfredEscapeCutscene",
+                // "FutureMessengerCutscene",
                 "SecondQuestStartShopCutscene",
                 "ArmoireOpeningCutscene",
                 "DialogCutscene",
                 "GoToTotMageDialog",
-                "RiviereTurquoisePortalOpeningCutscene",
-                "EnterPortalCutscene",
-                "ExitPortalCutscene",
+                // "RiviereTurquoisePortalOpeningCutscene",
+                // "EnterPortalCutscene",
+                // "ExitPortalCutscene",
                 "ProphetIntroCutscene",
-                "PortalOpeningCutscene",
-                "SunkenShrinePortalOpeningCutscene",
-                "SearingCragsPortalOpeningCutscene",
+                // "SunkenShrinePortalOpeningCutscene",
+                // "SearingCragsPortalOpeningCutscene",
                 "ExitPortalAwardMapCutscene"
             };
+            if (RandoPortalManager.LimitedPortals)
+                skipCutscenes.Add("PortalOpeningCutscene");
             progManager.cutscenesPlayed.AddRange(skipCutscenes);
             
             progManager.actionSequenceDone.AddRange(new []{

From 81360e1e7f2992983e51bff16ed3229bb40b6607 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 7 Jan 2024 06:30:39 -0600
Subject: [PATCH 10/63] bools are hard

---
 Utils/RandomizerStateManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 9cce89a..0caa9ec 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -250,7 +250,7 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
                 // "SearingCragsPortalOpeningCutscene",
                 "ExitPortalAwardMapCutscene"
             };
-            if (RandoPortalManager.LimitedPortals)
+            if (!RandoPortalManager.LimitedPortals)
                 skipCutscenes.Add("PortalOpeningCutscene");
             progManager.cutscenesPlayed.AddRange(skipCutscenes);
             

From 687b6f6b278ab51552597fa8a2bd58d4f7f775cf Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 7 Jan 2024 22:49:17 -0600
Subject: [PATCH 11/63] finish up removing rando save file button and clean up
 old ap save data so we don't try to load it from a deleted save

---
 APRandomizerMain.cs                        | 126 +++++----------------
 GameOverrideManagers/RandoPortalManager.cs |  72 +-----------
 Utils/RandoMenu.cs                         |   1 -
 Utils/RandomizerConstants.cs               |   2 -
 Utils/RandomizerStateManager.cs            |  46 +++++---
 5 files changed, 61 insertions(+), 186 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 5df642b..de42c68 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -28,12 +28,10 @@ public class APRandomizerMain : CourierModule
     {
         private float updateTimer;
         private float updateTime = 3.0f;
-        private bool clearedData = false;
+        private bool clearedData;
 
         private RandomizerStateManager randoStateManager;
 
-        TextEntryButtonInfo resetRandoSaveFileButton;
-  
         SubMenuButtonInfo versionButton;
         SubMenuButtonInfo seedNumButton;
 
@@ -70,7 +68,7 @@ public class APRandomizerMain : CourierModule
         public override void Load()
         {
             Console.WriteLine("Randomizer loading and ready to try things!");
-          
+
             //Initialize the randomizer state manager
             randoStateManager = new RandomizerStateManager();
 
@@ -84,14 +82,6 @@ public override void Load()
                 () => "Current seed number: " + GetCurrentSeedNum(),
                 null);
 
-            //Add Reset rando mod button
-            resetRandoSaveFileButton = Courier.UI.RegisterTextEntryModOptionButton(
-                () => "Reset Randomizer File Slot", OnRandoFileResetConfirmation,
-                1,
-                () => "Are you sure you wish to reset your save file for randomizer play?(y/n)",
-                () => "n",
-                CharsetFlags.Letter);
-
             //Add windmill shuriken toggle button
             windmillShurikenToggleButton = Courier.UI.RegisterSubMenuModOptionButton(
                 () => Manager<ProgressionManager>.Instance.useWindmillShuriken
@@ -155,21 +145,21 @@ public override void Load()
                     ? "Hide status information"
                     : "Display status information",
                 OnToggleAPStatus);
-            
+
             //Add Archipelago message button
             archipelagoToggleMessagesButton = Courier.UI.RegisterSubMenuModOptionButton(
                 () => ArchipelagoClient.DisplayAPMessages
                     ? "Hide server messages"
                     : "Display server messages",
                 OnToggleAPMessages);
-            
+
             //Add Archipelago filter messages button
             archipelagoToggleFilterMessagesButton = Courier.UI.RegisterSubMenuModOptionButton(
                 () => ArchipelagoClient.FilterAPMessages
                     ? "Show all server messages"
                     : "Filter messages to only relevant to me",
                 () => ArchipelagoClient.FilterAPMessages = !ArchipelagoClient.FilterAPMessages);
-            
+
             //Add Archipelago hint popup button
             archipelagoToggleHintPopupButton = Courier.UI.RegisterSubMenuModOptionButton(
                 () => ArchipelagoClient.HintPopUps ? "Disable hint popups" : "Enable hint popups",
@@ -213,34 +203,19 @@ public override void Load()
                     : "Enable Music Shuffle",
                 () => RandoMusicManager.ShuffleMusic = !RandoMusicManager.ShuffleMusic);
 
-            RandoMenu.ArchipelagoMenuButton = Courier.UI.RegisterSubMenuOptionButton(() => "Randomizer", RandoMenu.DisplayRandoMenu);
-            
-            // PopulateRandoButtons();
-            //
-            // void PopulateRandoButtons()
-            // {
-            //     RandoMenu.versionButton =
-            //         RandoMenu.RegisterSubRandoButton(
-            //             () => "Messenger AP Randomizer: v" + ItemRandomizerUtil.GetModVersion(), null);
-            //     RandoMenu.connectMenuButton = RandoMenu.RegisterSubRandoButton(() => "Connect to Archipelago", null);
-            //     RandoMenu.resetSaveButton = RandoMenu.RegisterMultipleRandoButton(() => "Reset Randomizer File Slot", null,
-            //         ResetSaves, null, RandoMenu.GetTextForResetIndex);
-            // }
-            //
-            // RandoMenu.ArchipelagoMenuButton = Courier.UI.RegisterSubMenuOptionButton(() => "Randomizer", RandoMenu.DisplayRandoMenu);
-            //
-            // PopulateRandoButtons();
-            //
-            // void PopulateRandoButtons()
-            // {
-            //     RandoMenu.versionButton =
-            //         RandoMenu.RegisterSubRandoButton(
-            //             () => "Messenger AP Randomizer: v" + ItemRandomizerUtil.GetModVersion(), null);
-            //     RandoMenu.connectMenuButton = RandoMenu.RegisterSubRandoButton(() => "Connect to Archipelago", null);
-            //     RandoMenu.resetSaveButton = RandoMenu.RegisterMultipleRandoButton(() => "Reset Randomizer File Slot", null,
-            //         ResetSaves, null, RandoMenu.GetTextForResetIndex);
-            // }
+            RandoMenu.ArchipelagoMenuButton =
+                Courier.UI.RegisterSubMenuOptionButton(() => "Randomizer", RandoMenu.DisplayRandoMenu);
 
+            PopulateRandoButtons();
+            
+            void PopulateRandoButtons()
+            {
+                RandoMenu.versionButton =
+                    RandoMenu.RegisterSubRandoButton(
+                        () => "Messenger AP Randomizer: v" + ItemRandomizerUtil.GetModVersion(), null);
+                RandoMenu.connectMenuButton = RandoMenu.RegisterSubRandoButton(() => "Connect to Archipelago", null);
+            }
+            
             //Plug in my code :3
             On.InventoryManager.AddItem += InventoryManager_AddItem;
             On.ProgressionManager.SetChallengeRoomAsCompleted += ProgressionManager_SetChallengeRoomAsCompleted;
@@ -250,7 +225,8 @@ public override void Load()
             On.SaveGameSelectionScreen.LoadGame += SaveGameSelectionScreen_LoadGame;
             On.SaveGameSelectionScreen.OnLoadGame += SaveGameSelectionScreen_OnLoadGame;
             On.SaveGameSelectionScreen.OnNewGame += SaveGameSelectionScreen_OnNewGame;
-            On.SaveGameSelectionScreen.LaunchGame += SaveGameSelectionScreen_LaunchGame;
+            On.SaveGameSelectionScreen.ConfirmSaveDelete += SaveGameSelectionScreen_ConfirmSaveDelete;
+            On.SaveGameSelectionScreen.OnDeleteChoiceDone += SaveGameSelectionScreen_OnDelete;
             On.BackToTitleScreen.GoBackToTitleScreen += PauseScreen_OnQuitToTitle;
             On.NecrophobicWorkerCutscene.Play += NecrophobicWorkerCutscene_Play;
             IL.RuxxtinNoteAndAwardAmuletCutscene.Play += RuxxtinNoteAndAwardAmuletCutscene_Play;
@@ -313,7 +289,6 @@ public override void Load()
         public override void Initialize()
         {
             //I only want the generate seed/enter seed mod options available when not in the game.
-            resetRandoSaveFileButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE;
             //Also the AP buttons
             archipelagoHostButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
             archipelagoPortButton.IsEnabled = () => !ArchipelagoClient.Authenticated &&
@@ -587,7 +562,6 @@ void SaveGameSelectionScreen_OnLoadGame(On.SaveGameSelectionScreen.orig_OnLoadGa
             }
 
             orig(self, slotIndex);
-            RandomizerStateManager.Instance.InGame = true;
             Manager<AudioManager>.Instance.levelMusicShuffle = RandoMusicManager.ShuffleMusic;
             RandoMusicManager.BuildMusicLibrary();
         }
@@ -604,17 +578,20 @@ void SaveGameSelectionScreen_OnNewGame(On.SaveGameSelectionScreen.orig_OnNewGame
 #endif
         }
 
-        private void SaveGameSelectionScreen_LaunchGame(On.SaveGameSelectionScreen.orig_LaunchGame orig, SaveGameSelectionScreen self, string leveltoload, CheckpointSaveInfo checkpointsaveinfo)
+        private void SaveGameSelectionScreen_ConfirmSaveDelete(On.SaveGameSelectionScreen.orig_ConfirmSaveDelete orig, SaveGameSelectionScreen self, SaveSlotUI slot)
         {
-            Console.WriteLine("attempting to launch game");
-            try
-            {
-                orig(self, leveltoload, checkpointsaveinfo);
-            }
-            catch (Exception e)
+            randoStateManager.CurrentFileSlot = slot.slotIndex + 1;
+            orig(self, slot);
+        }
+
+        private void SaveGameSelectionScreen_OnDelete(On.SaveGameSelectionScreen.orig_OnDeleteChoiceDone orig, SaveGameSelectionScreen self, bool delete)
+        {
+            if (delete)
             {
-                Console.WriteLine(e);
+                randoStateManager.APSave[randoStateManager.CurrentFileSlot] = new ArchipelagoData();
+                Save.APSaveData = RandoSave.GetSaveData();
             }
+            orig(self, delete);
         }
         
         void PauseScreen_OnQuitToTitle(On.BackToTitleScreen.orig_GoBackToTitleScreen orig)
@@ -634,7 +611,6 @@ void PauseScreen_OnQuitToTitle(On.BackToTitleScreen.orig_GoBackToTitleScreen ori
             clearedData = false;
             orig();
             Console.WriteLine("returned to title");
-            RandomizerStateManager.Instance.InGame = false;
         }
 
         //Fixing necro cutscene check
@@ -753,49 +729,7 @@ void MusicBox_SetNotesState(On.MusicBox.orig_SetNotesState orig, MusicBox self)
             // this determines which notes should be shown present in the music box
             orig(self);
         }
-
-        bool OnRandoFileResetConfirmation(string answer)
-        {
-            
-            if(!"y".Equals(answer.ToLowerInvariant()))
-            {
-                return true;
-            }
-
-            ConfirmFileReset();
-            return true;
-        }
         
-        void ConfirmFileReset()
-        {
-            ArchipelagoData.ClearData();
-            randoStateManager = new RandomizerStateManager();
-            clearedData = true;
-            try
-            {
-                Save.APSaveData = RandoSave.GetSaveData();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
-            }
-            string path = Application.persistentDataPath + "/SaveGame.txt";
-            using (StreamWriter sw = File.CreateText(path))
-            {
-                sw.WriteLine(RandomizerConstants.SAVE_FILE_STRING);
-            }
-
-            Manager<SaveManager>.Instance.LoadSaveGame();
-            //Delete the existing save file selection ui since it really wants to hold on to the previous saves data.
-            GameObject.Destroy(Manager<UIManager>.Instance.GetView<SaveGameSelectionScreen>().gameObject);
-            //Reinit the save file selection ui.
-            SaveGameSelectionScreen selectionScreen =
-                Manager<UIManager>.Instance.ShowView<SaveGameSelectionScreen>(EScreenLayers.MAIN, null, false,
-                    AnimatorUpdateMode.Normal);
-            selectionScreen.GoOffscreenInstant();
-
-        }
-
         public static void OnToggleWindmillShuriken()
         {
             //Toggle Shuriken
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 4a14d2b..0142b75 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -6,77 +6,9 @@ namespace MessengerRando.GameOverrideManagers
 {
     public class RandoPortalManager
     {
-        public static bool LimitedPortals;
-        public static List<TowerOfTimePortal> OpenPortals;
+        public static int NumStartingPortals = 5;
 
-
-        public static void CreatePortals()
-        {
-            Console.WriteLine("Creating portals");
-            try
-            {
-                var portals = Object.FindObjectsOfType<TowerOfTimePortal>();
-                foreach (var VARIABLE in portals)
-                {
-                    Console.WriteLine(VARIABLE.name);
-                }
-                // var portalCutscene = Object.FindObjectOfType<PortalOpeningCutscene>();
-                // var rivierePortal = Object.FindObjectOfType<RiviereTurquoisePortalOpeningCutscene>().portal;
-                // var sunkenShrinePortal = Object.FindObjectOfType<SunkenShrinePortalOpeningCutscene>().portal;
-                // var searingCragsPortal = Object.FindObjectOfType<SearingCragsPortalOpeningCutscene>().portal;
-                // OpenPortals = new List<TowerOfTimePortal>
-                // {
-                //     portalCutscene.autumnHillsPortal, rivierePortal, portalCutscene.howlingGrottoPortal, sunkenShrinePortal,
-                //     searingCragsPortal, portalCutscene.glacialPeakPortal
-                // };
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
-            }
-            var rng = new Random();
-            var n = OpenPortals.Count;
-            while (n > 1)
-            {
-                var k = rng.Next(n);
-                n--;
-                var value = OpenPortals[k];
-                OpenPortals[k] = OpenPortals[n];
-                OpenPortals[n] = value;
-            }
-
-            foreach (var portal in OpenPortals)
-            {
-                Console.WriteLine(portal.name);
-            }
-        }
-        
-        public static void OpenPortalEvent(On.PortalOpeningCutscene.orig_OnOpenPortalEvent orig, PortalOpeningCutscene self, string eventid)
-        {
-            // orig(self, eventid);
-            switch (eventid)
-            {
-                case "AutumnHills": // first portal
-                    UnlockPortal(self, OpenPortals[0]);
-                    break;
-                case "HowlingGrotto":
-                    UnlockPortal(self, OpenPortals[1]);
-                    break;
-                case "GlacialPeak":
-                    UnlockPortal(self, OpenPortals[2]);
-                    break;
-                default:
-                    orig(self, eventid);
-                    break;
-            }
-        }
-
-        private static void UnlockPortal(PortalOpeningCutscene cutscene, TowerOfTimePortal portal)
-        {
-            portal.locked = false;
-            portal.animator.SetTrigger("Open");
-            Manager<AudioManager>.Instance.PlaySoundEffect(cutscene.portalOpeningSFX);
-        }
+        public static List<string> StartingPortals;
 
     }
 }
\ No newline at end of file
diff --git a/Utils/RandoMenu.cs b/Utils/RandoMenu.cs
index b8fe3e0..edb50cb 100644
--- a/Utils/RandoMenu.cs
+++ b/Utils/RandoMenu.cs
@@ -21,7 +21,6 @@ public class RandoMenu
 
         public static SubMenuButtonInfo versionButton;
         public static SubMenuButtonInfo connectMenuButton;
-        public static MultipleOptionButtonInfo resetSaveButton;
 
 
         public static void DisplayRandoMenu()
diff --git a/Utils/RandomizerConstants.cs b/Utils/RandomizerConstants.cs
index 7018c15..d983d8d 100644
--- a/Utils/RandomizerConstants.cs
+++ b/Utils/RandomizerConstants.cs
@@ -44,7 +44,5 @@ public static Dictionary<string, EItems> GetCutsceneMappings()
             return cutsceneMappings;
 
         }
-
-        public const string SAVE_FILE_STRING = "ú£òà÷äÒíîõò£»Úú£ìàñÒà÷äÅàõàÃøÍä÷äíÏàì䣻ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­£ìàñÒà÷äÅàõàÃøÍä÷äíÏàìäÏäö£»ú£êäøò£»Ú£Íä÷äíÞ±°ÞÏèïëà×èííàæ䣭£Íä÷äíÞ±³ÞÀôõôìïÉèííò£­£Íä÷äíÞ±²ÞÇîóíîóïÕäìñí䣭£Íä÷äíÞ±µÞÃÞÅàóêÂà÷䣭£Íä÷äíÞ±µÞÂÞÓè÷èäóäÕôóðôîèò䣭£Íä÷äíÞ±µÞÂàõàâîìãò£­£Íä÷äíÞ±´ÞÀÞÉîöíèïæÆóîõõ£Íä÷äíÞ±´ÞÃÞÒôïêäïÒéóèï䣭£Íä÷äíÞ±·ÞÀÞÃàìãîîÂóää꣭£Íä÷äíÞ±¶ÞÐôèííòéóîîìÌàóò飭£Íä÷äíÞ±¹ÞÒäàóèïæÂóàæò£­£Íä÷äíÞ±¸ÞÀÞÆíàâèàíÑäà꣭£Íä÷äíÞ±¸ÞÃÞÄíäìäïõàíÒêøíàïåò£­£Íä÷äíÞ°±ÞÀÞÕîöäóÎçÕèì䣭£Íä÷äíÞ°°ÞÀÞÂíîôåÓôèïò£­£Íä÷äíÞ°°ÞÃÞÌôòèâÃîù£­£Íä÷äíÞ°³ÞÔïåäóÖîóí壭£Íä÷äíÞ°²ÞÕîöäóÎçÕèìäÉУ­£Íä÷äíÞ°µÞÂîóóôñõäåÇôõôó䣭£Íä÷äíÞ±³ÞÀôõôìïÉèííòÞÅäì£Íä÷äíÞ±µÞÂàõàâîìãòÞÅäì£Íä÷äíÞ°´ÞÒôó磭£Íä÷äíÞ°·ÞÃäàâ飭£Íä÷äíÞ°¶Þ×îíâàï£Íä÷äíÞ°¹Þ×îíâàïîÞÂéàò䣭£Íä÷äíÞÕäòõÒâíîôõ£Ü­£÷àíôäò£»Úú£êäøò£»Úµµ¹±²·­´°±··±­´¶¶²¹±­²¹¸´±¹­²²´±¶·­³¹µ¶µ±­³²¹´±±­°¸·²´·­°´¹²±¹­°³µ²´·­¸µ´±±Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú³·°°µ±­³°·¸µ¹­°¶·¹´³­°µ±¹´³­°±¹¸µ¹­¹°°µ±­´¶µ³¹­²¶¹°³­³³³¸³­³¸´¶³­°·°±±­³´´¸µ­µ³±¶µ­²²³¸±­´°¹°¹­¶µµµ³­°±°°·³­°²°¸¶¹­°··¹¸±­³±´¹¸¹­³µ¸±±³­³¶³°³³­³¸·³··­²µ¶´·³­²³°²¶±­³¸·³±³­²µ¶µ¸¹­µ±³¹¸±­µ·³²¶¹­µ²³±¸±­µ¸²·³·­´´¸³´¹­·³¹¸¹·­¶±³¹°±­¶¹±¶²±­¹·³¶µ·­¹³°°¸µ­¸±´³´¹­¸µ¹¹´¹­°±²¸±··­°°²²²¶±­°±¹´·¶µ­°³²°¶¶±­°°¹³±³·­°²²µ³··­°µµ±¹´¹­°´´°´µ·­°µ¸´·´¹­°µµ±¶¸µ­°´´°µ¹³­°···³··­°¶¹´°µ·­°¸±¹°³³­··´µ¹³Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°¹±­³°´µ­µ¶¸µ­°²±¹³Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»Ú³±±°±³µ­°²¹¶±°¹­°µ¸´·´¹­°¹¶´±µ±­°¶´²°´³­°·²´²·±­°´³°··µ­°µ°³±·µÜ­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú¹²¸µ­°¹¶²±­²²°·³­´°·¸±­·³´³³­¹¶°¸µ­°°´¸·³­°²°¸°µ­°µ¹¹³·­°¹´¶¹·­³±´¹²µ­³³·¸±·­³¶³±´¹­²³°²±·­³¸·°²¹­³¶°¸¸µ­²³°³µ³­²µ¶µ²µ­²¶µ·´±­µ±³¹¸±­µ·³²¶¹­´³´¸·³­µ¸²·³·­µ·³²°µ­´³´¹¸¹­´´¸³´¹­·³¹¸¹·­··´µ°¹­¶µ°³¸±­¹³°³´¹­¸±´²³³­¹·³¶µ·­¹³°°¸µ­¸±´³´¹­¸µ¹¹´¹­¸¸²µ¹³­°±¹´¶²¹­°±²¸±··­°°²²²¶±­°°¹³±¸±­°³¹³´²¹­°²¹¶±¹³­°µ¸´¶³³Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú²µ°³­°¹±­³°´µ­µ¶¸µ­°²±¹³­°¹¶¸µ­¹²¸µ­°¹¶²±­³´µ··­²²³³·­µ³±°±­´°¹°¹­·³·´±­¹¶²³³­°°·±¸±­°±°°·³­°²°¸¶¹­°µ¹¸´µ­°¹´¸°µ­°··¹¸±­³±´¹¸¹­³³·¸¶±­³µ¸±··­³¸·³··­³¶³°³³­³µ¸±±³­²³°µ²µ­²¶µ¶¶¹­µ±²±°¹­µ²³³¹³­µ·³´¶±­´³·°´µ­´¸²¹²µ­··´·°±­¶µ°µ¹³­¶±²±±³­··´´µ·­¶µ°µ°¹­¶±³¸²¹­··´µ¹³­¹³°²¹·­¶¹±¹´¹­¹·³¹¶µ­¸µ¹¸¹·­¸±´²¹·­¸¸²·°±­¹·³¹°±­¹³°³´¹Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°·±²·­···±­°²°µ·Ü­£÷àíôäò£»Úõóôä­õóôä­õóôäÜü­ú£êäøò£»Ú´¶²±±­²¶·¹µ­³³°·µ­°±¶µ±­²µ°³­·´¸·­°±¹±µ­²µ¶·­°²°·­µ¶¸µ­³°´µ­¹²¸µ­°±µ·µ­°´·²³­³¹¸¶·­µ·µ°·­²¶°´³­²²°·³­´°·¸±­¶µ²°µ­¹¶°¸µ­°°´¸·³­°±°±²µ­°±¶¸±µ­¹±³³µ­¸²´¹µ­°³²²°³­°´¶°²·­°²¸·¹±­°²°¹´±­°··¶·³­°¶´´´³­°¸´±´·­³²¶±¶³­³°´´³±­³´¸´¹µ­³¹²°¹µ­²²²²¸³­²¹¶·¸·­²·±±±±­²µ¶²¶±­²¶µ´¹·­µ±³¹³·­µ·³²°µ­µ¸²·³·­´³´¸·³­´´¸²³³­·³¸±´±Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°¹±­³°´µ­¹²¸µ­°¹¶²±­³´µ··­µ°¸µ·­·³´³³­¶µ²¶¹­°±°±¸¹­°²°¸°µ­°··¹³·­³±´¹²µ­³µ¹¸²¹­³¸·°²¹­²µ¶µ²µ­µ±³¹³·­µ·³²°µ­´³´¹¸¹­µ¸²´·³­´´¸°¸µ­·³¹¸³³­··´²´µ­¶µ°³³·­¹³°°¸µ­¸±´³´¹­¹·³·¹³­¸µ¹¶¸µ­¸±´°¸µ­¸¸²²´µ­°±²¸±±³­°°²²²±·­°°¹³±³·­°³¹³µ¶µ­°²¹¶±°¹­°µ¸´·´¹­°·±¹²¸µ­°´´°µ¹³­°···³··­°¶¹´°µ·­°¹µ·°´µ­°¸¶°°¶¹­³°±±³¸¹­³°··µ³·­³²±°·¸±­³²¶±¹¸±­³µµ°±´±­³²¶±¹³·­³´°³³²µ­³·´¶¶²¹­³¹±¶²²¹Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°²°·­µ¶¸µ­°²±¹³­¹²¸µ­°±µ·µ­°´·²³­³¹¸¶·­µ·µ°·­´·¶±µ­·¹±°·­¹±²´³­°±¹±²³­¸²·µ¹­°²¸¹±¹­°¶´·¹±­³°´·µ¹­³²¶³±±­°¸´°¹µ­³°´¶°³­³²¶³·µ­³´¸¹µ±­³¹²µµ±­²²²·µ¹­²±¹±±±­²·±³´·­²¹¶¸´³­µ°··¶³­µµ·µ°·­µ¶¶°¹µ­´±¹¸¶·­´µ°¶¸³­·°±µ²³­·¹²°·¹­¶·±±±±­¹µ±¸³¹­¹¹³¸·±­¸³·±°·­¸¶±±¸·­°±°´³±±­°±·°²³¹­¸¶±°·±­¹¹²±¹¹­³¹²·²³­³·±±²³­¶¸¸¸³±­¶´¸¸²·­¶³±¸¶·­·¹²±µ±­·µ·°³¹­·°±³µ±­´µ°·±±Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú¸¸µ²¶¹­¸±·³°¹­¹·²·µ³­¸µ¸¶´µ­¸±·°´µ­¹·²´¶¹­¹³³±³·­¸±·±¸±­¸¸µ³´±­¸µ¸·³·­¸±·±³·­¹·²µ´±­¶¹°µ²µ­¶±²´°µ­···±´¹­·³¸·³·­´¸µ³°¹­´´¸¹²µ­´³·µ¶µ­µ¸µ°²¹­´´¸¶¶±­·³¸µ¸¹­´¸µ±¸±­´´¸¶±·­µ¸µ±¶µ­µ·³¶·³­µ±²³¶µ­²¶´±²µ­²µ¶¹°¹­µ±²³°±­µ·³·¸¹­µ²³µ°±­µ±²°µ·­²¶µ¸±·­²µ¶·¸±­³¸·²¸µ­³¶³³´±­³µ¸°²±­³±·±³·­°¹´¸¶¹­°µ¸±°¹­°°·°´µ­°±°³³·­¹¶²³³­¶µµµ³­·³´¹·­´°¶´µ­µ°¸µ·­·³´³³­¹¶°¸µÜ­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»Ú°¹±­³°´µ­¹²¸µ­°±µ·µ­²³·µ­·²¹µ­°´·²³­³°¹³µ­°±´³¹­µ¹µ°­¹´±´­°²°¸²­³°¹¹¹­°´·¸·­³¸±µ±­²¶³¹±­µ·´µµ­´·¹²³­·¹°µµ­µ··±¹­²¶²µµ­³´·µ°­²²µ±°­´·¹¸·­¹±µ¹±­¸²¹µ±­·¹³±¹­´°¸¸²­·³¹³´­¹±´µµ­°±¹³³µ­°µ±±±±­°´¶µ´·­°¶´¸²·­°¸´µµ±­³°´¸·¹­³·±±²³Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú´¶¶²¹±­´°±··±­µµ¹±²·­µ°¹³³¹­²·°¶µ¹­²²´±°³­³¹µ·¶·­²±¸²·µ­³²¹µ²·­³°·¹³±­³³·¹³´­°¹´¶·¸­°¶·¶³µ­°µ¹¹±¸­°µ±¶³µ­°´¹³µµ­°¶·¶¹¹­°³µ³¸³­¸µµ²·­¹°±°³­¹¶°¶¶­´¶²±±­·¹·¶·­µ¶±°³­³¸µµµ­°´¸¶³­·´¸·­°²°·­µ¶¸µ­°²±¹³­³´µ··­µ°¸µ·­²²°·³­²¶°´³­·³´³³­´°·¸±­´··µ±­¶µ²¶¹­°±°±¸¹­°²°¸°µ­°··¹³·­³±´¹²µ­³µ¹¸²¹­³³·¹µ³­³±´¶¶±­³µ¹¹¶µ­³¶°¸¸µ­²³°³µ³­²¶µ´¹·­µ²³±³·­µ¸²´·³­´´¸°¸µ­·³¹¸³³­¶±³¶µ·­¶¹±···­¹·³·¹³­¸µ¹¶¸µ­°±²¸±±³­°°²²²±·­°±¹´·°±­°°±¶¹µ±­°³±´°´³­°°¹°¸·³­°³²°¶±·­°²²µ³±³­°²¹¶±°¹­°µµ±¶¸µ­°´´°µ¹³­°···³··­°¶¹´°µ·­°¸±¹°³³­³±²´°¸µ­³°··²·³­³²±°·³·­³µµ±¸¹·­³´¹µµµ³­³¶²°¸¸µ­³¹¹²·µ³­²±²¸²¹·Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»Úµµ¹±²·­²¹¸´±¹­²²´±¶·­³¹µ¶µ±­³²¹´±±­³·°°µ±­°¸·²´·­³°·¸µ¹­³²¹´·µ­°¸·µ³±­°´¹²¶³­°µ±¹´³­°³µ²´·­°±¹¹¹µ­¸µµ²·­·¹·¶·­µ¶±°³­´¶²·µ­·¹¶µ±­¹°°µ±­¸µ´·µ­·¹¹±µ­µ¶°µ±­³¸´¶³­³³³¸³­°·±²·­°±¹±µ­·´¸·­²µ°³­µ¶¶¶­¹µµ°­°²°³¸­°¹¹µ°­³´´¶¶­°²°¸²­³°¹¹¹­°´·¸·­°±´³¹­·²¹µ­²³·µ­°±µ·µ­³°¶·±­°¹¶²±­³´µ··­²²³³·­´°¶´µ­¶µ²¶¹­¹¶³´¹­°±°°·³­°°·±¸±­°²³±µ³­°µ¸±°¹­°·¶±°¹­°¹·±µ³­³±·±¸±­³µ¸°¸µ­³¸·²¸µ­²µ¶·¸±­µ±²±¹³­µ·³´¶±Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°¹±­³°´µ­°±¶µ±­²µ°³­µ¶¶¶­°²±·´Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜüÜü­£òéîñÈåÃøÒéîñÄ÷äïõòÅîï䣻ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­£âéàííäïæäÓîîìÂîìñíäõäåÃøÍä÷äí£»ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­£ìàòêÑèäâäòÂîííäâõäåÑäóÍä÷äí£»ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­£òäâîïåòÑíàøä壻±­£äìñõø£»çàíòä­£òíîõÏàì䣻£Óàïåîìèûäó°£­£õîõàíÅäàõéÂîôïõ£»±­£íàòõÑóîñéäâèäòÏàìäò£»ÚÜ­£ðôèããíäÒõîíäïÒéàóåÂîôïõ£»±­£ôòäÖèïåìèííÒéôóèêäçàíòä­£òäâîïåÐôäòõ£»õóôä­£ðôääïÎçÐôèííòÔïâôóòä壻çàíòä­£õèìäòéàóåòÅóîññäåÈïÒèïꣻ±­£âéäâêñîèïõÒà÷äÈïçú£ìàïࣻ±­£íîàåäåÍä÷äíÅèìäïòèî³­£ñíàøäóÍîâàõèîïÅèìäïòèî³­£íîàåäåÍä÷äíÏàì䣻£Íä÷äíÞ±³ÞÀôõôìïÉèííòÞÃôèí壭£ñíàøäóÍîâàõèîïÒâäïäÏàì䣻£Íä÷äíÞ°²ÞÕîöäóÎçÕèìäÉУ­£íîàåäåÍä÷äíÑíàøäóÑîòèõèîú£ù£»µ¹´¯±³¸¸¸¹¶¶¸³¸·¸­£ø£»¬°±°¯´­£û£»±¯±ü­£íîàåäåÍä÷äíÂéäâêñîèïõÈïåäù£»¬°­£ñíàøäóÇàâèïæÅèóäâõèî°¯±ü­£íä÷äíòÅèòâî÷äóä壻ڱ­°­³­´­¹­·­¸­°±­°°­°²­°´­°¶­°¹­µ­¶Ü­£àííÕèìäÍä÷äíòÅèòâî÷äóä壻ڱ­°­³­´­¹­·­¸­°±­°°­°²­°´­°¶­°¹­µ­¶Ü­£èòÍä÷äíÅèòâî÷äóäåÀöàóåä壻õóôä­£èõäìò£»ú£êäøò£»Ú²­±­¶­´³Ü­£÷àíôäò£»Ú°­±­°­°Üü­£àííÕèìäÈõäìò£»ú£êäøò£»Ú²­±­¶­´³Ü­£÷àíôäò£»Ú°­±­°­°Üü­£òéîñÔñæóàåäòÔïíîâêä壻ÚÜ­£çíàæòÒäõ£»Ú£ÂíîôåÒõäñÕôõîóèàíÅîï䣭£ÓôùùõèïÄïâîôïõäóÞ°£­£ÓôùùõèïÄïâîôïõäóÞ³£­£ÌàïçóäåÂéàòäÞ°ÞÅîï䣭£ÌàïçóäåÂéàòäÞ³ÞÅîï䣭£ÌàïçóäåÂéàòäÞ²ÞÅîï䣭£ÕÎÕÉÐÞÒìàííÌàæäÇèóòõÈïõäóóàâõèîïÅîï䣭££Ü­£çèæôóèïäòÂîííäâõä壻ÚÜ­£çäàõéäóòÂîííäâõä壻ÚÜ­£ãîòòäòÅäçäàõä壻ڣÍäàçÆîíä죭£Ïäâóîìàïâäó£­£ÄìäóàíåÆîíä죭£ÐôääïÎçÐôèííò£­£ÂîíîòÞÒôòòäò£­£ÀóâàïäÆîíä죭£Ìàïçóä壭£ÅäìîïÆäïäóàí£Ü­£àííÕèìäÃîòòäòÅäçäàõä壻ڣÍäàçÆîíä죭£Ïäâóîìàïâäó£­£ÄìäóàíåÆîíä죭£ÐôääïÎçÐôèííò£­£ÂîíîòÞÒôòòäò£­£ÀóâàïäÆîíä죭£Ìàïçóä壭£ÅäìîïÆäïäóàí£Ü­£éèïõòÅäâèñéäóä壻ÚÜ­£ñóîñéäâèäòÑèïò£»ÚÜ­£òéîñÅèàíîæòÓäà壻ÚÜ­£âôõòâäïäòÑíàøä壻ڣÌäòòäïæäóÂôõÒâäï䣭£ÂíîôåÒõäñÈïõóîÂôõÒâäï䣭£Ïèïëà×èííàæäÄíåäóÂôõÒâäï䣭£ÅäìîïÆäïäóàíÂôõÒâäï䣭£Ïèïëà×èííàæäÈïõóîÄïåÂôõÒâäï䣭£ÍäàçÆîíäìÈïõóîÂôõÒâäï䣭£ÍäàçÆîíäìÎôõóîÂôõÒâäï䣭£ÏäâóîñéîãèâÖîóêäóÂôõòâäï䣭£ÏäâóîìàïâäóÈïõóîÂôõòâäï䣭£ÏäâóîìàïâäóÎôõóîÂôõòâäï䣭£ÉîöíèïæÆóîõõîÃîòòÈïõóîÂôõòâäï䣭£ÉîöíèïæÆóîõõîÃîòòÎôõóîÂôõòâäï䣭£ÉîöíèïæÆóîõõîÕîÐôèííòéóîîìÇèóòõÐôäòõÂôõÒâäï䣭£ÐôèííòéóîîìÌàóòéÃîòòÈïõóîÂôõòâäï䣭£ÐôèííòéóîîìÌàóòéÃîòòÎôõóîÂôõòâäï䣭£ÒäàóèïæÂóàæòÃîòòÈïõóîÂôõòâäï䣭£ÒäàóèïæÂóàæòÃîòòÎôõóîÂôõòâäï䣭£ÒäàóàæÕîÆíàâèàíÑäàêÄïõóàïâäÂôõòâäï䣭£ÆíàâèàíÑäàêÕîöäóÎçÕèìäÂôõòâäï䣭£ÆíàâèàíÑäàêÕîöäóÎôõÂôõòâäï䣭£ÐôèããíäÈïõóîÂôõòâäï䣭£ÕîöäóÎçÕèìäÃîòòÈïõóîÂôõòâäï䣭£ÕîöäóÎçÕèìäÃîòòÎôõóîÂôõòâäï䣭£Õäíäñîóõ°·ÃèõòÓîîìÂôõòâäï䣭£Õî°·ÃèõòÂôõòâäï䣭£ÕîöäóÎçÕèìäÕäíäñîóõÕîÂíîôåÓôèïòÂôõòâäï䣭£ÂíîôåÓôèïòÕîöäóÄïõóàïâäÂôõòâäï䣭£ÌàïçóäåÃîòòÈïõóîÂôõòâäï䣭£ÌàïçóäåÃîòòÎôõóîÂôõòâäï䣭£ÅäìîïÆäïäóàíÃîòòÈïõóîÂôõòâäï䣭£ÅäìîïÆäïäóàíÃîòòÎôõóîÂôõòâäï䣭£ÔïåäóöîóíåÌàïçóäåÄòâàñäÂôõòâäï䣭£ÇôõôóäÌäòòäïæäóÂôõòâäï䣭£ÒäâîïåÐôäòõÒõàóõÒéîñÂôõòâäï䣭£ÀóìîèóäÎñäïèïæÂôõòâäï䣭£ÅèàíîæÂôõòâäï䣭£ÆîÕîÕîõÌàæäÅèàíî棭£Óè÷èäóäÕôóðôîèòäÑîóõàíÎñäïèïæÂôõòâäï䣭£ÄïõäóÑîóõàíÂôõòâäï䣭£ÄùèõÑîóõàíÂôõòâäï䣭£ÑóîñéäõÈïõóîÂôõòâäï䣭£ÑîóõàíÎñäïèïæÂôõòâäï䣭£ÒôïêäïÒéóèïäÑîóõàíÎñäïèïæÂôõòâäï䣭£ÒäàóèïæÂóàæòÑîóõàíÎñäïèïæÂôõòâäï䣭£ÄùèõÑîóõàíÀöàóåÌàñÂôõòâäïä£Ü­£òéîñÄ÷äïõòÅîï䣻ÚÜ­£àâõèîïÒäðôäïâäÅîï䣻ڣÀöàóåÆóèìñíîôÒäðôäïâä©Âíîï䨣­£ÀöàóåÆíèåîôÒäðôäïâä©Âíîï䨣­£ÀöàóåÆóàñíîôÒäðôäïâä©Âíîï䨣ܭ£âéàííäïæäÓîîìòÂîìñíäõä壻ÚÜ­£à÷àèíàãíäÌàòêËîêäÈåÍèòõ£»ÚÜ­£ìàòêÑèäâäòÂîííäâõä壻ÚÜ­£ìôòèâÏîõäòÅóîññä壻ÚÜ­£íîâêäåÈõäìò£»ÚÜ­£ïäöÆàìäÑíôò£»çàíòä­£ïäöÆàìäÑíôòÂîôïõ£»±­£òôóçÉèæéÒâîó䣻±­£ïäöÆàìäÑíôòÉèæéÒâîó䣻°­£ìôòõÒäíäâõÈõä죻çàíòä­£âôóóäïõÅÍ£»¬°­£åäàíÅîï䣻çàíòä­£äðôèññäåÒêè±­£íàòõËîêäÕèì䣻±¯±ü­ú£ìàñÒà÷äÅàõàÃøÍä÷äíÏàì䣻ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­£ìàñÒà÷äÅàõàÃøÍä÷äíÏàìäÏäö£»ú£êäøò£»Ú£Íä÷äíÞ±°ÞÏèïëà×èííàæ䣭£Íä÷äíÞ±³ÞÀôõôìïÉèííò£­£Íä÷äíÞ±²ÞÇîóíîóïÕäìñí䣭£Íä÷äíÞ±µÞÃÞÅàóêÂà÷䣭£Íä÷äíÞ±µÞÂÞÓè÷èäóäÕôóðôîèò䣭£Íä÷äíÞ±µÞÂàõàâîìãò£­£Íä÷äíÞ±´ÞÀÞÉîöíèïæÆóîõõ£Íä÷äíÞ±´ÞÃÞÒôïêäïÒéóèï䣭£Íä÷äíÞ±·ÞÀÞÃàìãîîÂóää꣭£Íä÷äíÞ±¶ÞÐôèííòéóîîìÌàóò飭£Íä÷äíÞ±¹ÞÒäàóèïæÂóàæò£­£Íä÷äíÞ±¸ÞÀÞÆíàâèàíÑäà꣭£Íä÷äíÞ±¸ÞÃÞÄíäìäïõàíÒêøíàïåò£­£Íä÷äíÞ°±ÞÀÞÕîöäóÎçÕèì䣭£Íä÷äíÞ°°ÞÀÞÂíîôåÓôèïò£­£Íä÷äíÞ°°ÞÃÞÌôòèâÃîù£­£Íä÷äíÞ°³ÞÔïåäóÖîóí壭£Íä÷äíÞ°²ÞÕîöäóÎçÕèìäÉУ­£Íä÷äíÞ°µÞÂîóóôñõäåÇôõôó䣭£Íä÷äíÞ±³ÞÀôõôìïÉèííòÞÅäì£Íä÷äíÞ±µÞÂàõàâîìãòÞÅäì£Íä÷äíÞ°´ÞÒôó磭£Íä÷äíÞ°·ÞÃäàâ飭£Íä÷äíÞ°¶Þ×îíâàï£Íä÷äíÞ°¹Þ×îíâàïîÞÂéàò䣭£Íä÷äíÞÕäòõÒâíîôõ£Ü­£÷àíôäò£»Úú£êäøò£»Úµµ¹±²·­´°±··±­´¶¶²¹±­²¹¸´±¹­²²´±¶·­³¹µ¶µ±­³²¹´±±­°¸·²´·­°´¹²±¹­°³µ²´·­¸µ´±±Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú³·°°µ±­³°·¸µ¹­°¶·¹´³­°µ±¹´³­°±¹¸µ¹­¹°°µ±­´¶µ³¹­²¶¹°³­³³³¸³­³¸´¶³­°·°±±­³´´¸µ­µ³±¶µ­²²³¸±­´°¹°¹­¶µµµ³­°±°°·³­°²°¸¶¹­°··¹¸±­³±´¹¸¹­³µ¸±±³­³¶³°³³­³¸·³··­²µ¶´·³­²³°²¶±­³¸·³±³­²µ¶µ¸¹­µ±³¹¸±­µ·³²¶¹­µ²³±¸±­µ¸²·³·­´´¸³´¹­·³¹¸¹·­¶±³¹°±­¶¹±¶²±­¹·³¶µ·­¹³°°¸µ­¸±´³´¹­¸µ¹¹´¹­°±²¸±··­°°²²²¶±­°±¹´·¶µ­°³²°¶¶±­°°¹³±³·­°²²µ³··­°µµ±¹´¹­°´´°´µ·­°µ¸´·´¹­°µµ±¶¸µ­°´´°µ¹³­°···³··­°¶¹´°µ·­°¸±¹°³³­··´µ¹³Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°¹±­³°´µ­µ¶¸µ­°²±¹³Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»Ú³±±°±³µ­°²¹¶±°¹­°µ¸´·´¹­°¹¶´±µ±­°¶´²°´³­°·²´²·±­°´³°··µ­°µ°³±·µÜ­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú¹²¸µ­°¹¶²±­²²°·³­´°·¸±­·³´³³­¹¶°¸µ­°°´¸·³­°²°¸°µ­°µ¹¹³·­°¹´¶¹·­³±´¹²µ­³³·¸±·­³¶³±´¹­²³°²±·­³¸·°²¹­³¶°¸¸µ­²³°³µ³­²µ¶µ²µ­²¶µ·´±­µ±³¹¸±­µ·³²¶¹­´³´¸·³­µ¸²·³·­µ·³²°µ­´³´¹¸¹­´´¸³´¹­·³¹¸¹·­··´µ°¹­¶µ°³¸±­¹³°³´¹­¸±´²³³­¹·³¶µ·­¹³°°¸µ­¸±´³´¹­¸µ¹¹´¹­¸¸²µ¹³­°±¹´¶²¹­°±²¸±··­°°²²²¶±­°°¹³±¸±­°³¹³´²¹­°²¹¶±¹³­°µ¸´¶³³Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú²µ°³­°¹±­³°´µ­µ¶¸µ­°²±¹³­°¹¶¸µ­¹²¸µ­°¹¶²±­³´µ··­²²³³·­µ³±°±­´°¹°¹­·³·´±­¹¶²³³­°°·±¸±­°±°°·³­°²°¸¶¹­°µ¹¸´µ­°¹´¸°µ­°··¹¸±­³±´¹¸¹­³³·¸¶±­³µ¸±··­³¸·³··­³¶³°³³­³µ¸±±³­²³°µ²µ­²¶µ¶¶¹­µ±²±°¹­µ²³³¹³­µ·³´¶±­´³·°´µ­´¸²¹²µ­··´·°±­¶µ°µ¹³­¶±²±±³­··´´µ·­¶µ°µ°¹­¶±³¸²¹­··´µ¹³­¹³°²¹·­¶¹±¹´¹­¹·³¹¶µ­¸µ¹¸¹·­¸±´²¹·­¸¸²·°±­¹·³¹°±­¹³°³´¹Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°·±²·­···±­°²°µ·Ü­£÷àíôäò£»Úõóôä­õóôä­õóôäÜü­ú£êäøò£»Ú´¶²±±­²¶·¹µ­³³°·µ­°±¶µ±­²µ°³­·´¸·­°±¹±µ­²µ¶·­°²°·­µ¶¸µ­³°´µ­¹²¸µ­°±µ·µ­°´·²³­³¹¸¶·­µ·µ°·­²¶°´³­²²°·³­´°·¸±­¶µ²°µ­¹¶°¸µ­°°´¸·³­°±°±²µ­°±¶¸±µ­¹±³³µ­¸²´¹µ­°³²²°³­°´¶°²·­°²¸·¹±­°²°¹´±­°··¶·³­°¶´´´³­°¸´±´·­³²¶±¶³­³°´´³±­³´¸´¹µ­³¹²°¹µ­²²²²¸³­²¹¶·¸·­²·±±±±­²µ¶²¶±­²¶µ´¹·­µ±³¹³·­µ·³²°µ­µ¸²·³·­´³´¸·³­´´¸²³³­·³¸±´±Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°¹±­³°´µ­¹²¸µ­°¹¶²±­³´µ··­µ°¸µ·­·³´³³­¶µ²¶¹­°±°±¸¹­°²°¸°µ­°··¹³·­³±´¹²µ­³µ¹¸²¹­³¸·°²¹­²µ¶µ²µ­µ±³¹³·­µ·³²°µ­´³´¹¸¹­µ¸²´·³­´´¸°¸µ­·³¹¸³³­··´²´µ­¶µ°³³·­¹³°°¸µ­¸±´³´¹­¹·³·¹³­¸µ¹¶¸µ­¸±´°¸µ­¸¸²²´µ­°±²¸±±³­°°²²²±·­°°¹³±³·­°³¹³µ¶µ­°²¹¶±°¹­°µ¸´·´¹­°·±¹²¸µ­°´´°µ¹³­°···³··­°¶¹´°µ·­°¹µ·°´µ­°¸¶°°¶¹­³°±±³¸¹­³°··µ³·­³²±°·¸±­³²¶±¹¸±­³µµ°±´±­³²¶±¹³·­³´°³³²µ­³·´¶¶²¹­³¹±¶²²¹Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°²°·­µ¶¸µ­°²±¹³­¹²¸µ­°±µ·µ­°´·²³­³¹¸¶·­µ·µ°·­´·¶±µ­·¹±°·­¹±²´³­°±¹±²³­¸²·µ¹­°²¸¹±¹­°¶´·¹±­³°´·µ¹­³²¶³±±­°¸´°¹µ­³°´¶°³­³²¶³·µ­³´¸¹µ±­³¹²µµ±­²²²·µ¹­²±¹±±±­²·±³´·­²¹¶¸´³­µ°··¶³­µµ·µ°·­µ¶¶°¹µ­´±¹¸¶·­´µ°¶¸³­·°±µ²³­·¹²°·¹­¶·±±±±­¹µ±¸³¹­¹¹³¸·±­¸³·±°·­¸¶±±¸·­°±°´³±±­°±·°²³¹­¸¶±°·±­¹¹²±¹¹­³¹²·²³­³·±±²³­¶¸¸¸³±­¶´¸¸²·­¶³±¸¶·­·¹²±µ±­·µ·°³¹­·°±³µ±­´µ°·±±Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú¸¸µ²¶¹­¸±·³°¹­¹·²·µ³­¸µ¸¶´µ­¸±·°´µ­¹·²´¶¹­¹³³±³·­¸±·±¸±­¸¸µ³´±­¸µ¸·³·­¸±·±³·­¹·²µ´±­¶¹°µ²µ­¶±²´°µ­···±´¹­·³¸·³·­´¸µ³°¹­´´¸¹²µ­´³·µ¶µ­µ¸µ°²¹­´´¸¶¶±­·³¸µ¸¹­´¸µ±¸±­´´¸¶±·­µ¸µ±¶µ­µ·³¶·³­µ±²³¶µ­²¶´±²µ­²µ¶¹°¹­µ±²³°±­µ·³·¸¹­µ²³µ°±­µ±²°µ·­²¶µ¸±·­²µ¶·¸±­³¸·²¸µ­³¶³³´±­³µ¸°²±­³±·±³·­°¹´¸¶¹­°µ¸±°¹­°°·°´µ­°±°³³·­¹¶²³³­¶µµµ³­·³´¹·­´°¶´µ­µ°¸µ·­·³´³³­¹¶°¸µÜ­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»Ú°¹±­³°´µ­¹²¸µ­°±µ·µ­²³·µ­·²¹µ­°´·²³­³°¹³µ­°±´³¹­µ¹µ°­¹´±´­°²°¸²­³°¹¹¹­°´·¸·­³¸±µ±­²¶³¹±­µ·´µµ­´·¹²³­·¹°µµ­µ··±¹­²¶²µµ­³´·µ°­²²µ±°­´·¹¸·­¹±µ¹±­¸²¹µ±­·¹³±¹­´°¸¸²­·³¹³´­¹±´µµ­°±¹³³µ­°µ±±±±­°´¶µ´·­°¶´¸²·­°¸´µµ±­³°´¸·¹­³·±±²³Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú´¶¶²¹±­´°±··±­µµ¹±²·­µ°¹³³¹­²·°¶µ¹­²²´±°³­³¹µ·¶·­²±¸²·µ­³²¹µ²·­³°·¹³±­³³·¹³´­°¹´¶·¸­°¶·¶³µ­°µ¹¹±¸­°µ±¶³µ­°´¹³µµ­°¶·¶¹¹­°³µ³¸³­¸µµ²·­¹°±°³­¹¶°¶¶­´¶²±±­·¹·¶·­µ¶±°³­³¸µµµ­°´¸¶³­·´¸·­°²°·­µ¶¸µ­°²±¹³­³´µ··­µ°¸µ·­²²°·³­²¶°´³­·³´³³­´°·¸±­´··µ±­¶µ²¶¹­°±°±¸¹­°²°¸°µ­°··¹³·­³±´¹²µ­³µ¹¸²¹­³³·¹µ³­³±´¶¶±­³µ¹¹¶µ­³¶°¸¸µ­²³°³µ³­²¶µ´¹·­µ²³±³·­µ¸²´·³­´´¸°¸µ­·³¹¸³³­¶±³¶µ·­¶¹±···­¹·³·¹³­¸µ¹¶¸µ­°±²¸±±³­°°²²²±·­°±¹´·°±­°°±¶¹µ±­°³±´°´³­°°¹°¸·³­°³²°¶±·­°²²µ³±³­°²¹¶±°¹­°µµ±¶¸µ­°´´°µ¹³­°···³··­°¶¹´°µ·­°¸±¹°³³­³±²´°¸µ­³°··²·³­³²±°·³·­³µµ±¸¹·­³´¹µµµ³­³¶²°¸¸µ­³¹¹²·µ³­²±²¸²¹·Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»Úµµ¹±²·­²¹¸´±¹­²²´±¶·­³¹µ¶µ±­³²¹´±±­³·°°µ±­°¸·²´·­³°·¸µ¹­³²¹´·µ­°¸·µ³±­°´¹²¶³­°µ±¹´³­°³µ²´·­°±¹¹¹µ­¸µµ²·­·¹·¶·­µ¶±°³­´¶²·µ­·¹¶µ±­¹°°µ±­¸µ´·µ­·¹¹±µ­µ¶°µ±­³¸´¶³­³³³¸³­°·±²·­°±¹±µ­·´¸·­²µ°³­µ¶¶¶­¹µµ°­°²°³¸­°¹¹µ°­³´´¶¶­°²°¸²­³°¹¹¹­°´·¸·­°±´³¹­·²¹µ­²³·µ­°±µ·µ­³°¶·±­°¹¶²±­³´µ··­²²³³·­´°¶´µ­¶µ²¶¹­¹¶³´¹­°±°°·³­°°·±¸±­°²³±µ³­°µ¸±°¹­°·¶±°¹­°¹·±µ³­³±·±¸±­³µ¸°¸µ­³¸·²¸µ­²µ¶·¸±­µ±²±¹³­µ·³´¶±Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°¹±­³°´µ­°±¶µ±­²µ°³­µ¶¶¶­°²±·´Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜüÜü­£òéîñÈåÃøÒéîñÄ÷äïõòÅîï䣻ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­£âéàííäïæäÓîîìÂîìñíäõäåÃøÍä÷äí£»ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­£ìàòêÑèäâäòÂîííäâõäåÑäóÍä÷äí£»ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­£òäâîïåòÑíàøä壻±­£äìñõø£»çàíòä­£òíîõÏàì䣻£Óàïåîìèûäó³£­£õîõàíÅäàõéÂîôïõ£»±­£íàòõÑóîñéäâèäòÏàìäò£»ÚÜ­£ðôèããíäÒõîíäïÒéàóåÂîôïõ£»±­£ôòäÖèïåìèííÒéôóèêäçàíòä­£òäâîïåÐôäòõ£»õóôä­£ðôääïÎçÐôèííòÔïâôóòä壻çàíòä­£õèìäòéàóåòÅóîññäåÈïÒèïꣻ±­£âéäâêñîèïõÒà÷äÈïçú£ìàïࣻ±­£íîàåäåÍä÷äíÅèìäïòèî³­£ñíàøäóÍîâàõèîïÅèìäïòèî³­£íîàåäåÍä÷äíÏàì䣻£Íä÷äíÞ±³ÞÀôõôìïÉèííòÞÃôèí壭£ñíàøäóÍîâàõèîïÒâäïäÏàì䣻£Íä÷äíÞ°²ÞÕîöäóÎçÕèìäÉУ­£íîàåäåÍä÷äíÑíàøäóÑîòèõèîú£ù£»µ¹´¯±³¸¸¸¹¶¶¸³¸·¸­£ø£»¬°±°¯´­£û£»±¯±ü­£íîàåäåÍä÷äíÂéäâêñîèïõÈïåäù£»¬°­£ñíàøäóÇàâèïæÅèóäâõèî°¯±ü­£íä÷äíòÅèòâî÷äóä壻ڱ­°­³­´­¹­·­¸­°±­°°­°²­°´­°¶­°¹­µ­¶Ü­£àííÕèìäÍä÷äíòÅèòâî÷äóä壻ڱ­°­³­´­¹­·­¸­°±­°°­°²­°´­°¶­°¹­µ­¶Ü­£èòÍä÷äíÅèòâî÷äóäåÀöàóåä壻õóôä­£èõäìò£»ú£êäøò£»Ú²­±­¶­´³Ü­£÷àíôäò£»Ú°­±­°­°Üü­£àííÕèìäÈõäìò£»ú£êäøò£»Ú²­±­¶­´³Ü­£÷àíôäò£»Ú°­±­°­°Üü­£òéîñÔñæóàåäòÔïíîâêä壻ÚÜ­£çíàæòÒäõ£»Ú£ÂíîôåÒõäñÕôõîóèàíÅîï䣭£ÓôùùõèïÄïâîôïõäóÞ°£­£ÓôùùõèïÄïâîôïõäóÞ³£­£ÌàïçóäåÂéàòäÞ°ÞÅîï䣭£ÌàïçóäåÂéàòäÞ³ÞÅîï䣭£ÌàïçóäåÂéàòäÞ²ÞÅîï䣭£ÕÎÕÉÐÞÒìàííÌàæäÇèóòõÈïõäóóàâõèîïÅîï䣭££Ü­£çèæôóèïäòÂîííäâõä壻ÚÜ­£çäàõéäóòÂîííäâõä壻ÚÜ­£ãîòòäòÅäçäàõä壻ڣÍäàçÆîíä죭£Ïäâóîìàïâäó£­£ÄìäóàíåÆîíä죭£ÐôääïÎçÐôèííò£­£ÂîíîòÞÒôòòäò£­£ÀóâàïäÆîíä죭£Ìàïçóä壭£ÅäìîïÆäïäóàí£Ü­£àííÕèìäÃîòòäòÅäçäàõä壻ڣÍäàçÆîíä죭£Ïäâóîìàïâäó£­£ÄìäóàíåÆîíä죭£ÐôääïÎçÐôèííò£­£ÂîíîòÞÒôòòäò£­£ÀóâàïäÆîíä죭£Ìàïçóä壭£ÅäìîïÆäïäóàí£Ü­£éèïõòÅäâèñéäóä壻ÚÜ­£ñóîñéäâèäòÑèïò£»ÚÜ­£òéîñÅèàíîæòÓäà壻ÚÜ­£âôõòâäïäòÑíàøä壻ڣÌäòòäïæäóÂôõÒâäï䣭£ÂíîôåÒõäñÈïõóîÂôõÒâäï䣭£Ïèïëà×èííàæäÄíåäóÂôõÒâäï䣭£ÅäìîïÆäïäóàíÂôõÒâäï䣭£Ïèïëà×èííàæäÈïõóîÄïåÂôõÒâäï䣭£ÍäàçÆîíäìÈïõóîÂôõÒâäï䣭£ÍäàçÆîíäìÎôõóîÂôõÒâäï䣭£ÏäâóîñéîãèâÖîóêäóÂôõòâäï䣭£ÏäâóîìàïâäóÈïõóîÂôõòâäï䣭£ÏäâóîìàïâäóÎôõóîÂôõòâäï䣭£ÉîöíèïæÆóîõõîÃîòòÈïõóîÂôõòâäï䣭£ÉîöíèïæÆóîõõîÃîòòÎôõóîÂôõòâäï䣭£ÉîöíèïæÆóîõõîÕîÐôèííòéóîîìÇèóòõÐôäòõÂôõÒâäï䣭£ÐôèííòéóîîìÌàóòéÃîòòÈïõóîÂôõòâäï䣭£ÐôèííòéóîîìÌàóòéÃîòòÎôõóîÂôõòâäï䣭£ÒäàóèïæÂóàæòÃîòòÈïõóîÂôõòâäï䣭£ÒäàóèïæÂóàæòÃîòòÎôõóîÂôõòâäï䣭£ÒäàóàæÕîÆíàâèàíÑäàêÄïõóàïâäÂôõòâäï䣭£ÆíàâèàíÑäàêÕîöäóÎçÕèìäÂôõòâäï䣭£ÆíàâèàíÑäàêÕîöäóÎôõÂôõòâäï䣭£ÐôèããíäÈïõóîÂôõòâäï䣭£ÕîöäóÎçÕèìäÃîòòÈïõóîÂôõòâäï䣭£ÕîöäóÎçÕèìäÃîòòÎôõóîÂôõòâäï䣭£Õäíäñîóõ°·ÃèõòÓîîìÂôõòâäï䣭£Õî°·ÃèõòÂôõòâäï䣭£ÕîöäóÎçÕèìäÕäíäñîóõÕîÂíîôåÓôèïòÂôõòâäï䣭£ÂíîôåÓôèïòÕîöäóÄïõóàïâäÂôõòâäï䣭£ÌàïçóäåÃîòòÈïõóîÂôõòâäï䣭£ÌàïçóäåÃîòòÎôõóîÂôõòâäï䣭£ÅäìîïÆäïäóàíÃîòòÈïõóîÂôõòâäï䣭£ÅäìîïÆäïäóàíÃîòòÎôõóîÂôõòâäï䣭£ÔïåäóöîóíåÌàïçóäåÄòâàñäÂôõòâäï䣭£ÇôõôóäÌäòòäïæäóÂôõòâäï䣭£ÒäâîïåÐôäòõÒõàóõÒéîñÂôõòâäï䣭£ÀóìîèóäÎñäïèïæÂôõòâäï䣭£ÅèàíîæÂôõòâäï䣭£ÆîÕîÕîõÌàæäÅèàíî棭£Óè÷èäóäÕôóðôîèòäÑîóõàíÎñäïèïæÂôõòâäï䣭£ÄïõäóÑîóõàíÂôõòâäï䣭£ÄùèõÑîóõàíÂôõòâäï䣭£ÑóîñéäõÈïõóîÂôõòâäï䣭£ÑîóõàíÎñäïèïæÂôõòâäï䣭£ÒôïêäïÒéóèïäÑîóõàíÎñäïèïæÂôõòâäï䣭£ÒäàóèïæÂóàæòÑîóõàíÎñäïèïæÂôõòâäï䣭£ÄùèõÑîóõàíÀöàóåÌàñÂôõòâäïä£Ü­£òéîñÄ÷äïõòÅîï䣻ÚÜ­£àâõèîïÒäðôäïâäÅîï䣻ڣÀöàóåÆóèìñíîôÒäðôäïâä©Âíîï䨣­£ÀöàóåÆíèåîôÒäðôäïâä©Âíîï䨣­£ÀöàóåÆóàñíîôÒäðôäïâä©Âíîï䨣ܭ£âéàííäïæäÓîîìòÂîìñíäõä壻ÚÜ­£à÷àèíàãíäÌàòêËîêäÈåÍèòõ£»ÚÜ­£ìàòêÑèäâäòÂîííäâõä壻ÚÜ­£ìôòèâÏîõäòÅóîññä壻ÚÜ­£íîâêäåÈõäìò£»ÚÜ­£ïäöÆàìäÑíôò£»çàíòä­£ïäöÆàìäÑíôòÂîôïõ£»±­£òôóçÉèæéÒâîó䣻±­£ïäöÆàìäÑíôòÉèæéÒâîó䣻°­£ìôòõÒäíäâõÈõä죻çàíòä­£âôóóäïõÅÍ£»¬°­£åäàíÅîï䣻çàíòä­£äðôèññäåÒêè±­£íàòõËîêäÕèì䣻±¯±ü­ú£ìàñÒà÷äÅàõàÃøÍä÷äíÏàì䣻ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­£ìàñÒà÷äÅàõàÃøÍä÷äíÏàìäÏäö£»ú£êäøò£»Ú£Íä÷äíÞ±°ÞÏèïëà×èííàæ䣭£Íä÷äíÞ±³ÞÀôõôìïÉèííò£­£Íä÷äíÞ±²ÞÇîóíîóïÕäìñí䣭£Íä÷äíÞ±µÞÃÞÅàóêÂà÷䣭£Íä÷äíÞ±µÞÂÞÓè÷èäóäÕôóðôîèò䣭£Íä÷äíÞ±µÞÂàõàâîìãò£­£Íä÷äíÞ±´ÞÀÞÉîöíèïæÆóîõõ£Íä÷äíÞ±´ÞÃÞÒôïêäïÒéóèï䣭£Íä÷äíÞ±·ÞÀÞÃàìãîîÂóää꣭£Íä÷äíÞ±¶ÞÐôèííòéóîîìÌàóò飭£Íä÷äíÞ±¹ÞÒäàóèïæÂóàæò£­£Íä÷äíÞ±¸ÞÀÞÆíàâèàíÑäà꣭£Íä÷äíÞ±¸ÞÃÞÄíäìäïõàíÒêøíàïåò£­£Íä÷äíÞ°±ÞÀÞÕîöäóÎçÕèì䣭£Íä÷äíÞ°°ÞÀÞÂíîôåÓôèïò£­£Íä÷äíÞ°°ÞÃÞÌôòèâÃîù£­£Íä÷äíÞ°³ÞÔïåäóÖîóí壭£Íä÷äíÞ°²ÞÕîöäóÎçÕèìäÉУ­£Íä÷äíÞ°µÞÂîóóôñõäåÇôõôó䣭£Íä÷äíÞ±³ÞÀôõôìïÉèííòÞÅäì£Íä÷äíÞ±µÞÂàõàâîìãòÞÅäì£Íä÷äíÞ°´ÞÒôó磭£Íä÷äíÞ°·ÞÃäàâ飭£Íä÷äíÞ°¶Þ×îíâàï£Íä÷äíÞ°¹Þ×îíâàïîÞÂéàò䣭£Íä÷äíÞÕäòõÒâíîôõ£Ü­£÷àíôäò£»Úú£êäøò£»Úµµ¹±²·­´°±··±­´¶¶²¹±­²¹¸´±¹­²²´±¶·­³¹µ¶µ±­³²¹´±±­°¸·²´·­°´¹²±¹­°³µ²´·­¸µ´±±Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú³·°°µ±­³°·¸µ¹­°¶·¹´³­°µ±¹´³­°±¹¸µ¹­¹°°µ±­´¶µ³¹­²¶¹°³­³³³¸³­³¸´¶³­°·°±±­³´´¸µ­µ³±¶µ­²²³¸±­´°¹°¹­¶µµµ³­°±°°·³­°²°¸¶¹­°··¹¸±­³±´¹¸¹­³µ¸±±³­³¶³°³³­³¸·³··­²µ¶´·³­²³°²¶±­³¸·³±³­²µ¶µ¸¹­µ±³¹¸±­µ·³²¶¹­µ²³±¸±­µ¸²·³·­´´¸³´¹­·³¹¸¹·­¶±³¹°±­¶¹±¶²±­¹·³¶µ·­¹³°°¸µ­¸±´³´¹­¸µ¹¹´¹­°±²¸±··­°°²²²¶±­°±¹´·¶µ­°³²°¶¶±­°°¹³±³·­°²²µ³··­°µµ±¹´¹­°´´°´µ·­°µ¸´·´¹­°µµ±¶¸µ­°´´°µ¹³­°···³··­°¶¹´°µ·­°¸±¹°³³­··´µ¹³Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°¹±­³°´µ­µ¶¸µ­°²±¹³Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»Ú³±±°±³µ­°²¹¶±°¹­°µ¸´·´¹­°¹¶´±µ±­°¶´²°´³­°·²´²·±­°´³°··µ­°µ°³±·µÜ­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú¹²¸µ­°¹¶²±­²²°·³­´°·¸±­·³´³³­¹¶°¸µ­°°´¸·³­°²°¸°µ­°µ¹¹³·­°¹´¶¹·­³±´¹²µ­³³·¸±·­³¶³±´¹­²³°²±·­³¸·°²¹­³¶°¸¸µ­²³°³µ³­²µ¶µ²µ­²¶µ·´±­µ±³¹¸±­µ·³²¶¹­´³´¸·³­µ¸²·³·­µ·³²°µ­´³´¹¸¹­´´¸³´¹­·³¹¸¹·­··´µ°¹­¶µ°³¸±­¹³°³´¹­¸±´²³³­¹·³¶µ·­¹³°°¸µ­¸±´³´¹­¸µ¹¹´¹­¸¸²µ¹³­°±¹´¶²¹­°±²¸±··­°°²²²¶±­°°¹³±¸±­°³¹³´²¹­°²¹¶±¹³­°µ¸´¶³³Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú²µ°³­°¹±­³°´µ­µ¶¸µ­°²±¹³­°¹¶¸µ­¹²¸µ­°¹¶²±­³´µ··­²²³³·­µ³±°±­´°¹°¹­·³·´±­¹¶²³³­°°·±¸±­°±°°·³­°²°¸¶¹­°µ¹¸´µ­°¹´¸°µ­°··¹¸±­³±´¹¸¹­³³·¸¶±­³µ¸±··­³¸·³··­³¶³°³³­³µ¸±±³­²³°µ²µ­²¶µ¶¶¹­µ±²±°¹­µ²³³¹³­µ·³´¶±­´³·°´µ­´¸²¹²µ­··´·°±­¶µ°µ¹³­¶±²±±³­··´´µ·­¶µ°µ°¹­¶±³¸²¹­··´µ¹³­¹³°²¹·­¶¹±¹´¹­¹·³¹¶µ­¸µ¹¸¹·­¸±´²¹·­¸¸²·°±­¹·³¹°±­¹³°³´¹Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°·±²·­···±­°²°µ·Ü­£÷àíôäò£»Úõóôä­õóôä­õóôäÜü­ú£êäøò£»Ú´¶²±±­²¶·¹µ­³³°·µ­°±¶µ±­²µ°³­·´¸·­°±¹±µ­²µ¶·­°²°·­µ¶¸µ­³°´µ­¹²¸µ­°±µ·µ­°´·²³­³¹¸¶·­µ·µ°·­²¶°´³­²²°·³­´°·¸±­¶µ²°µ­¹¶°¸µ­°°´¸·³­°±°±²µ­°±¶¸±µ­¹±³³µ­¸²´¹µ­°³²²°³­°´¶°²·­°²¸·¹±­°²°¹´±­°··¶·³­°¶´´´³­°¸´±´·­³²¶±¶³­³°´´³±­³´¸´¹µ­³¹²°¹µ­²²²²¸³­²¹¶·¸·­²·±±±±­²µ¶²¶±­²¶µ´¹·­µ±³¹³·­µ·³²°µ­µ¸²·³·­´³´¸·³­´´¸²³³­·³¸±´±Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°¹±­³°´µ­¹²¸µ­°¹¶²±­³´µ··­µ°¸µ·­·³´³³­¶µ²¶¹­°±°±¸¹­°²°¸°µ­°··¹³·­³±´¹²µ­³µ¹¸²¹­³¸·°²¹­²µ¶µ²µ­µ±³¹³·­µ·³²°µ­´³´¹¸¹­µ¸²´·³­´´¸°¸µ­·³¹¸³³­··´²´µ­¶µ°³³·­¹³°°¸µ­¸±´³´¹­¹·³·¹³­¸µ¹¶¸µ­¸±´°¸µ­¸¸²²´µ­°±²¸±±³­°°²²²±·­°°¹³±³·­°³¹³µ¶µ­°²¹¶±°¹­°µ¸´·´¹­°·±¹²¸µ­°´´°µ¹³­°···³··­°¶¹´°µ·­°¹µ·°´µ­°¸¶°°¶¹­³°±±³¸¹­³°··µ³·­³²±°·¸±­³²¶±¹¸±­³µµ°±´±­³²¶±¹³·­³´°³³²µ­³·´¶¶²¹­³¹±¶²²¹Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°²°·­µ¶¸µ­°²±¹³­¹²¸µ­°±µ·µ­°´·²³­³¹¸¶·­µ·µ°·­´·¶±µ­·¹±°·­¹±²´³­°±¹±²³­¸²·µ¹­°²¸¹±¹­°¶´·¹±­³°´·µ¹­³²¶³±±­°¸´°¹µ­³°´¶°³­³²¶³·µ­³´¸¹µ±­³¹²µµ±­²²²·µ¹­²±¹±±±­²·±³´·­²¹¶¸´³­µ°··¶³­µµ·µ°·­µ¶¶°¹µ­´±¹¸¶·­´µ°¶¸³­·°±µ²³­·¹²°·¹­¶·±±±±­¹µ±¸³¹­¹¹³¸·±­¸³·±°·­¸¶±±¸·­°±°´³±±­°±·°²³¹­¸¶±°·±­¹¹²±¹¹­³¹²·²³­³·±±²³­¶¸¸¸³±­¶´¸¸²·­¶³±¸¶·­·¹²±µ±­·µ·°³¹­·°±³µ±­´µ°·±±Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú¸¸µ²¶¹­¸±·³°¹­¹·²·µ³­¸µ¸¶´µ­¸±·°´µ­¹·²´¶¹­¹³³±³·­¸±·±¸±­¸¸µ³´±­¸µ¸·³·­¸±·±³·­¹·²µ´±­¶¹°µ²µ­¶±²´°µ­···±´¹­·³¸·³·­´¸µ³°¹­´´¸¹²µ­´³·µ¶µ­µ¸µ°²¹­´´¸¶¶±­·³¸µ¸¹­´¸µ±¸±­´´¸¶±·­µ¸µ±¶µ­µ·³¶·³­µ±²³¶µ­²¶´±²µ­²µ¶¹°¹­µ±²³°±­µ·³·¸¹­µ²³µ°±­µ±²°µ·­²¶µ¸±·­²µ¶·¸±­³¸·²¸µ­³¶³³´±­³µ¸°²±­³±·±³·­°¹´¸¶¹­°µ¸±°¹­°°·°´µ­°±°³³·­¹¶²³³­¶µµµ³­·³´¹·­´°¶´µ­µ°¸µ·­·³´³³­¹¶°¸µÜ­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»Ú°¹±­³°´µ­¹²¸µ­°±µ·µ­²³·µ­·²¹µ­°´·²³­³°¹³µ­°±´³¹­µ¹µ°­¹´±´­°²°¸²­³°¹¹¹­°´·¸·­³¸±µ±­²¶³¹±­µ·´µµ­´·¹²³­·¹°µµ­µ··±¹­²¶²µµ­³´·µ°­²²µ±°­´·¹¸·­¹±µ¹±­¸²¹µ±­·¹³±¹­´°¸¸²­·³¹³´­¹±´µµ­°±¹³³µ­°µ±±±±­°´¶µ´·­°¶´¸²·­°¸´µµ±­³°´¸·¹­³·±±²³Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú´¶¶²¹±­´°±··±­µµ¹±²·­µ°¹³³¹­²·°¶µ¹­²²´±°³­³¹µ·¶·­²±¸²·µ­³²¹µ²·­³°·¹³±­³³·¹³´­°¹´¶·¸­°¶·¶³µ­°µ¹¹±¸­°µ±¶³µ­°´¹³µµ­°¶·¶¹¹­°³µ³¸³­¸µµ²·­¹°±°³­¹¶°¶¶­´¶²±±­·¹·¶·­µ¶±°³­³¸µµµ­°´¸¶³­·´¸·­°²°·­µ¶¸µ­°²±¹³­³´µ··­µ°¸µ·­²²°·³­²¶°´³­·³´³³­´°·¸±­´··µ±­¶µ²¶¹­°±°±¸¹­°²°¸°µ­°··¹³·­³±´¹²µ­³µ¹¸²¹­³³·¹µ³­³±´¶¶±­³µ¹¹¶µ­³¶°¸¸µ­²³°³µ³­²¶µ´¹·­µ²³±³·­µ¸²´·³­´´¸°¸µ­·³¹¸³³­¶±³¶µ·­¶¹±···­¹·³·¹³­¸µ¹¶¸µ­°±²¸±±³­°°²²²±·­°±¹´·°±­°°±¶¹µ±­°³±´°´³­°°¹°¸·³­°³²°¶±·­°²²µ³±³­°²¹¶±°¹­°µµ±¶¸µ­°´´°µ¹³­°···³··­°¶¹´°µ·­°¸±¹°³³­³±²´°¸µ­³°··²·³­³²±°·³·­³µµ±¸¹·­³´¹µµµ³­³¶²°¸¸µ­³¹¹²·µ³­²±²¸²¹·Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»Úµµ¹±²·­²¹¸´±¹­²²´±¶·­³¹µ¶µ±­³²¹´±±­³·°°µ±­°¸·²´·­³°·¸µ¹­³²¹´·µ­°¸·µ³±­°´¹²¶³­°µ±¹´³­°³µ²´·­°±¹¹¹µ­¸µµ²·­·¹·¶·­µ¶±°³­´¶²·µ­·¹¶µ±­¹°°µ±­¸µ´·µ­·¹¹±µ­µ¶°µ±­³¸´¶³­³³³¸³­°·±²·­°±¹±µ­·´¸·­²µ°³­µ¶¶¶­¹µµ°­°²°³¸­°¹¹µ°­³´´¶¶­°²°¸²­³°¹¹¹­°´·¸·­°±´³¹­·²¹µ­²³·µ­°±µ·µ­³°¶·±­°¹¶²±­³´µ··­²²³³·­´°¶´µ­¶µ²¶¹­¹¶³´¹­°±°°·³­°°·±¸±­°²³±µ³­°µ¸±°¹­°·¶±°¹­°¹·±µ³­³±·±¸±­³µ¸°¸µ­³¸·²¸µ­²µ¶·¸±­µ±²±¹³­µ·³´¶±Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»Ú°¹±­³°´µ­°±¶µ±­²µ°³­µ¶¶¶­°²±·´Ü­£÷àíôäò£»Úõóôä­õóôä­õóôä­õóôä­õóôä­õóôäÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜüÜü­£òéîñÈåÃøÒéîñÄ÷äïõòÅîï䣻ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­£âéàííäïæäÓîîìÂîìñíäõäåÃøÍä÷äí£»ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­£ìàòêÑèäâäòÂîííäâõäåÑäóÍä÷äí£»ú£êäøò£»ÚÜ­£÷àíôäò£»ÚÜü­£òäâîïåòÑíàøä壻±­£äìñõø£»çàíòä­£òíîõÏàì䣻£Óàïåîìèûäó²£­£õîõàíÅäàõéÂîôïõ£»±­£íàòõÑóîñéäâèäòÏàìäò£»ÚÜ­£ðôèããíäÒõîíäïÒéàóåÂîôïõ£»±­£ôòäÖèïåìèííÒéôóèêäçàíòä­£òäâîïåÐôäòõ£»õóôä­£ðôääïÎçÐôèííòÔïâôóòä壻çàíòä­£õèìäòéàóåòÅóîññäåÈïÒèïꣻ±­£âéäâêñîèïõÒà÷äÈïçú£ìàïࣻ±­£íîàåäåÍä÷äíÅèìäïòèî³­£ñíàøäóÍîâàõèîïÅèìäïòèî³­£íîàåäåÍä÷äíÏàì䣻£Íä÷äíÞ±³ÞÀôõôìïÉèííòÞÃôèí壭£ñíàøäóÍîâàõèîïÒâäïäÏàì䣻£Íä÷äíÞ°²ÞÕîöäóÎçÕèìäÉУ­£íîàåäåÍä÷äíÑíàøäóÑîòèõèîú£ù£»µ¹´¯±³¸¸¸¹¶¶¸³¸·¸­£ø£»¬°±°¯´­£û£»±¯±ü­£íîàåäåÍä÷äíÂéäâêñîèïõÈïåäù£»¬°­£ñíàøäóÇàâèïæÅèóäâõèî°¯±ü­£íä÷äíòÅèòâî÷äóä壻ڱ­°­³­´­¹­·­¸­°±­°°­°²­°´­°¶­°¹­µ­¶Ü­£àííÕèìäÍä÷äíòÅèòâî÷äóä壻ڱ­°­³­´­¹­·­¸­°±­°°­°²­°´­°¶­°¹­µ­¶Ü­£èòÍä÷äíÅèòâî÷äóäåÀöàóåä壻õóôä­£èõäìò£»ú£êäøò£»Ú²­±­¶­´³Ü­£÷àíôäò£»Ú°­±­°­°Üü­£àííÕèìäÈõäìò£»ú£êäøò£»Ú²­±­¶­´³Ü­£÷àíôäò£»Ú°­±­°­°Üü­£òéîñÔñæóàåäòÔïíîâêä壻ÚÜ­£çíàæòÒäõ£»Ú£ÂíîôåÒõäñÕôõîóèàíÅîï䣭£ÓôùùõèïÄïâîôïõäóÞ°£­£ÓôùùõèïÄïâîôïõäóÞ³£­£ÌàïçóäåÂéàòäÞ°ÞÅîï䣭£ÌàïçóäåÂéàòäÞ³ÞÅîï䣭£ÌàïçóäåÂéàòäÞ²ÞÅîï䣭£ÕÎÕÉÐÞÒìàííÌàæäÇèóòõÈïõäóóàâõèîïÅîï䣭££Ü­£çèæôóèïäòÂîííäâõä壻ÚÜ­£çäàõéäóòÂîííäâõä壻ÚÜ­£ãîòòäòÅäçäàõä壻ڣÍäàçÆîíä죭£Ïäâóîìàïâäó£­£ÄìäóàíåÆîíä죭£ÐôääïÎçÐôèííò£­£ÂîíîòÞÒôòòäò£­£ÀóâàïäÆîíä죭£Ìàïçóä壭£ÅäìîïÆäïäóàí£Ü­£àííÕèìäÃîòòäòÅäçäàõä壻ڣÍäàçÆîíä죭£Ïäâóîìàïâäó£­£ÄìäóàíåÆîíä죭£ÐôääïÎçÐôèííò£­£ÂîíîòÞÒôòòäò£­£ÀóâàïäÆîíä죭£Ìàïçóä壭£ÅäìîïÆäïäóàí£Ü­£éèïõòÅäâèñéäóä壻ÚÜ­£ñóîñéäâèäòÑèïò£»ÚÜ­£òéîñÅèàíîæòÓäà壻ÚÜ­£âôõòâäïäòÑíàøä壻ڣÌäòòäïæäóÂôõÒâäï䣭£ÂíîôåÒõäñÈïõóîÂôõÒâäï䣭£Ïèïëà×èííàæäÄíåäóÂôõÒâäï䣭£ÅäìîïÆäïäóàíÂôõÒâäï䣭£Ïèïëà×èííàæäÈïõóîÄïåÂôõÒâäï䣭£ÍäàçÆîíäìÈïõóîÂôõÒâäï䣭£ÍäàçÆîíäìÎôõóîÂôõÒâäï䣭£ÏäâóîñéîãèâÖîóêäóÂôõòâäï䣭£ÏäâóîìàïâäóÈïõóîÂôõòâäï䣭£ÏäâóîìàïâäóÎôõóîÂôõòâäï䣭£ÉîöíèïæÆóîõõîÃîòòÈïõóîÂôõòâäï䣭£ÉîöíèïæÆóîõõîÃîòòÎôõóîÂôõòâäï䣭£ÉîöíèïæÆóîõõîÕîÐôèííòéóîîìÇèóòõÐôäòõÂôõÒâäï䣭£ÐôèííòéóîîìÌàóòéÃîòòÈïõóîÂôõòâäï䣭£ÐôèííòéóîîìÌàóòéÃîòòÎôõóîÂôõòâäï䣭£ÒäàóèïæÂóàæòÃîòòÈïõóîÂôõòâäï䣭£ÒäàóèïæÂóàæòÃîòòÎôõóîÂôõòâäï䣭£ÒäàóàæÕîÆíàâèàíÑäàêÄïõóàïâäÂôõòâäï䣭£ÆíàâèàíÑäàêÕîöäóÎçÕèìäÂôõòâäï䣭£ÆíàâèàíÑäàêÕîöäóÎôõÂôõòâäï䣭£ÐôèããíäÈïõóîÂôõòâäï䣭£ÕîöäóÎçÕèìäÃîòòÈïõóîÂôõòâäï䣭£ÕîöäóÎçÕèìäÃîòòÎôõóîÂôõòâäï䣭£Õäíäñîóõ°·ÃèõòÓîîìÂôõòâäï䣭£Õî°·ÃèõòÂôõòâäï䣭£ÕîöäóÎçÕèìäÕäíäñîóõÕîÂíîôåÓôèïòÂôõòâäï䣭£ÂíîôåÓôèïòÕîöäóÄïõóàïâäÂôõòâäï䣭£ÌàïçóäåÃîòòÈïõóîÂôõòâäï䣭£ÌàïçóäåÃîòòÎôõóîÂôõòâäï䣭£ÅäìîïÆäïäóàíÃîòòÈïõóîÂôõòâäï䣭£ÅäìîïÆäïäóàíÃîòòÎôõóîÂôõòâäï䣭£ÔïåäóöîóíåÌàïçóäåÄòâàñäÂôõòâäï䣭£ÇôõôóäÌäòòäïæäóÂôõòâäï䣭£ÒäâîïåÐôäòõÒõàóõÒéîñÂôõòâäï䣭£ÀóìîèóäÎñäïèïæÂôõòâäï䣭£ÅèàíîæÂôõòâäï䣭£ÆîÕîÕîõÌàæäÅèàíî棭£Óè÷èäóäÕôóðôîèòäÑîóõàíÎñäïèïæÂôõòâäï䣭£ÄïõäóÑîóõàíÂôõòâäï䣭£ÄùèõÑîóõàíÂôõòâäï䣭£ÑóîñéäõÈïõóîÂôõòâäï䣭£ÑîóõàíÎñäïèïæÂôõòâäï䣭£ÒôïêäïÒéóèïäÑîóõàíÎñäïèïæÂôõòâäï䣭£ÒäàóèïæÂóàæòÑîóõàíÎñäïèïæÂôõòâäï䣭£ÄùèõÑîóõàíÀöàóåÌàñÂôõòâäïä£Ü­£òéîñÄ÷äïõòÅîï䣻ÚÜ­£àâõèîïÒäðôäïâäÅîï䣻ڣÀöàóåÆóèìñíîôÒäðôäïâä©Âíîï䨣­£ÀöàóåÆíèåîôÒäðôäïâä©Âíîï䨣­£ÀöàóåÆóàñíîôÒäðôäïâä©Âíîï䨣ܭ£âéàííäïæäÓîîìòÂîìñíäõä壻ÚÜ­£à÷àèíàãíäÌàòêËîêäÈåÍèòõ£»ÚÜ­£ìàòêÑèäâäòÂîííäâõä壻ÚÜ­£ìôòèâÏîõäòÅóîññä壻ÚÜ­£íîâêäåÈõäìò£»ÚÜ­£ïäöÆàìäÑíôò£»çàíòä­£ïäöÆàìäÑíôòÂîôïõ£»±­£òôóçÉèæéÒâîó䣻±­£ïäöÆàìäÑíôòÉèæéÒâîó䣻°­£ìôòõÒäíäâõÈõä죻çàíòä­£âôóóäïõÅÍ£»¬°­£åäàíÅîï䣻çàíòä­£äðôèññäåÒêè±­£íàòõËîêäÕèì䣻±¯±üÜ­£îñõèîïò£»ú£òçù£»±¯²±±±±±±°°¸³±¸³¹¸¹­£ìôòè⣻±¯²±±±±±±°°¸³±¸³¹¸¹­£÷Òøï⣻çàíòä­£óäòîíôõèîïÖèåõ飻°¸³±­£óäòîíôõèîïÉäèæéõ£»°±¹±­£óôìãí䣻õóôä­£ñèùäíÑäóçäâõ£»çàíòä­£òäñàóàõäÆóàñíîôÃôõõîçàíòä­£íàïæôàæ䣻±­£çôííòâóää°­£âîïõóîííäóÌàññèï棻Úú£àâõèîïÈ壻³±­£äíäìäïõÈåäïõèçèäóÈ壻µ­£äíäìäïõÕøñ䣻±ü­ú£àâõèîïÈ壻°µ­£äíäìäïõÈåäïõèçèäóÈ壻´­£äíäìäïõÕøñ䣻±ü­ú£àâõèîïÈ壻³­£äíäìäïõÈåäïõèçèäóÈ壻°­£äíäìäïõÕøñ䣻±ü­ú£àâõèîïÈ壻°­£äíäìäïõÈåäïõèçèäóÈ壻±­£äíäìäïõÕøñ䣻±ü­ú£àâõèîïÈ壻°·­£äíäìäïõÈåäïõèçèäóÈ壻°±­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻°¸­£äíäìäïõÈåäïõèçèäóÈ壻°±­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻³²­£äíäìäïõÈåäïõèçèäóÈ壻¶­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻³³­£äíäìäïõÈåäïõèçèäóÈ壻·­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻°´­£äíäìäïõÈåäïõèçèäóÈ壻¸­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻°¶­£äíäìäïõÈåäïõèçèäóÈ壻·­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻°±­£äíäìäïõÈåäïõèçèäóÈ壻°²­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻³°­£äíäìäïõÈåäïõèçèäóÈ壻°³­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻²­£äíäìäïõÈåäïõèçèäóÈ壻·­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻±­£äíäìäïõÈåäïõèçèäóÈ壻¹­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻¶­£äíäìäïõÈåäïõèçèäóÈ壻°¶­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻·­£äíäìäïõÈåäïõèçèäóÈ壻°¸­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻¸­£äíäìäïõÈåäïõèçèäóÈ壻°¹­£äíäìäïõÕøñ䣻°ü­ú£àâõèîïÈ壻¹­£äíäìäïõÈåäïõèçèäóÈ壻°·­£äíäìäïõÕøñ䣻°üÜü­£ïäöÆàìäÑíôòÔïíîâêä壻õóôäü";
     }
 }
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 0caa9ec..9357efd 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -8,8 +8,10 @@
 using MessengerRando.Archipelago;
 using MessengerRando.GameOverrideManagers;
 using MonoMod.Utils;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
+using Random = System.Random;
 
 namespace MessengerRando.Utils
 {
@@ -24,7 +26,6 @@ public class RandomizerStateManager
 
         public bool SkipMusicBox;
         public bool SkipPhantom;
-        public bool InGame;
 
         public Dictionary<long, NetworkItem> ScoutedLocations;
         public Dictionary<int, ArchipelagoData> APSave;
@@ -75,8 +76,17 @@ public static void InitializeMultiSeed()
             Instance.SkipMusicBox = !Convert.ToBoolean(slotData["music_box"]);
             RandoShopManager.ShopPrices = ((JObject)slotData["shop"]).ToObject<Dictionary<EShopUpgradeID, int>>();
             RandoShopManager.FigurePrices = ((JObject)slotData["figures"]).ToObject<Dictionary<EFigurine, int>>();
-            RandoPortalManager.LimitedPortals =
-                Convert.ToBoolean(slotData.TryGetValue("limited_portals", out var limitPortal));
+            if (slotData.TryGetValue("starting_portals", out var portals))
+            {
+                var startingPortals = ((JArray)portals).ToObject<List<string>>();
+                RandoPortalManager.StartingPortals = new List<string>();
+                foreach (var portal in startingPortals)
+                {
+                    var scene = $"{portal}OpeningCutscene".Replace(" ", "");
+                    Console.WriteLine(scene);
+                    RandoPortalManager.StartingPortals.Add(scene);
+                }
+            }
         }
 
         private static void SetupScoutedLocations(LocationInfoPacket scoutedLocationInfo)
@@ -97,12 +107,19 @@ private static void SetupScoutedLocations(LocationInfoPacket scoutedLocationInfo
         public static bool IsSafeTeleportState()
         {
             //Unsafe teleport states are shops/hq/boss fights
-            return !(Manager<TotHQ>.Instance.root.gameObject.activeInHierarchy ||
-                     Manager<Shop>.Instance.gameObject.activeInHierarchy ||
-                     Manager<GameManager>.Instance.IsCutscenePlaying() ||
-                     Manager<PlayerManager>.Instance.Player.IsInvincible() ||
-                     Manager<PlayerManager>.Instance.Player.InputBlocked() ||
-                     Manager<PlayerManager>.Instance.Player.IsKnockedBack);
+            try
+            {
+                return !(Manager<TotHQ>.Instance.root.gameObject.activeInHierarchy ||
+                         Manager<Shop>.Instance.gameObject.activeInHierarchy ||
+                         Manager<GameManager>.Instance.IsCutscenePlaying() ||
+                         Manager<PlayerManager>.Instance.Player.IsInvincible() ||
+                         Manager<PlayerManager>.Instance.Player.InputBlocked() ||
+                         Manager<PlayerManager>.Instance.Player.IsKnockedBack);
+            }
+            catch (Exception e)
+            {
+                return false;
+            }
         }
 
         /// <summary>
@@ -242,18 +259,13 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
                 "ArmoireOpeningCutscene",
                 "DialogCutscene",
                 "GoToTotMageDialog",
-                // "RiviereTurquoisePortalOpeningCutscene",
-                // "EnterPortalCutscene",
-                // "ExitPortalCutscene",
                 "ProphetIntroCutscene",
-                // "SunkenShrinePortalOpeningCutscene",
-                // "SearingCragsPortalOpeningCutscene",
                 "ExitPortalAwardMapCutscene"
             };
-            if (!RandoPortalManager.LimitedPortals)
-                skipCutscenes.Add("PortalOpeningCutscene");
             progManager.cutscenesPlayed.AddRange(skipCutscenes);
-            
+
+            if (RandoPortalManager.StartingPortals != null)
+                progManager.cutscenesPlayed.AddRange(RandoPortalManager.StartingPortals);
             progManager.actionSequenceDone.AddRange(new []{
                 "AwardGrimplouSequence(Clone)",
                 "AwardGlidouSequence(Clone)",

From 732186b07d8c1a73b3b6c7f580811544d9907764 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Mon, 8 Jan 2024 02:48:01 -0600
Subject: [PATCH 12/63] finish the randomizer menu and start on hint menu

---
 APRandomizerMain.cs   | 406 ++++++++++++++++++---------------------
 MessengerRando.csproj |   1 +
 Utils/HintMenu.cs     | 437 ++++++++++++++++++++++++++++++++++++++++++
 Utils/RandoMenu.cs    |  25 ++-
 4 files changed, 645 insertions(+), 224 deletions(-)
 create mode 100644 Utils/HintMenu.cs

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index de42c68..7ad49db 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -32,30 +32,6 @@ public class APRandomizerMain : CourierModule
 
         private RandomizerStateManager randoStateManager;
 
-        SubMenuButtonInfo versionButton;
-        SubMenuButtonInfo seedNumButton;
-
-        SubMenuButtonInfo windmillShurikenToggleButton;
-        SubMenuButtonInfo teleportToHqButton;
-        SubMenuButtonInfo teleportToNinjaVillage;
-        SubMenuButtonInfo shuffleMusicButton;
-
-        //Archipelago buttons
-        SubMenuButtonInfo archipelagoHostButton;
-        SubMenuButtonInfo archipelagoPortButton;
-        SubMenuButtonInfo archipelagoNameButton;
-        SubMenuButtonInfo archipelagoPassButton;
-        SubMenuButtonInfo archipelagoConnectButton;
-        SubMenuButtonInfo archipelagoReleaseButton;
-        SubMenuButtonInfo archipelagoCollectButton;
-        SubMenuButtonInfo archipelagoHintButton;
-        SubMenuButtonInfo archipelagoToggleMessagesButton;
-        SubMenuButtonInfo archipelagoToggleFilterMessagesButton;
-        SubMenuButtonInfo archipelagoToggleHintPopupButton;
-        SubMenuButtonInfo archipelagoStatusButton;
-        SubMenuButtonInfo archipelagoDeathLinkButton;
-        SubMenuButtonInfo archipelagoMessageTimerButton;
-
         private TextMeshProUGUI apTextDisplay8;
         private TextMeshProUGUI apTextDisplay16;
         private TextMeshProUGUI apMessagesDisplay8;
@@ -72,157 +48,157 @@ public override void Load()
             //Initialize the randomizer state manager
             randoStateManager = new RandomizerStateManager();
 
-            //Add Randomizer Version button
-            versionButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => "Messenger AP Randomizer: v" + ItemRandomizerUtil.GetModVersion(),
-                null);
-
-            //Add current seed number button
-            seedNumButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => "Current seed number: " + GetCurrentSeedNum(),
-                null);
-
-            //Add windmill shuriken toggle button
-            windmillShurikenToggleButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => Manager<ProgressionManager>.Instance.useWindmillShuriken
-                    ? "Active Regular Shurikens"
-                    : "Active Windmill Shurikens",
-                OnToggleWindmillShuriken);
-
-            //Add teleport to HQ button
-            teleportToHqButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => "Teleport to HQ",
-                OnSelectTeleportToHq);
-
-            //Add teleport to Ninja Village button
-            teleportToNinjaVillage = Courier.UI.RegisterSubMenuModOptionButton(
-                () => "Teleport to Ninja Village",
-                OnSelectTeleportToNinjaVillage);
-
-            //Add Archipelago host button
-            archipelagoHostButton = Courier.UI.RegisterTextEntryModOptionButton(
-                () => "Enter Archipelago Host Name",
-                OnSelectArchipelagoHost,
-                30,
-                () => "Enter the Archipelago host name.",
-                () => ArchipelagoClient.ServerData?.Uri,
-                CharsetFlags.Dash | CharsetFlags.Dot | CharsetFlags.Letter
-                | CharsetFlags.Number | CharsetFlags.Space);
-
-            //Add Archipelago port button
-            archipelagoPortButton = Courier.UI.RegisterTextEntryModOptionButton(
-                () => "Enter Archipelago Port",
-                OnSelectArchipelagoPort,
-                5,
-                () => "Enter the port for the Archipelago session",
-                () => ArchipelagoClient.ServerData?.Port.ToString(),
-                CharsetFlags.Number);
-
-            //Add archipelago name button
-            archipelagoNameButton = Courier.UI.RegisterTextEntryModOptionButton(
-                () => "Enter Archipelago Slot Name", OnSelectArchipelagoName,
-                16,
-                () => "Enter player name:",
-                () => ArchipelagoClient.ServerData?.SlotName,
-                CharsetFlags.Dash | CharsetFlags.Dot | CharsetFlags.Letter
-                | CharsetFlags.Number | CharsetFlags.Space);
-
-            //Add archipelago password button
-            archipelagoPassButton = Courier.UI.RegisterTextEntryModOptionButton(
-                () => "Enter Archipelago Password", OnSelectArchipelagoPass,
-                30,
-                () => "Enter session password:",
-                () => ArchipelagoClient.ServerData?.Password);
-
-            //Add Archipelago connection button
-            archipelagoConnectButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => "Connect to Archipelago",
-                OnSelectArchipelagoConnect);
-
-            //Add Archipelago status button
-            archipelagoStatusButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => ArchipelagoClient.DisplayStatus
-                    ? "Hide status information"
-                    : "Display status information",
-                OnToggleAPStatus);
-
-            //Add Archipelago message button
-            archipelagoToggleMessagesButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => ArchipelagoClient.DisplayAPMessages
-                    ? "Hide server messages"
-                    : "Display server messages",
-                OnToggleAPMessages);
-
-            //Add Archipelago filter messages button
-            archipelagoToggleFilterMessagesButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => ArchipelagoClient.FilterAPMessages
-                    ? "Show all server messages"
-                    : "Filter messages to only relevant to me",
-                () => ArchipelagoClient.FilterAPMessages = !ArchipelagoClient.FilterAPMessages);
-
-            //Add Archipelago hint popup button
-            archipelagoToggleHintPopupButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => ArchipelagoClient.HintPopUps ? "Disable hint popups" : "Enable hint popups",
-                () => ArchipelagoClient.HintPopUps = !ArchipelagoClient.HintPopUps);
-
-            //Add Archipelago message display timer button
-            archipelagoMessageTimerButton = Courier.UI.RegisterTextEntryModOptionButton(
-                () => "AP Message Display Time",
-                entry => OnSelectMessageTimer(entry),
-                1,
-                () => "Enter amount of time to display Archipelago messages, in seconds",
-                () => updateTime.ToString(), CharsetFlags.Number);
-
-            //Add Archipelago death link button
-            archipelagoDeathLinkButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => ArchipelagoData.DeathLink
-                    ? "Disable Death Link"
-                    : "Enable Death Link",
-                OnToggleDeathLink);
-
-            //Add Archipelago hint button
-            archipelagoHintButton = Courier.UI.RegisterTextEntryModOptionButton(
-                () => "Hint for an item",
-                OnSelectArchipelagoHint,
-                30,
-                () => "Enter item name:");
-
-            //Add Archipelago release button
-            archipelagoReleaseButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => "Release remaining items",
-                OnSelectArchipelagoRelease);
-
-            //Add Archipelago collect button
-            archipelagoCollectButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => "Collect remaining items",
-                OnSelectArchipelagoCollect);
-
-            shuffleMusicButton = Courier.UI.RegisterSubMenuModOptionButton(
-                () => RandoMusicManager.ShuffleMusic
-                    ? "Disable Music Shuffle"
-                    : "Enable Music Shuffle",
-                () => RandoMusicManager.ShuffleMusic = !RandoMusicManager.ShuffleMusic);
-
             RandoMenu.ArchipelagoMenuButton =
                 Courier.UI.RegisterSubMenuOptionButton(() => "Randomizer", RandoMenu.DisplayRandoMenu);
 
-            PopulateRandoButtons();
+            PopulateRandoMenu();
             
-            void PopulateRandoButtons()
+            void PopulateRandoMenu()
             {
                 RandoMenu.versionButton =
                     RandoMenu.RegisterSubRandoButton(
                         () => "Messenger AP Randomizer: v" + ItemRandomizerUtil.GetModVersion(), null);
-                RandoMenu.connectMenuButton = RandoMenu.RegisterSubRandoButton(() => "Connect to Archipelago", null);
+                
+                //Add current seed number button
+                RandoMenu.seedNumButton = RandoMenu.RegisterSubRandoButton(
+                    () => "Current seed number: " + GetCurrentSeedNum(),
+                    null);
+
+                //Add windmill shuriken toggle button
+                RandoMenu.windmillShurikenToggleButton = RandoMenu.RegisterSubRandoButton(
+                    () => Manager<ProgressionManager>.Instance.useWindmillShuriken
+                        ? "Active Regular Shurikens"
+                        : "Active Windmill Shurikens",
+                    OnToggleWindmillShuriken);
+
+                //Add teleport to HQ button
+                RandoMenu.teleportToHqButton = RandoMenu.RegisterSubRandoButton(
+                    () => "Teleport to HQ",
+                    OnSelectTeleportToHq);
+
+                //Add teleport to Ninja Village button
+                RandoMenu.teleportToNinjaVillage = RandoMenu.RegisterSubRandoButton(
+                    () => "Teleport to Ninja Village",
+                    OnSelectTeleportToNinjaVillage);
+
+                //Add Archipelago status button
+                RandoMenu.archipelagoStatusButton = RandoMenu.RegisterSubRandoButton(
+                    () => ArchipelagoClient.DisplayStatus
+                        ? "Hide status information"
+                        : "Display status information",
+                    OnToggleAPStatus);
+
+                //Add Archipelago message button
+                RandoMenu.archipelagoToggleMessagesButton = RandoMenu.RegisterSubRandoButton(
+                    () => ArchipelagoClient.DisplayAPMessages
+                        ? "Hide server messages"
+                        : "Display server messages",
+                    OnToggleAPMessages);
+
+                //Add Archipelago filter messages button
+                RandoMenu.archipelagoToggleFilterMessagesButton = RandoMenu.RegisterSubRandoButton(
+                    () => ArchipelagoClient.FilterAPMessages
+                        ? "Show all server messages"
+                        : "Filter messages to only relevant to me",
+                    () => ArchipelagoClient.FilterAPMessages = !ArchipelagoClient.FilterAPMessages);
+
+                //Add Archipelago hint popup button
+                RandoMenu.archipelagoToggleHintPopupButton = RandoMenu.RegisterSubRandoButton(
+                    () => ArchipelagoClient.HintPopUps ? "Disable hint popups" : "Enable hint popups",
+                    () => ArchipelagoClient.HintPopUps = !ArchipelagoClient.HintPopUps);
+
+                //Add Archipelago message display timer button
+                RandoMenu.archipelagoMessageTimerButton = RandoMenu.RegisterTextRandoButton(
+                    () => "AP Message Display Time",
+                    entry => OnSelectMessageTimer(entry),
+                    1,
+                    () => "Enter amount of time to display Archipelago messages, in seconds",
+                    () => updateTime.ToString(), CharsetFlags.Number);
+
+                //Add Archipelago death link button
+                RandoMenu.archipelagoDeathLinkButton = RandoMenu.RegisterSubRandoButton(
+                    () => ArchipelagoData.DeathLink
+                        ? "Disable Death Link"
+                        : "Enable Death Link",
+                    OnToggleDeathLink);
+
+                //Add Archipelago release button
+                RandoMenu.archipelagoReleaseButton = RandoMenu.RegisterSubRandoButton(
+                    () => "Release remaining items",
+                    OnSelectArchipelagoRelease);
+
+                //Add Archipelago collect button
+                RandoMenu.archipelagoCollectButton = RandoMenu.RegisterSubRandoButton(
+                    () => "Collect remaining items",
+                    OnSelectArchipelagoCollect);
+
+                RandoMenu.shuffleMusicButton = RandoMenu.RegisterSubRandoButton(
+                    () => RandoMusicManager.ShuffleMusic
+                        ? "Disable Music Shuffle"
+                        : "Enable Music Shuffle",
+                    () => RandoMusicManager.ShuffleMusic = !RandoMusicManager.ShuffleMusic);
+
+                //Add Archipelago host button
+                RandoMenu.ArchipelagoHostButton = RandoMenu.RegisterTextRandoButton(
+                    () => "Enter Archipelago Host Name",
+                    OnSelectArchipelagoHost,
+                    30,
+                    () => "Enter the Archipelago host name.",
+                    () => ArchipelagoClient.ServerData?.Uri,
+                    CharsetFlags.Dash | CharsetFlags.Dot | CharsetFlags.Letter
+                    | CharsetFlags.Number | CharsetFlags.Space);
+                
+                //Add Archipelago port button
+                RandoMenu.ArchipelagoPortButton = RandoMenu.RegisterTextRandoButton(
+                    () => "Enter Archipelago Port",
+                    OnSelectArchipelagoPort,
+                    5,
+                    () => "Enter the port for the Archipelago session",
+                    () => ArchipelagoClient.ServerData?.Port.ToString(),
+                    CharsetFlags.Number);
+                
+                //Add archipelago name button
+                RandoMenu.ArchipelagoNameButton = RandoMenu.RegisterTextRandoButton(
+                    () => "Enter Archipelago Slot Name", OnSelectArchipelagoName,
+                    16,
+                    () => "Enter player name:",
+                    () => ArchipelagoClient.ServerData?.SlotName,
+                    CharsetFlags.Dash | CharsetFlags.Dot | CharsetFlags.Letter
+                    | CharsetFlags.Number | CharsetFlags.Space);
+                
+                //Add archipelago password button
+                RandoMenu.ArchipelagoPassButton = RandoMenu.RegisterTextRandoButton(
+                    () => "Enter Archipelago Password", OnSelectArchipelagoPass,
+                    30,
+                    () => "Enter session password:",
+                    () => ArchipelagoClient.ServerData?.Password);
+                
+                //Add Archipelago connection button
+                RandoMenu.ArchipelagoConnectButton = RandoMenu.RegisterSubRandoButton(
+                    () => "Connect to Archipelago",
+                    OnSelectArchipelagoConnect);
             }
             
+            HintMenu.ArchipelagoHintMenuButton =
+                Courier.UI.RegisterSubMenuOptionButton(() => "Hint Menu", HintMenu.DisplayHintMenu);
+
+            PopulateHintMenu();
+
+            void PopulateHintMenu()
+            {
+                //Add Archipelago hint button
+                HintMenu.archipelagoHintButton = HintMenu.RegisterTextRandoButton(
+                    () => "Hint for an item",
+                    OnSelectArchipelagoHint,
+                    30,
+                    () => "Enter item name:");
+            }
             //Plug in my code :3
             On.InventoryManager.AddItem += InventoryManager_AddItem;
             On.ProgressionManager.SetChallengeRoomAsCompleted += ProgressionManager_SetChallengeRoomAsCompleted;
             On.HasItem.IsTrue += HasItem_IsTrue;
             On.AwardNoteCutscene.ShouldPlay += AwardNoteCutscene_ShouldPlay;
             On.CutsceneHasPlayed.IsTrue += CutsceneHasPlayed_IsTrue;
-            On.SaveGameSelectionScreen.LoadGame += SaveGameSelectionScreen_LoadGame;
             On.SaveGameSelectionScreen.OnLoadGame += SaveGameSelectionScreen_OnLoadGame;
             On.SaveGameSelectionScreen.OnNewGame += SaveGameSelectionScreen_OnNewGame;
             On.SaveGameSelectionScreen.ConfirmSaveDelete += SaveGameSelectionScreen_ConfirmSaveDelete;
@@ -233,7 +209,7 @@ void PopulateRandoButtons()
             On.DialogCutscene.Play += DialogCutscene_Play;
             On.CatacombLevelInitializer.OnBeforeInitDone += CatacombLevelInitializer_OnBeforeInitDone;
             On.DialogManager.LoadDialogs_ELanguage += DialogChanger.LoadDialogs_Elanguage;
-            // // shop management
+            // shop management
             On.UpgradeButtonData.GetPrice += RandoShopManager.GetPrice;
             On.BuyMoneyWrenchCutscene.OnBuyWrenchChoice += RandoShopManager.BuyMoneyWrench;
             On.BuyMoneyWrenchCutscene.EndCutsceneOnDialogDone += RandoShopManager.EndMoneyWrenchCutscene;
@@ -288,48 +264,50 @@ void PopulateRandoButtons()
 
         public override void Initialize()
         {
-            //I only want the generate seed/enter seed mod options available when not in the game.
-            //Also the AP buttons
-            archipelagoHostButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
-            archipelagoPortButton.IsEnabled = () => !ArchipelagoClient.Authenticated &&
-                                                    (Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE
-                                                    || (Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE
-                                                        && ArchipelagoClient.HasConnected));
-            archipelagoNameButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
-            archipelagoPassButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
-            archipelagoConnectButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
-
-            //Options I only want working while actually in the game
-            seedNumButton.IsEnabled = () => ArchipelagoClient.HasConnected && randoStateManager.CurrentFileSlot != 0;
-            windmillShurikenToggleButton.IsEnabled = () => ArchipelagoClient.ServerData?.ReceivedItems != null &&
-                                                           ArchipelagoClient.ServerData.ReceivedItems.ContainsKey(
-                                                               ItemsAndLocationsHandler.ItemFromEItem(
-                                                                   EItems.WINDMILL_SHURIKEN));
-            teleportToHqButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
-                                                 RandomizerStateManager.IsSafeTeleportState();
-            teleportToNinjaVillage.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != 
-                ELevel.NONE && Manager<ProgressionManager>.Instance.HasCutscenePlayed("ElderAwardSeedCutscene") && 
-                RandomizerStateManager.IsSafeTeleportState();
-            shuffleMusicButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE;
+            // rando menu display settings
+            // these should only be visible from the main menu
+            RandoMenu.ArchipelagoHostButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
+            RandoMenu.ArchipelagoPortButton.IsEnabled = () => !ArchipelagoClient.Authenticated &&
+                                                              (Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE
+                                                               || (Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE
+                                                                   && ArchipelagoClient.HasConnected));
+            RandoMenu.ArchipelagoNameButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
+            RandoMenu.ArchipelagoPassButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
+            RandoMenu.ArchipelagoConnectButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
+
+            // Options I only want working while actually in the game
+            RandoMenu.seedNumButton.IsEnabled = () => ArchipelagoClient.HasConnected && randoStateManager.CurrentFileSlot != 0;
+            RandoMenu.windmillShurikenToggleButton.IsEnabled = () => ArchipelagoClient.ServerData?.ReceivedItems != null &&
+                                                                     ArchipelagoClient.ServerData.ReceivedItems.ContainsKey(
+                                                                         ItemsAndLocationsHandler.ItemFromEItem(
+                                                                             EItems.WINDMILL_SHURIKEN));
+            RandoMenu.teleportToHqButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
+                                                           RandomizerStateManager.IsSafeTeleportState();
+            RandoMenu.teleportToNinjaVillage.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != 
+                                                               ELevel.NONE && Manager<ProgressionManager>.Instance.HasCutscenePlayed("ElderAwardSeedCutscene") && 
+                                                               RandomizerStateManager.IsSafeTeleportState();
+            RandoMenu.shuffleMusicButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE;
             
-            //These AP buttons can exist in or out of game
-            archipelagoStatusButton.IsEnabled = () => ArchipelagoClient.Authenticated;
-            archipelagoToggleMessagesButton.IsEnabled = () => ArchipelagoClient.Authenticated;
-            archipelagoToggleFilterMessagesButton.IsEnabled = () =>
+            // These AP buttons can exist in or out of game
+            RandoMenu.archipelagoStatusButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+            RandoMenu.archipelagoToggleMessagesButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+            RandoMenu.archipelagoToggleFilterMessagesButton.IsEnabled = () =>
                 ArchipelagoClient.Authenticated && ArchipelagoClient.DisplayAPMessages;
-            archipelagoToggleHintPopupButton.IsEnabled = () => ArchipelagoClient.Authenticated;
-            archipelagoDeathLinkButton.IsEnabled = () => ArchipelagoClient.Authenticated;
-            archipelagoMessageTimerButton.IsEnabled = () => ArchipelagoClient.DisplayStatus;
-            archipelagoHintButton.IsEnabled = ArchipelagoClient.CanHint;
-            archipelagoReleaseButton.IsEnabled = ArchipelagoClient.CanRelease;
-            archipelagoCollectButton.IsEnabled = ArchipelagoClient.CanCollect;
-
+            RandoMenu.archipelagoToggleHintPopupButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+            RandoMenu.archipelagoDeathLinkButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+            RandoMenu.archipelagoMessageTimerButton.IsEnabled = () => ArchipelagoClient.DisplayStatus;
+            RandoMenu.archipelagoReleaseButton.IsEnabled = ArchipelagoClient.CanRelease;
+            RandoMenu.archipelagoCollectButton.IsEnabled = ArchipelagoClient.CanCollect;
+
+            // hint menu button displays
+            HintMenu.ArchipelagoHintMenuButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+            HintMenu.archipelagoHintButton.IsEnabled = () => true;//ArchipelagoClient.CanHint;
             #if DEBUG
             SceneManager.sceneLoaded += OnSceneLoadedRando;
             #endif
             
             //Options always available
-            versionButton.IsEnabled = () => true;
+            RandoMenu.versionButton.IsEnabled = () => true;
             
             //load config
             Debug.Log("Loading config from APConfig.toml");
@@ -504,19 +482,6 @@ bool CutsceneHasPlayed_IsTrue(On.CutsceneHasPlayed.orig_IsTrue orig, CutsceneHas
             return orig(self);
         }
         
-        private void SaveGameSelectionScreen_LoadGame(On.SaveGameSelectionScreen.orig_LoadGame orig, SaveGameSelectionScreen self, int slotindex)
-        {
-            Console.WriteLine("loading game");
-            try
-            {
-                orig(self, slotindex);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
-            }
-        }
-
         void SaveGameSelectionScreen_OnLoadGame(On.SaveGameSelectionScreen.orig_OnLoadGame orig, SaveGameSelectionScreen self, int slotIndex)
         {
             //slotIndex is 0-based, going to increment it locally to keep things simple.
@@ -638,7 +603,8 @@ ItemsAndLocationsHandler.LocationsLookup[new LocationRO("Necro")]))
         void NecrophobicWorkerCutscene_Play(On.NecrophobicWorkerCutscene.orig_Play orig, NecrophobicWorkerCutscene self)
         {
             //Cutscene moves Ninja around, lets see if i can stop it by making that "location" the current location the player is.
-            self.playerStartPosition = UnityEngine.Object.FindObjectOfType<PlayerController>().transform;
+            if (ArchipelagoClient.HasConnected)
+                self.playerStartPosition = UnityEngine.Object.FindObjectOfType<PlayerController>().transform;
             orig(self);
         }
 
@@ -732,14 +698,10 @@ void MusicBox_SetNotesState(On.MusicBox.orig_SetNotesState orig, MusicBox self)
         
         public static void OnToggleWindmillShuriken()
         {
-            //Toggle Shuriken
             Manager<ProgressionManager>.Instance.useWindmillShuriken = !Manager<ProgressionManager>.Instance.useWindmillShuriken;
-            //Update UI
             InGameHud view = Manager<UIManager>.Instance.GetView<InGameHud>();
             if (view != null)
-            {
                 view.UpdateShurikenVisibility();
-            }
         }
 
         void OnSelectTeleportToHq()
@@ -814,19 +776,19 @@ bool OnSelectArchipelagoPass(string answer)
         void OnSelectArchipelagoConnect()
         {
             if (ArchipelagoClient.ServerData == null) ArchipelagoClient.ServerData = new ArchipelagoData();
-            if (ArchipelagoClient.ServerData.SlotName.IsNullOrEmpty())
+            if (!UserConfig.SlotName.IsNullOrEmpty())
+            {
+                ArchipelagoClient.ServerData.Uri = UserConfig.HostName;
+                ArchipelagoClient.ServerData.Port = UserConfig.Port;
+                ArchipelagoClient.ServerData.SlotName = UserConfig.SlotName;
+                ArchipelagoClient.ServerData.Password = UserConfig.Password;
+            }
+            else if (ArchipelagoClient.ServerData.SlotName.IsNullOrEmpty())
             {
-                if (!UserConfig.SlotName.IsNullOrEmpty())
-                {
-                    ArchipelagoClient.ServerData.Uri = UserConfig.HostName;
-                    ArchipelagoClient.ServerData.Port = UserConfig.Port;
-                    ArchipelagoClient.ServerData.SlotName = UserConfig.SlotName;
-                    ArchipelagoClient.ServerData.Password = UserConfig.Password;
-                }
                 return;
             }
             
-            ArchipelagoClient.ConnectAsync(archipelagoConnectButton);
+            ArchipelagoClient.ConnectAsync(RandoMenu.ArchipelagoConnectButton);
         }
 
         void OnSelectArchipelagoRelease()
diff --git a/MessengerRando.csproj b/MessengerRando.csproj
index 4611de8..b73c40e 100644
--- a/MessengerRando.csproj
+++ b/MessengerRando.csproj
@@ -102,6 +102,7 @@
     <Compile Include="Overrides\RandoCatacombLevelInitializer.cs" />
     <Compile Include="RO\RandoItemRO.cs" />
     <Compile Include="RO\LocationRO.cs" />
+    <Compile Include="Utils\HintMenu.cs" />
     <Compile Include="Utils\Constants\BossConstants.cs" />
     <Compile Include="Utils\Constants\LevelConstants.cs" />
     <Compile Include="Utils\Constants\RoomConstants.cs" />
diff --git a/Utils/HintMenu.cs b/Utils/HintMenu.cs
new file mode 100644
index 0000000..6246a36
--- /dev/null
+++ b/Utils/HintMenu.cs
@@ -0,0 +1,437 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Mod.Courier;
+using Mod.Courier.UI;
+using TMPro;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+namespace MessengerRando.Utils
+{
+    public class HintMenu
+    {
+        public static OptionsButtonInfo ArchipelagoHintMenuButton;
+        private static HintScreen hintScreen;
+
+        public static SubMenuButtonInfo archipelagoHintButton;
+
+        public static void DisplayHintMenu()
+        {
+            Manager<UIManager>.Instance.GetView<OptionScreen>().gameObject.SetActive(false);
+            if (!HintScreen.ConnectScreenLoaded)
+                hintScreen = HintScreen.BuildModOptionScreen(Manager<UIManager>.Instance.GetView<OptionScreen>());
+            
+            Courier.UI.ShowView(hintScreen, EScreenLayers.PROMPT, null, false);
+        }
+
+        public class HintScreen : ModOptionScreen
+        {
+            public static bool ConnectScreenLoaded;
+            public static readonly List<OptionsButtonInfo> OptionButtons = new List<OptionsButtonInfo>();
+
+            private static int OptionsCount()
+            {
+                return OptionButtons.Count(modOptionButton => modOptionButton.gameObject.activeInHierarchy);
+            }
+
+            private static int EnabledModOptionsBeforeButton(OptionsButtonInfo button)
+            {
+                int num = 0;
+                foreach (OptionsButtonInfo modOptionButton in OptionButtons)
+                {
+                    if (modOptionButton.Equals(button))
+                        return num;
+                    if (modOptionButton.gameObject.activeInHierarchy)
+                        ++num;
+                }
+
+                return -1;
+            }
+
+            public void InitOptionsViewWithModButtons()
+            {
+                var view = this;
+                OptionScreen optionScreen = Manager<UIManager>.Instance.GetView<OptionScreen>();
+                Transform parent = view.transform.Find("Container").Find("BackgroundFrame").Find("OptionsFrame")
+                    .Find("OptionMenuButtons");
+                foreach (OptionsButtonInfo button in OptionButtons)
+                {
+                    switch (button)
+                    {
+                        case ToggleButtonInfo _:
+                            button.gameObject = Instantiate(optionScreen.fullscreenOption, parent);
+                            break;
+                        case SubMenuButtonInfo _:
+                            button.gameObject = Instantiate(optionScreen.controlsButton.transform.parent.gameObject,
+                                parent);
+                            break;
+                        case MultipleOptionButtonInfo _:
+                            button.gameObject = Instantiate(optionScreen.languageOption, parent);
+                            break;
+                        default:
+                            CourierLogger.Log(LogType.Warning, "OptionsMenu",
+                                button.GetType()?.ToString() + " not a known type of OptionsButtonInfo!");
+                            break;
+                    }
+
+                    button.gameObject.transform.SetAsLastSibling();
+                    GameObject gameObject = button.gameObject;
+                    Func<string> getText = button.GetText;
+                    string str = getText?.Invoke() ?? "Nameless Modded Options Button";
+                    gameObject.name = str;
+                    button.addedTo = view;
+                    foreach (TextMeshProUGUI componentsInChild in button.gameObject
+                                 .GetComponentsInChildren<TextMeshProUGUI>())
+                    {
+                        if (componentsInChild.name.Equals("OptionState") || componentsInChild.name.Equals("Text"))
+                            button.stateTextMesh = componentsInChild;
+                        if (componentsInChild.name.Equals("OptionName"))
+                        {
+                            button.nameTextMesh = componentsInChild;
+                            TextLocalizer component = componentsInChild.GetComponent<TextLocalizer>();
+                            if (component != null)
+                                component.locID = "";
+                        }
+                    }
+
+                    Button component1 = button.gameObject.transform.Find("Button").GetComponent<Button>();
+                    component1.onClick = new Button.ButtonClickedEvent();
+                    component1.onClick.AddListener(button.onClick);
+                    button.OnInit(view);
+                }
+
+                parent.Find("Back")?.SetAsLastSibling();
+            }
+
+            public new static HintScreen BuildModOptionScreen(OptionScreen optionScreen)
+            {
+                GameObject gameObject = new GameObject();
+                HintScreen randoScreen = gameObject.AddComponent<HintScreen>();
+                OptionScreen newScreen = Instantiate(optionScreen);
+                randoScreen.name = "ConnectScreen";
+                // Swap everything under the option screen to the mod option screen
+                // Iterate backwards so elements don't shift as lower ones are removed
+                for (int i = newScreen.transform.childCount - 1; i >= 0; i--)
+                {
+                    newScreen.transform.GetChild(i).SetParent(randoScreen.transform, false);
+                }
+
+                randoScreen.optionMenuButtons = randoScreen.transform.Find("Container").Find("BackgroundFrame")
+                    .Find("OptionsFrame").Find("OptionMenuButtons");
+                randoScreen.backButton = randoScreen.optionMenuButtons.Find("Back");
+                // Delete OptionScreen buttons except for the Back button
+                foreach (Transform child in randoScreen.optionMenuButtons.GetChildren())
+                {
+                    if (!child.Equals(randoScreen.backButton))
+                        Destroy(child.gameObject);
+                }
+
+                //TODO put back if things brake
+                // randoScreen.optionMenuButtons.DetachChildren();
+                randoScreen.backButton.SetParent(randoScreen.optionMenuButtons);
+
+                // Make back button take you to the OptionScreen instead of the pause menu
+                Button button = randoScreen.backButton.GetComponentInChildren<Button>();
+                button.onClick = new Button.ButtonClickedEvent();
+                button.onClick.AddListener(randoScreen.BackToOptionMenu);
+
+                randoScreen.InitStuffUnityWouldDo();
+
+                randoScreen.gameObject.SetActive(false);
+                ConnectScreenLoaded = true;
+                return randoScreen;
+            }
+
+            private void InitStuffUnityWouldDo()
+            {
+                //transform.position = new Vector3(0, Math.Max(-90 - heightPerButton * Courier.UI.ModOptionButtons.Count, startYMax));
+                backgroundFrame = (RectTransform)transform.Find("Container").Find("BackgroundFrame");
+                initialHeight = backgroundFrame.sizeDelta.y;
+                gameObject.AddComponent<Canvas>();
+            }
+
+            private void Start()
+            {
+                InitOptions();
+            }
+
+            public override void Init(IViewParams screenParams)
+            {
+                base.Init(screenParams);
+
+                InitOptionsViewWithModButtons();
+
+                // Make the border frames blue
+                Sprite borderSprite = backgroundFrame.GetComponent<Image>().sprite =
+                    Courier.EmbeddedSprites["Mod.Courier.UI.mod_options_frame"];
+                borderSprite.bounds.extents.Set(1.7f, 1.7f, 0.1f);
+                borderSprite.texture.filterMode = FilterMode.Point;
+
+                borderSprite = backgroundFrame.Find("OptionsFrame").GetComponent<Image>().sprite =
+                    Courier.EmbeddedSprites["Mod.Courier.UI.mod_options_frame"];
+                borderSprite.bounds.extents.Set(1.7f, 1.7f, 0.1f);
+                borderSprite.texture.filterMode = FilterMode.Point;
+
+                HideUnavailableOptions();
+                InitOptions();
+                SetInitialSelection();
+
+                // Make the selection frames blue
+                foreach (Image image in transform.GetComponentsInChildren<Image>()
+                             .Where((c) => c.name.Equals("SelectionFrame")))
+                {
+                    try
+                    {
+                        if (image.overrideSprite != null && image.overrideSprite.name != "Empty")
+                        {
+                            RenderTexture rt = new RenderTexture(image.overrideSprite.texture.width,
+                                image.overrideSprite.texture.height, 0);
+                            RenderTexture.active = rt;
+                            Graphics.Blit(image.overrideSprite.texture, rt);
+
+                            Texture2D res = new Texture2D(rt.width, rt.height, TextureFormat.RGBA32, true);
+                            res.ReadPixels(new Rect(0, 0, rt.width, rt.height), 0, 0, false);
+
+                            Color[] pxls = res.GetPixels();
+                            for (int i = 0; i < pxls.Length; i++)
+                            {
+                                if (Math.Abs(pxls[i].r - .973) < .01 && Math.Abs(pxls[i].g - .722) < .01)
+                                {
+                                    pxls[i].r = 0;
+                                    pxls[i].g = .633f;
+                                    pxls[i].b = 1;
+                                }
+                            }
+
+                            res.SetPixels(pxls);
+                            res.Apply();
+
+                            Sprite sprite = image.overrideSprite = Sprite.Create(res,
+                                new Rect(0, 0, res.width, res.height), new Vector2(16, 16), 20, 1,
+                                SpriteMeshType.FullRect, new Vector4(5, 5, 5, 5));
+                            sprite.bounds.extents.Set(.8f, .8f, 0.1f);
+                            sprite.texture.filterMode = FilterMode.Point;
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        CourierLogger.Log(LogType.Exception, "ConnectScreen",
+                            "Image not Read/Writeable when recoloring selection frames in ModOptionScreen");
+                        e.LogDetailed();
+                    }
+                }
+            }
+
+            private IEnumerator WaitAndSelectInitialButton()
+            {
+                yield return null;
+                SetInitialSelection();
+            }
+
+            private void OnEnable()
+            {
+                if (transform.parent != null)
+                {
+                    Manager<UIManager>.Instance.SetParentAndAlign(gameObject, transform.parent.gameObject);
+                }
+
+                EventSystem.current.SetSelectedGameObject(null);
+            }
+
+            private void OnDisable()
+            {
+                transform.position = defaultPos;
+            }
+
+            private void HideUnavailableOptions()
+            {
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    buttonInfo.gameObject.SetActive(buttonInfo.IsEnabled?.Invoke() ?? true);
+                }
+
+                foreach (OptionsButtonInfo buttonInfo in Courier.UI.ModOptionButtons)
+                {
+                    buttonInfo.gameObject.SetActive(false);
+                }
+
+                StartCoroutine(WaitAndSelectInitialButton());
+                Vector2 sizeDelta = backgroundFrame.sizeDelta;
+                backgroundFrame.sizeDelta =
+                    new Vector2(sizeDelta.x, 110 + heightPerButton * OptionsCount());
+            }
+
+            private void SetInitialSelection()
+            {
+                GameObject defaultSelectionButton =
+                    (initialSelection ?? defaultSelection).transform.Find("Button").gameObject;
+                defaultSelectionButton.transform.GetComponent<UIObjectAudioHandler>().playAudio = false;
+                EventSystem.current.SetSelectedGameObject(defaultSelectionButton);
+                defaultSelectionButton.GetComponent<Button>().OnSelect(null);
+                defaultSelectionButton.GetComponent<UIObjectAudioHandler>().playAudio = true;
+                initialSelection = null;
+            }
+
+            public new void GoOffscreenInstant()
+            {
+                gameObject.SetActive(false);
+                ConnectScreenLoaded = false;
+            }
+
+            public new int GetSelectedButtonIndex()
+            {
+                if (backButton.Find("Button").gameObject.Equals(EventSystem.current.currentSelectedGameObject))
+                    return OptionsCount();
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    if (buttonInfo.gameObject.transform.Find("Button").gameObject
+                        .Equals(EventSystem.current.currentSelectedGameObject))
+                    {
+                        return EnabledModOptionsBeforeButton(buttonInfo);
+                    }
+                }
+
+                return -1;
+            }
+
+            private void LateUpdate()
+            {
+                if (Manager<InputManager>.Instance.GetBackDown())
+                {
+                    BackToOptionMenu();
+                }
+
+                Vector3 windowOffset =
+                    new Vector3(0,
+                        Math.Min(GetSelectedButtonIndex(), Math.Max(0, OptionsCount() - 10)) *
+                        .9f) - new Vector3(0, Math.Max(0, OptionsCount() - 11) * .45f);
+                transform.position = defaultPos + windowOffset;
+
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    buttonInfo.UpdateNameText();
+                }
+
+                // Make the selection frames blue
+                // I should figure out if I can avoid doing this in LateUpdate()
+                foreach (Image image in transform.GetComponentsInChildren<Image>()
+                             .Where((c) => c.name.Equals("SelectionFrame")))
+                {
+                    try
+                    {
+                        if (image.overrideSprite != null && image.overrideSprite.name.Equals("ShopItemSelectionFrame"))
+                        {
+                            RenderTexture rt = new RenderTexture(image.overrideSprite.texture.width,
+                                image.overrideSprite.texture.height, 0);
+                            RenderTexture.active = rt;
+                            Graphics.Blit(image.overrideSprite.texture, rt);
+
+                            Texture2D res = new Texture2D(rt.width, rt.height, TextureFormat.RGBA32, true);
+                            res.ReadPixels(new Rect(0, 0, rt.width, rt.height), 0, 0, false);
+
+                            Color[] pxls = res.GetPixels();
+                            for (int i = 0; i < pxls.Length; i++)
+                            {
+                                if (Math.Abs(pxls[i].r - .973) < .01 && Math.Abs(pxls[i].g - .722) < .01)
+                                {
+                                    pxls[i].r = 0;
+                                    pxls[i].g = .633f;
+                                    pxls[i].b = 1;
+                                }
+                            }
+
+                            res.SetPixels(pxls);
+                            res.Apply();
+
+                            Sprite sprite = image.overrideSprite = Sprite.Create(res,
+                                new Rect(0, 0, res.width, res.height), new Vector2(16, 16), 20, 1,
+                                SpriteMeshType.FullRect, new Vector4(5, 5, 5, 5));
+                            sprite.bounds.extents.Set(.8f, .8f, 0.1f);
+                            sprite.texture.filterMode = FilterMode.Point;
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        CourierLogger.Log(LogType.Exception, "RandoScreen",
+                            "Image not Read/Writeable when recoloring selection frames in ModOptionScreen");
+                        CourierLogger.LogDetailed(e);
+                    }
+                }
+            }
+
+            private void InitOptions()
+            {
+                defaultSelection = backButton.gameObject;
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    if (buttonInfo.IsEnabled?.Invoke() ?? true)
+                    {
+                        defaultSelection = buttonInfo.gameObject;
+                        break;
+                    }
+                }
+
+                backgroundFrame.Find("Title").GetComponent<TextMeshProUGUI>().SetText("Archipelago Hint Menu");
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    buttonInfo.UpdateStateText();
+                }
+            }
+
+            public new void BackToOptionMenu()
+            {
+                Close(false);
+                Manager<UIManager>.Instance.GetView<OptionScreen>().gameObject.SetActive(true);
+                ArchipelagoHintMenuButton.gameObject.transform.Find("Button").GetComponent<UIObjectAudioHandler>()
+                    .playAudio = false;
+                EventSystem.current.SetSelectedGameObject(ArchipelagoHintMenuButton.gameObject.transform.Find("Button")
+                    .gameObject);
+                ArchipelagoHintMenuButton.gameObject.transform.Find("Button").GetComponent<UIObjectAudioHandler>()
+                    .playAudio = true;
+            }
+
+            public override void Close(bool transitionOut)
+            {
+                base.Close(transitionOut);
+                ConnectScreenLoaded = false;
+            }
+        }
+
+        private static void RegisterRandoButton(OptionsButtonInfo buttonInfo) =>
+            HintScreen.OptionButtons.Add(buttonInfo);
+
+        public static SubMenuButtonInfo RegisterSubRandoButton(Func<string> GetText, UnityAction onClick)
+        {
+            var buttonInfo = new SubMenuButtonInfo(GetText, onClick);
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static ToggleButtonInfo RegisterToggleRandoButton(Func<string> getText, UnityAction onClick,
+            Func<ToggleButtonInfo, bool> getState)
+        {
+            var buttonInfo = new ToggleButtonInfo(getText, onClick, getState,
+                optionScreen => Manager<LocalizationManager>.Instance.GetText(ModOptionScreen.onLocID),
+                optionScreen => Manager<LocalizationManager>.Instance.GetText(ModOptionScreen.offLocID));
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static TextEntryButtonInfo RegisterTextRandoButton(Func<string> getText, Func<string, bool> onEntry,
+            int maxCharacter = 15, Func<string> getEntryText = null, Func<string> getInitialText = null,
+            TextEntryButtonInfo.CharsetFlags charset = TextEntryButtonInfo.CharsetFlags.Letter |
+                                                       TextEntryButtonInfo.CharsetFlags.Number |
+                                                       TextEntryButtonInfo.CharsetFlags.Dash |
+                                                       TextEntryButtonInfo.CharsetFlags.Space)
+        {
+            var buttonInfo =
+                new TextEntryButtonInfo(getText, onEntry, maxCharacter, getEntryText, getInitialText, charset);
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Utils/RandoMenu.cs b/Utils/RandoMenu.cs
index edb50cb..58a30eb 100644
--- a/Utils/RandoMenu.cs
+++ b/Utils/RandoMenu.cs
@@ -17,10 +17,31 @@ namespace MessengerRando.Utils
     public class RandoMenu
     {
         public static OptionsButtonInfo ArchipelagoMenuButton;
-        private static RandoScreen randoScreen;
+        public static RandoScreen randoScreen;
 
         public static SubMenuButtonInfo versionButton;
-        public static SubMenuButtonInfo connectMenuButton;
+        public static SubMenuButtonInfo seedNumButton;
+
+        public static SubMenuButtonInfo windmillShurikenToggleButton;
+        public static SubMenuButtonInfo teleportToHqButton;
+        public static SubMenuButtonInfo teleportToNinjaVillage;
+        public static SubMenuButtonInfo shuffleMusicButton;
+
+        public static SubMenuButtonInfo ArchipelagoHostButton;
+        public static SubMenuButtonInfo ArchipelagoPortButton;
+        public static SubMenuButtonInfo ArchipelagoNameButton;
+        public static SubMenuButtonInfo ArchipelagoPassButton;
+        public static SubMenuButtonInfo ArchipelagoConnectButton;
+        
+        public static SubMenuButtonInfo archipelagoReleaseButton;
+        public static SubMenuButtonInfo archipelagoCollectButton;
+        public static SubMenuButtonInfo archipelagoToggleMessagesButton;
+        public static SubMenuButtonInfo archipelagoToggleFilterMessagesButton;
+        public static SubMenuButtonInfo archipelagoToggleHintPopupButton;
+        public static SubMenuButtonInfo archipelagoStatusButton;
+        public static SubMenuButtonInfo archipelagoDeathLinkButton;
+        public static SubMenuButtonInfo archipelagoMessageTimerButton;
+
 
 
         public static void DisplayRandoMenu()

From 9f092fd3a813a2dc698389a0b9c2a0d731c77978 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Mon, 8 Jan 2024 14:37:25 -0600
Subject: [PATCH 13/63] comment out hint menu so it can release fully featured
 later

---
 APRandomizerMain.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 7ad49db..7f10bf2 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -48,13 +48,13 @@ public override void Load()
             //Initialize the randomizer state manager
             randoStateManager = new RandomizerStateManager();
 
-            RandoMenu.ArchipelagoMenuButton =
-                Courier.UI.RegisterSubMenuOptionButton(() => "Randomizer", RandoMenu.DisplayRandoMenu);
-
-            PopulateRandoMenu();
+            BuildRandoMenu();
             
-            void PopulateRandoMenu()
+            void BuildRandoMenu()
             {
+                RandoMenu.ArchipelagoMenuButton =
+                    Courier.UI.RegisterSubMenuOptionButton(() => "Randomizer", RandoMenu.DisplayRandoMenu);
+
                 RandoMenu.versionButton =
                     RandoMenu.RegisterSubRandoButton(
                         () => "Messenger AP Randomizer: v" + ItemRandomizerUtil.GetModVersion(), null);
@@ -179,15 +179,15 @@ void PopulateRandoMenu()
                     OnSelectArchipelagoConnect);
             }
             
-            HintMenu.ArchipelagoHintMenuButton =
-                Courier.UI.RegisterSubMenuOptionButton(() => "Hint Menu", HintMenu.DisplayHintMenu);
+            BuildHintMenu();
 
-            PopulateHintMenu();
-
-            void PopulateHintMenu()
+            void BuildHintMenu()
             {
+                // HintMenu.ArchipelagoHintMenuButton =
+                //     Courier.UI.RegisterSubMenuOptionButton(() => "Hint Menu", HintMenu.DisplayHintMenu);
+
                 //Add Archipelago hint button
-                HintMenu.archipelagoHintButton = HintMenu.RegisterTextRandoButton(
+                HintMenu.archipelagoHintButton = RandoMenu.RegisterTextRandoButton(
                     () => "Hint for an item",
                     OnSelectArchipelagoHint,
                     30,

From cce3b26d00dae223b86f4f366b78b01643db9969 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Tue, 9 Jan 2024 12:54:51 -0600
Subject: [PATCH 14/63] cleanup and failsafes for portal rando

---
 APRandomizerMain.cs                        |   2 +-
 GameOverrideManagers/RandoLevelManager.cs  |  39 +--
 GameOverrideManagers/RandoPortalManager.cs | 348 ++++++++++++++++++++-
 Utils/Constants/LevelConstants.cs          |  32 +-
 Utils/RandomizerStateManager.cs            |  20 ++
 5 files changed, 401 insertions(+), 40 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 7f10bf2..ff6963e 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -300,7 +300,7 @@ public override void Initialize()
             RandoMenu.archipelagoCollectButton.IsEnabled = ArchipelagoClient.CanCollect;
 
             // hint menu button displays
-            HintMenu.ArchipelagoHintMenuButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+            // HintMenu.ArchipelagoHintMenuButton.IsEnabled = () => ArchipelagoClient.Authenticated;
             HintMenu.archipelagoHintButton.IsEnabled = () => true;//ArchipelagoClient.CanHint;
             #if DEBUG
             SceneManager.sceneLoaded += OnSceneLoadedRando;
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index 207b4df..9063da3 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -15,7 +15,6 @@ public static class RandoLevelManager
         private static bool teleporting;
         private static ELevel lastLevel;
         private static ELevel currentLevel;
-        public static readonly List<string> PlayedSpecialCutscenes = new List<string>();
 
         public static Dictionary<LevelConstants.RandoLevel, LevelConstants.RandoLevel> RandoLevelMapping;
 
@@ -43,11 +42,14 @@ private static LevelConstants.RandoLevel FindEntrance()
         {
             try
             {
-                currentLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
                 var playerPos = Manager<PlayerManager>.Instance.Player.transform.position;
                 if (!LevelConstants.TransitionToEntranceName.TryGetValue(
                         new LevelConstants.Transition(lastLevel, currentLevel), out var entrance))
                     return new LevelConstants.RandoLevel(ELevel.NONE, new Vector3());
+                if (entrance.Contains("Portal"))
+                    return RandoPortalManager.PortalMapping == null
+                        ? new LevelConstants.RandoLevel(ELevel.NONE, new Vector3())
+                        : RandoPortalManager.GetPortalExit(entrance);
                 LevelConstants.RandoLevel oldLevel = default;
                 if (LevelConstants.SpecialEntranceNames.Contains(entrance))
                 {
@@ -147,28 +149,24 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
                 teleporting = false;
                 return;
             }
-
-            var oldLevel = FindEntrance();
-            if (RandoLevelMapping == null || !RandoLevelMapping.TryGetValue(oldLevel, out var newLevel))
+            
+            if (Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.Level_11_B_MusicBox) &&
+                RandomizerStateManager.Instance.SkipMusicBox)
             {
-                if (Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.Level_11_B_MusicBox) &&
-                    RandomizerStateManager.Instance.SkipMusicBox)
-                {
-                    SkipMusicBox();
-                }
+                SkipMusicBox();
+                return;
             }
-            else
+            var oldLevel = FindEntrance();
+            if (RandoLevelMapping != null && RandoLevelMapping.TryGetValue(oldLevel, out var newLevel))
             {
                 var actualEntrance = LevelConstants.EntranceNameToRandoLevel
                     .First(ret => ret.Value.Equals(newLevel)).Key;
-                var newDimension = Manager<DimensionManager>.Instance.currentDimension;
+                var newDimension = newLevel.Dimension == EBits.NONE
+                    ? Manager<DimensionManager>.Instance.currentDimension
+                    : newLevel.Dimension;
                 if (LevelConstants.Force16.Contains(actualEntrance)) newDimension = EBits.BITS_16;
                 else if (LevelConstants.Force8.Contains(actualEntrance)) newDimension = EBits.BITS_8;
-            
-                if (newLevel.LevelName.Equals(ELevel.Level_11_B_MusicBox) &&
-                    RandomizerStateManager.Instance.SkipMusicBox)
-                    SkipMusicBox();
-                else TeleportInArea(newLevel.LevelName, newLevel.PlayerPos, newDimension);
+                TeleportInArea(newLevel.LevelName, newLevel.PlayerPos, newDimension);
             }
             // put the region we just loaded into in AP data storage for tracking
             if (!ArchipelagoClient.Authenticated) return;
@@ -179,13 +177,6 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
                 ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
                     self.GetCurrentLevelEnum().ToString();
         }
-
-        public static void PortalIntoArea(On.TotHQLevelInitializer.orig_InitLevel orig, TotHQLevelInitializer self,
-            Scene levelScene, ELevelEntranceID levelEntranceID, EBits dimension, bool positionPlayer,
-            LevelInitializerParams levelInitParams)
-        {
-            orig(self, levelScene, levelEntranceID, dimension, positionPlayer, levelInitParams);
-        }
         
         public static void SkipMusicBox()
         {
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 0142b75..94935f6 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -1,14 +1,358 @@
 using System;
 using System.Collections.Generic;
+using MessengerRando.Utils.Constants;
+using UnityEngine;
 using Object = UnityEngine.Object;
 
 namespace MessengerRando.GameOverrideManagers
 {
-    public class RandoPortalManager
+    public static class RandoPortalManager
     {
-        public static int NumStartingPortals = 5;
+        public readonly struct Portal
+        {
+            public readonly string Region;
+            public readonly string PortalType;
+            public readonly int Index;
 
+            public Portal(string region, string portalType, int index)
+            {
+                Region = region;
+                PortalType = portalType;
+                Index = index;
+            }
+        }
+        
         public static List<string> StartingPortals;
+        public static Dictionary<string, Portal> PortalMapping;
 
+        static readonly Dictionary<string, Dictionary<string, List<LevelConstants.RandoLevel>>> AreaCheckpoints =
+            new Dictionary<string, Dictionary<string, List<LevelConstants.RandoLevel>>>
+            {
+                {
+                    "AutumnHills", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Portal", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
+                            }
+                        },
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
+                            }
+                        }
+                    }
+                },
+                {
+                    "ForlornTemple", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
+                            }
+                        }
+                    }
+                },
+                {
+                    "Catacombs", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3()),
+                            }
+                        }
+                    }
+                },
+                {
+                    "BambooCreek", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3()),
+                            }
+                        }
+                    }
+                },
+                {
+                    "HowlingGrotto", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Portal", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3()),
+                            }
+                        },
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3()),
+                            }
+                        }
+                    }
+                },
+                {
+                    "QuillshroomMarsh", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3()),
+                            }
+                        }
+                    }
+                },
+                {
+                    "SearingCrags", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Portal", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
+                            }
+                        },
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
+                            }
+                        }
+                    }
+                },
+                {
+                    "GlacialPeak", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Portal", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
+                            }
+                        },
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
+                            }
+                        }
+                    }
+                },
+                {
+                    "TowerOfTime", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
+                            }
+                        }
+                    }
+                },
+                {
+                    "CloudRuins", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
+                            }
+                        }
+                    }
+                },
+                {
+                    "Underworld", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
+                            }
+                        }
+                    }
+                },
+                {
+                    "RiviereTurquoise", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Portal", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
+                            }
+                        },
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoitns", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
+                            }
+                        }
+                    }
+                },
+                {
+                    "SunkenShrine", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    {
+                        {
+                            "Portal", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                            }
+                        },
+                        {
+                            "Shops", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                            }
+                        },
+                        {
+                            "Checkpoitns", new List<LevelConstants.RandoLevel>
+                            {
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                            }
+                        }
+                    }
+                }
+            };
+        
+        public static LevelConstants.RandoLevel GetPortalExit(string enteredPortal)
+        {
+            var portalExit = PortalMapping[enteredPortal];
+            return AreaCheckpoints[portalExit.Region][portalExit.PortalType][portalExit.Index];
+        }
     }
 }
\ No newline at end of file
diff --git a/Utils/Constants/LevelConstants.cs b/Utils/Constants/LevelConstants.cs
index 3edb8c6..143cdc3 100644
--- a/Utils/Constants/LevelConstants.cs
+++ b/Utils/Constants/LevelConstants.cs
@@ -10,11 +10,20 @@ public static class LevelConstants
         {
             public ELevel LevelName { get; }
             public Vector3 PlayerPos { get; }
+            public EBits Dimension { get; }
 
             public RandoLevel(ELevel levelName, Vector3 playerPos)
             {
                 LevelName = levelName;
                 PlayerPos = playerPos;
+                Dimension = EBits.NONE;
+            }
+
+            public RandoLevel(ELevel levelName, Vector3 playerPos, EBits dimension)
+            {
+                LevelName = levelName;
+                PlayerPos = playerPos;
+                Dimension = dimension;
             }
 
             public bool Equals(RandoLevel other)
@@ -335,11 +344,11 @@ public override int GetHashCode()
                 },
                 {
                     new Transition(ELevel.Level_06_A_BambooCreek, ELevel.Level_05_A_HowlingGrotto),
-                    "Howling Grotto - Top"
+                    "Howling Grotto - Left"
                 },
                 {
                     new Transition(ELevel.Level_05_B_SunkenShrine, ELevel.Level_05_A_HowlingGrotto),
-                    "Howling Grotto - Left"
+                    "Howling Grotto - Bottom"
                 },
                 {
                     new Transition(ELevel.Level_07_QuillshroomMarsh, ELevel.Level_05_A_HowlingGrotto),
@@ -371,7 +380,12 @@ public override int GetHashCode()
                 },
                 {
                     new Transition(ELevel.Level_11_A_CloudRuins, ELevel.Level_09_A_GlacialPeak),
-                    "Glacial Peak - Top" },
+                    "Glacial Peak - Top"
+                },
+                {
+                    new Transition(ELevel.Level_09_A_GlacialPeak, ELevel.Level_11_A_CloudRuins),
+                    "Cloud Ruins - Left"
+                },
                 {
                     new Transition(ELevel.Level_08_SearingCrags, ELevel.Level_12_UnderWorld),
                     "Underworld - Top Left"
@@ -388,10 +402,6 @@ public override int GetHashCode()
                     new Transition(ELevel.Level_09_A_GlacialPeak, ELevel.Level_09_B_ElementalSkylands),
                     "Elemental Skylands - Left"
                 },
-                {
-                    new Transition(ELevel.Level_09_A_GlacialPeak, ELevel.Level_11_A_CloudRuins),
-                    "Cloud Ruins - Left"
-                },
                 {
                     new Transition(ELevel.Level_13_TowerOfTimeHQ, ELevel.Level_11_B_MusicBox),
                     "Music Box - Left"
@@ -421,7 +431,8 @@ public override int GetHashCode()
                     "Sunken Shrine - Portal"
                 },
                 {
-                    new Transition(ELevel.Level_13_TowerOfTimeHQ, ELevel.Level_10_A_TowerOfTime), "Tower of Time - Left"
+                    new Transition(ELevel.Level_13_TowerOfTimeHQ, ELevel.Level_10_A_TowerOfTime),
+                    "Tower of Time - Left"
                 },
                 {
                     new Transition(ELevel.Level_13_TowerOfTimeHQ, ELevel.Level_14_CorruptedFuture),
@@ -445,11 +456,6 @@ public override int GetHashCode()
                 },
             };
 
-        public static readonly List<string> SpecialCutscenes = new List<string>
-        {
-            "SunkenShrinePortalOpeningCutscene",
-        };
-
         /// <summary>
         /// I'm doing the magic by determining where the player teleported from as that's definitely the easiest way to
         /// do this. These areas connect to each other twice so I need to use the player pos to determine which one
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 9357efd..df68e9b 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -86,6 +86,26 @@ public static void InitializeMultiSeed()
                     Console.WriteLine(scene);
                     RandoPortalManager.StartingPortals.Add(scene);
                 }
+
+                var portalExits = ((JObject)slotData["portal_exits"]).ToObject<Dictionary<string, string>>();
+                RandoPortalManager.PortalMapping = new Dictionary<string, RandoPortalManager.Portal>();
+                foreach (var kvp in portalExits)
+                {
+                    var currentPortalExit = kvp.Value.Split(' ');
+                    RandoPortalManager.PortalMapping[kvp.Key] =
+                        new RandoPortalManager.Portal(
+                            currentPortalExit[0], currentPortalExit[1], Convert.ToInt32(currentPortalExit[2])
+                            );
+                }
+            }
+            else
+            {
+                RandoPortalManager.StartingPortals = new List<string>
+                {
+                    "RiviereTurquoisePortalOpeningCutscene",
+                    "SunkenShrinePortalOpeningCutscene",
+                    "SearingCragsPortalOpeningCutscene",
+                };
             }
         }
 

From fa78fa6b8172b42c8d32c74f790301c41ef95754 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Wed, 10 Jan 2024 23:22:02 -0600
Subject: [PATCH 15/63] finish mapping out all the portals and clean up rando
 menu

---
 APRandomizerMain.cs                           | 184 ++++++++--------
 Archipelago/ArchipelagoData.cs                |   7 +-
 GameOverrideManagers/RandoLevelManager.cs     |  58 +----
 GameOverrideManagers/RandoMusicManager.cs     |   2 +-
 GameOverrideManagers/RandoPortalManager.cs    | 204 +++++++++---------
 GameOverrideManagers/RandoPowerSealManager.cs |   2 +
 GameOverrideManagers/RandoRoomManager.cs      |   8 +-
 Utils/Constants/LevelConstants.cs             |  98 ++-------
 8 files changed, 243 insertions(+), 320 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index ff6963e..a419625 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -55,14 +55,77 @@ void BuildRandoMenu()
                 RandoMenu.ArchipelagoMenuButton =
                     Courier.UI.RegisterSubMenuOptionButton(() => "Randomizer", RandoMenu.DisplayRandoMenu);
 
+                // These should always be visible
                 RandoMenu.versionButton =
                     RandoMenu.RegisterSubRandoButton(
                         () => "Messenger AP Randomizer: v" + ItemRandomizerUtil.GetModVersion(), null);
+                RandoMenu.versionButton.IsEnabled = () => true;
                 
+                // these should only be visible from the main menu
+                //Add Archipelago host button
+                RandoMenu.ArchipelagoHostButton = RandoMenu.RegisterTextRandoButton(
+                    () => "Enter Archipelago Host Name",
+                    OnSelectArchipelagoHost,
+                    30,
+                    () => "Enter the Archipelago host name.",
+                    () => ArchipelagoClient.ServerData?.Uri,
+                    CharsetFlags.Dash | CharsetFlags.Dot | CharsetFlags.Letter
+                    | CharsetFlags.Number | CharsetFlags.Space);
+                RandoMenu.ArchipelagoHostButton.IsEnabled = () =>
+                    Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
+                    !ArchipelagoClient.Authenticated;
+                
+                //Add Archipelago port button
+                RandoMenu.ArchipelagoPortButton = RandoMenu.RegisterTextRandoButton(
+                    () => "Enter Archipelago Port",
+                    OnSelectArchipelagoPort,
+                    5,
+                    () => "Enter the port for the Archipelago session",
+                    () => ArchipelagoClient.ServerData?.Port.ToString(),
+                    CharsetFlags.Number);
+                RandoMenu.ArchipelagoPortButton.IsEnabled =
+                    () => !ArchipelagoClient.Authenticated &&
+                          (Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE ||
+                           (Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
+                            ArchipelagoClient.HasConnected));
+                
+                //Add archipelago name button
+                RandoMenu.ArchipelagoNameButton = RandoMenu.RegisterTextRandoButton(
+                    () => "Enter Archipelago Slot Name", OnSelectArchipelagoName,
+                    16,
+                    () => "Enter player name:",
+                    () => ArchipelagoClient.ServerData?.SlotName,
+                    CharsetFlags.Dash | CharsetFlags.Dot | CharsetFlags.Letter
+                    | CharsetFlags.Number | CharsetFlags.Space);
+                RandoMenu.ArchipelagoNameButton.IsEnabled = () =>
+                    Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
+                    !ArchipelagoClient.Authenticated;
+                
+                //Add archipelago password button
+                RandoMenu.ArchipelagoPassButton = RandoMenu.RegisterTextRandoButton(
+                    () => "Enter Archipelago Password", OnSelectArchipelagoPass,
+                    30,
+                    () => "Enter session password:",
+                    () => ArchipelagoClient.ServerData?.Password);
+                RandoMenu.ArchipelagoPassButton.IsEnabled = () =>
+                    Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
+                    !ArchipelagoClient.Authenticated;
+                
+                //Add Archipelago connection button
+                RandoMenu.ArchipelagoConnectButton = RandoMenu.RegisterSubRandoButton(
+                    () => "Connect to Archipelago",
+                    OnSelectArchipelagoConnect);
+                RandoMenu.ArchipelagoConnectButton.IsEnabled = () =>
+                    Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
+                    !ArchipelagoClient.Authenticated;
+
+                // only visible while actually in the game
                 //Add current seed number button
                 RandoMenu.seedNumButton = RandoMenu.RegisterSubRandoButton(
                     () => "Current seed number: " + GetCurrentSeedNum(),
                     null);
+                RandoMenu.seedNumButton.IsEnabled = () =>
+                    ArchipelagoClient.HasConnected && randoStateManager.CurrentFileSlot != 0;
 
                 //Add windmill shuriken toggle button
                 RandoMenu.windmillShurikenToggleButton = RandoMenu.RegisterSubRandoButton(
@@ -70,16 +133,28 @@ void BuildRandoMenu()
                         ? "Active Regular Shurikens"
                         : "Active Windmill Shurikens",
                     OnToggleWindmillShuriken);
+                RandoMenu.windmillShurikenToggleButton.IsEnabled =
+                    () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
+                          ArchipelagoClient.ServerData?.ReceivedItems != null &&
+                          ArchipelagoClient.ServerData.ReceivedItems.ContainsKey(
+                              ItemsAndLocationsHandler.ItemFromEItem(EItems.WINDMILL_SHURIKEN));
 
                 //Add teleport to HQ button
                 RandoMenu.teleportToHqButton = RandoMenu.RegisterSubRandoButton(
                     () => "Teleport to HQ",
                     OnSelectTeleportToHq);
+                RandoMenu.teleportToHqButton.IsEnabled = () =>
+                    Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
+                    RandomizerStateManager.IsSafeTeleportState();
 
                 //Add teleport to Ninja Village button
                 RandoMenu.teleportToNinjaVillage = RandoMenu.RegisterSubRandoButton(
                     () => "Teleport to Ninja Village",
                     OnSelectTeleportToNinjaVillage);
+                RandoMenu.teleportToNinjaVillage.IsEnabled = () =>
+                    Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
+                    Manager<ProgressionManager>.Instance.HasCutscenePlayed("ElderAwardSeedCutscene") &&
+                    RandomizerStateManager.IsSafeTeleportState();
 
                 //Add Archipelago status button
                 RandoMenu.archipelagoStatusButton = RandoMenu.RegisterSubRandoButton(
@@ -87,6 +162,7 @@ void BuildRandoMenu()
                         ? "Hide status information"
                         : "Display status information",
                     OnToggleAPStatus);
+                RandoMenu.archipelagoStatusButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago message button
                 RandoMenu.archipelagoToggleMessagesButton = RandoMenu.RegisterSubRandoButton(
@@ -94,6 +170,7 @@ void BuildRandoMenu()
                         ? "Hide server messages"
                         : "Display server messages",
                     OnToggleAPMessages);
+                RandoMenu.archipelagoToggleMessagesButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago filter messages button
                 RandoMenu.archipelagoToggleFilterMessagesButton = RandoMenu.RegisterSubRandoButton(
@@ -101,82 +178,52 @@ void BuildRandoMenu()
                         ? "Show all server messages"
                         : "Filter messages to only relevant to me",
                     () => ArchipelagoClient.FilterAPMessages = !ArchipelagoClient.FilterAPMessages);
+                RandoMenu.archipelagoToggleFilterMessagesButton.IsEnabled = () =>
+                    ArchipelagoClient.Authenticated && ArchipelagoClient.DisplayAPMessages;
 
                 //Add Archipelago hint popup button
                 RandoMenu.archipelagoToggleHintPopupButton = RandoMenu.RegisterSubRandoButton(
                     () => ArchipelagoClient.HintPopUps ? "Disable hint popups" : "Enable hint popups",
                     () => ArchipelagoClient.HintPopUps = !ArchipelagoClient.HintPopUps);
+                RandoMenu.archipelagoToggleHintPopupButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago message display timer button
                 RandoMenu.archipelagoMessageTimerButton = RandoMenu.RegisterTextRandoButton(
                     () => "AP Message Display Time",
-                    entry => OnSelectMessageTimer(entry),
+                    OnSelectMessageTimer,
                     1,
                     () => "Enter amount of time to display Archipelago messages, in seconds",
                     () => updateTime.ToString(), CharsetFlags.Number);
+                RandoMenu.archipelagoMessageTimerButton.IsEnabled =
+                    () => ArchipelagoClient.Authenticated && ArchipelagoClient.DisplayStatus;
 
+                RandoMenu.shuffleMusicButton = RandoMenu.RegisterSubRandoButton(
+                    () => RandoMusicManager.ShuffleMusic
+                        ? "Disable Music Shuffle"
+                        : "Enable Music Shuffle",
+                    () => RandoMusicManager.ShuffleMusic = !RandoMusicManager.ShuffleMusic);
+                RandoMenu.shuffleMusicButton.IsEnabled =
+                    () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE;
+                
                 //Add Archipelago death link button
                 RandoMenu.archipelagoDeathLinkButton = RandoMenu.RegisterSubRandoButton(
                     () => ArchipelagoData.DeathLink
                         ? "Disable Death Link"
                         : "Enable Death Link",
                     OnToggleDeathLink);
+                RandoMenu.archipelagoDeathLinkButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago release button
                 RandoMenu.archipelagoReleaseButton = RandoMenu.RegisterSubRandoButton(
                     () => "Release remaining items",
                     OnSelectArchipelagoRelease);
+                RandoMenu.archipelagoReleaseButton.IsEnabled = ArchipelagoClient.CanRelease;
 
                 //Add Archipelago collect button
                 RandoMenu.archipelagoCollectButton = RandoMenu.RegisterSubRandoButton(
                     () => "Collect remaining items",
                     OnSelectArchipelagoCollect);
-
-                RandoMenu.shuffleMusicButton = RandoMenu.RegisterSubRandoButton(
-                    () => RandoMusicManager.ShuffleMusic
-                        ? "Disable Music Shuffle"
-                        : "Enable Music Shuffle",
-                    () => RandoMusicManager.ShuffleMusic = !RandoMusicManager.ShuffleMusic);
-
-                //Add Archipelago host button
-                RandoMenu.ArchipelagoHostButton = RandoMenu.RegisterTextRandoButton(
-                    () => "Enter Archipelago Host Name",
-                    OnSelectArchipelagoHost,
-                    30,
-                    () => "Enter the Archipelago host name.",
-                    () => ArchipelagoClient.ServerData?.Uri,
-                    CharsetFlags.Dash | CharsetFlags.Dot | CharsetFlags.Letter
-                    | CharsetFlags.Number | CharsetFlags.Space);
-                
-                //Add Archipelago port button
-                RandoMenu.ArchipelagoPortButton = RandoMenu.RegisterTextRandoButton(
-                    () => "Enter Archipelago Port",
-                    OnSelectArchipelagoPort,
-                    5,
-                    () => "Enter the port for the Archipelago session",
-                    () => ArchipelagoClient.ServerData?.Port.ToString(),
-                    CharsetFlags.Number);
-                
-                //Add archipelago name button
-                RandoMenu.ArchipelagoNameButton = RandoMenu.RegisterTextRandoButton(
-                    () => "Enter Archipelago Slot Name", OnSelectArchipelagoName,
-                    16,
-                    () => "Enter player name:",
-                    () => ArchipelagoClient.ServerData?.SlotName,
-                    CharsetFlags.Dash | CharsetFlags.Dot | CharsetFlags.Letter
-                    | CharsetFlags.Number | CharsetFlags.Space);
-                
-                //Add archipelago password button
-                RandoMenu.ArchipelagoPassButton = RandoMenu.RegisterTextRandoButton(
-                    () => "Enter Archipelago Password", OnSelectArchipelagoPass,
-                    30,
-                    () => "Enter session password:",
-                    () => ArchipelagoClient.ServerData?.Password);
-                
-                //Add Archipelago connection button
-                RandoMenu.ArchipelagoConnectButton = RandoMenu.RegisterSubRandoButton(
-                    () => "Connect to Archipelago",
-                    OnSelectArchipelagoConnect);
+                RandoMenu.archipelagoCollectButton.IsEnabled = ArchipelagoClient.CanCollect;
             }
             
             BuildHintMenu();
@@ -185,6 +232,7 @@ void BuildHintMenu()
             {
                 // HintMenu.ArchipelagoHintMenuButton =
                 //     Courier.UI.RegisterSubMenuOptionButton(() => "Hint Menu", HintMenu.DisplayHintMenu);
+                // HintMenu.ArchipelagoHintMenuButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago hint button
                 HintMenu.archipelagoHintButton = RandoMenu.RegisterTextRandoButton(
@@ -192,6 +240,7 @@ void BuildHintMenu()
                     OnSelectArchipelagoHint,
                     30,
                     () => "Enter item name:");
+                HintMenu.archipelagoHintButton.IsEnabled = ArchipelagoClient.CanHint;
             }
             //Plug in my code :3
             On.InventoryManager.AddItem += InventoryManager_AddItem;
@@ -264,51 +313,10 @@ void BuildHintMenu()
 
         public override void Initialize()
         {
-            // rando menu display settings
-            // these should only be visible from the main menu
-            RandoMenu.ArchipelagoHostButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
-            RandoMenu.ArchipelagoPortButton.IsEnabled = () => !ArchipelagoClient.Authenticated &&
-                                                              (Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE
-                                                               || (Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE
-                                                                   && ArchipelagoClient.HasConnected));
-            RandoMenu.ArchipelagoNameButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
-            RandoMenu.ArchipelagoPassButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
-            RandoMenu.ArchipelagoConnectButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE && !ArchipelagoClient.Authenticated;
-
-            // Options I only want working while actually in the game
-            RandoMenu.seedNumButton.IsEnabled = () => ArchipelagoClient.HasConnected && randoStateManager.CurrentFileSlot != 0;
-            RandoMenu.windmillShurikenToggleButton.IsEnabled = () => ArchipelagoClient.ServerData?.ReceivedItems != null &&
-                                                                     ArchipelagoClient.ServerData.ReceivedItems.ContainsKey(
-                                                                         ItemsAndLocationsHandler.ItemFromEItem(
-                                                                             EItems.WINDMILL_SHURIKEN));
-            RandoMenu.teleportToHqButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
-                                                           RandomizerStateManager.IsSafeTeleportState();
-            RandoMenu.teleportToNinjaVillage.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != 
-                                                               ELevel.NONE && Manager<ProgressionManager>.Instance.HasCutscenePlayed("ElderAwardSeedCutscene") && 
-                                                               RandomizerStateManager.IsSafeTeleportState();
-            RandoMenu.shuffleMusicButton.IsEnabled = () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE;
-            
-            // These AP buttons can exist in or out of game
-            RandoMenu.archipelagoStatusButton.IsEnabled = () => ArchipelagoClient.Authenticated;
-            RandoMenu.archipelagoToggleMessagesButton.IsEnabled = () => ArchipelagoClient.Authenticated;
-            RandoMenu.archipelagoToggleFilterMessagesButton.IsEnabled = () =>
-                ArchipelagoClient.Authenticated && ArchipelagoClient.DisplayAPMessages;
-            RandoMenu.archipelagoToggleHintPopupButton.IsEnabled = () => ArchipelagoClient.Authenticated;
-            RandoMenu.archipelagoDeathLinkButton.IsEnabled = () => ArchipelagoClient.Authenticated;
-            RandoMenu.archipelagoMessageTimerButton.IsEnabled = () => ArchipelagoClient.DisplayStatus;
-            RandoMenu.archipelagoReleaseButton.IsEnabled = ArchipelagoClient.CanRelease;
-            RandoMenu.archipelagoCollectButton.IsEnabled = ArchipelagoClient.CanCollect;
-
-            // hint menu button displays
-            // HintMenu.ArchipelagoHintMenuButton.IsEnabled = () => ArchipelagoClient.Authenticated;
-            HintMenu.archipelagoHintButton.IsEnabled = () => true;//ArchipelagoClient.CanHint;
             #if DEBUG
             SceneManager.sceneLoaded += OnSceneLoadedRando;
             #endif
             
-            //Options always available
-            RandoMenu.versionButton.IsEnabled = () => true;
-            
             //load config
             Debug.Log("Loading config from APConfig.toml");
             try
diff --git a/Archipelago/ArchipelagoData.cs b/Archipelago/ArchipelagoData.cs
index fb56f55..5ed3e5e 100644
--- a/Archipelago/ArchipelagoData.cs
+++ b/Archipelago/ArchipelagoData.cs
@@ -74,6 +74,11 @@ private bool loadData(int slot)
                         ThreadPool.QueueUserWorkItem(o =>
                             ArchipelagoClient.Session.Locations.CompleteLocationChecksAsync(null,
                                 CheckedLocations.ToArray()));
+                        if (ArchipelagoClient.ItemQueue.Count <= 0 || Index <= 0) return true;
+                        for (var i = 0; i < Index; i++)
+                        {
+                            ArchipelagoClient.ItemQueue.Dequeue();
+                        }
                         return true;
                     }
                     //There was archipelago save data and it doesn't match our current connection so abort.
@@ -98,7 +103,7 @@ private bool loadData(int slot)
                 //Attempt to connect to the server and save the new data
                 Debug.Log("Attempting to connect");
                 ArchipelagoClient.Connect();
-                if (ArchipelagoClient.ItemQueue.Count > 0)
+                if (ArchipelagoClient.ItemQueue.Count > 0 && Index > 0)
                 {
                     for (var i = 0; i < Index; i++)
                     {
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index 9063da3..f6af9cb 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -158,16 +158,12 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
             }
             var oldLevel = FindEntrance();
             if (RandoLevelMapping != null && RandoLevelMapping.TryGetValue(oldLevel, out var newLevel))
-            {
-                var actualEntrance = LevelConstants.EntranceNameToRandoLevel
-                    .First(ret => ret.Value.Equals(newLevel)).Key;
-                var newDimension = newLevel.Dimension == EBits.NONE
-                    ? Manager<DimensionManager>.Instance.currentDimension
-                    : newLevel.Dimension;
-                if (LevelConstants.Force16.Contains(actualEntrance)) newDimension = EBits.BITS_16;
-                else if (LevelConstants.Force8.Contains(actualEntrance)) newDimension = EBits.BITS_8;
-                TeleportInArea(newLevel.LevelName, newLevel.PlayerPos, newDimension);
-            }
+                TeleportInArea(
+                    newLevel.LevelName,
+                    newLevel.PlayerPos,
+                    newLevel.Dimension == EBits.NONE
+                        ? Manager<DimensionManager>.Instance.currentDimension
+                        : newLevel.Dimension);
             // put the region we just loaded into in AP data storage for tracking
             if (!ArchipelagoClient.Authenticated) return;
             if (self.lastLevelLoaded.Equals(ELevel.Level_13_TowerOfTimeHQ + "_Build"))
@@ -180,7 +176,9 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
         
         public static void SkipMusicBox()
         {
+            #if DEBUG
             Console.WriteLine($"attempting to skip music box. already teleporting : {teleporting}");
+            #endif
             if (teleporting)
             {
                 teleporting = false;
@@ -201,7 +199,9 @@ public static void TeleportInArea(ELevel area, Vector2 position, EBits dimension
                 teleporting = false;
                 return;
             }
+            #if DEBUG
             Console.WriteLine($"Attempting to teleport to {area}, ({position.x}, {position.y}), {dimension}");
+            #endif
             Manager<AudioManager>.Instance.StopMusic();
             Manager<ProgressionManager>.Instance.checkpointSaveInfo.loadedLevelPlayerPosition = position;
             if (dimension.Equals(EBits.NONE)) dimension = Manager<DimensionManager>.Instance.currentDimension;
@@ -209,45 +209,7 @@ public static void TeleportInArea(ELevel area, Vector2 position, EBits dimension
                 true, true, LoadSceneMode.Single,
                 ELevelEntranceID.NONE, dimension);
             teleporting = true;
-            Console.WriteLine("set teleporting to true");
             Manager<LevelManager>.Instance.LoadLevel(levelLoadingInfo);
         }
-
-
-        public static void Level_ChangeRoom(On.Level.orig_ChangeRoom orig, Level self,
-            ScreenEdge newRoomLeftEdge, ScreenEdge newRoomRightEdge,
-            ScreenEdge newRoomBottomEdge, ScreenEdge newRoomTopEdge,
-            bool teleportedInRoom)
-        {
-            #if DEBUG
-            string GetRoomKey()
-            {
-                return newRoomLeftEdge.edgeIdX + newRoomRightEdge.edgeIdX
-                                               + newRoomBottomEdge.edgeIdY + newRoomTopEdge.edgeIdY;
-            }
-            Console.WriteLine("new room params:" +
-                              $"{newRoomLeftEdge.edgeIdX} " +
-                              $"{newRoomRightEdge.edgeIdX} " +
-                              $"{newRoomBottomEdge.edgeIdY} " +
-                              $"{newRoomTopEdge.edgeIdY} ");
-            Console.WriteLine($"new roomKey: {GetRoomKey()}");
-            Console.WriteLine(self.CurrentRoom != null
-                ? $"currentRoom roomKey: {self.CurrentRoom.roomKey}"
-                : "currentRoom does not exist.");
-            Console.WriteLine($"teleported: {teleportedInRoom}");
-            var position = Manager<PlayerManager>.Instance.Player.transform.position;
-            Console.WriteLine("Player position: " +
-                              $"{position.x} " +
-                              $"{position.y} " +
-                              $"{position.z}");
-            #endif
-
-
-            //This func checks if the new roomKey exists within levelRooms before changing and checks if currentRoom exists
-            //if we're in a room, it leaves the current room then enters the new room with the teleported bool
-            //no idea what the teleported bool does currently
-            orig(self, newRoomLeftEdge, newRoomRightEdge, newRoomBottomEdge, newRoomTopEdge, teleportedInRoom);
-            // RandoBossManager.ShouldFightBoss(GetRoomKey());
-        }
     }
 }
\ No newline at end of file
diff --git a/GameOverrideManagers/RandoMusicManager.cs b/GameOverrideManagers/RandoMusicManager.cs
index 97cc0fa..cbe1c67 100644
--- a/GameOverrideManagers/RandoMusicManager.cs
+++ b/GameOverrideManagers/RandoMusicManager.cs
@@ -6,7 +6,7 @@
 
 namespace MessengerRando.GameOverrideManagers
 {
-    public class RandoMusicManager
+    public static class RandoMusicManager
     {
         private static Random random;
         private static bool shuffleMusic;
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 94935f6..f48a8a7 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using MessengerRando.Utils.Constants;
 using UnityEngine;
-using Object = UnityEngine.Object;
 
 namespace MessengerRando.GameOverrideManagers
 {
@@ -34,25 +32,26 @@ public Portal(string region, string portalType, int index)
                         {
                             "Portal", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(-20076.46f, -200004)),
                             }
                         },
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(-45.5f, -89)),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(68, -111)),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(407, -74)),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(893, -27)),
                             }
                         },
                         {
                             "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(175, -148)),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(92, -87)),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(267.94f, -67)),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(608, -35)),
+                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(718, -61), EBits.BITS_8),
                             }
                         }
                     }
@@ -63,19 +62,20 @@ public Portal(string region, string portalType, int index)
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(1, -11)),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(89, -10)),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(252, 53)),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(156, 85)),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(272, 61)),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(347, 31)),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(355, -11)),
                             }
                         },
                         {
                             "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(125, 47)),
+                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(260, 24)),
                             }
                         }
                     }
@@ -86,15 +86,16 @@ public Portal(string region, string portalType, int index)
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(241, -25)),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(732, -75)),
                             }
                         },
                         {
                             "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(380, -23)),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(530, -75)),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(500, -43)),
                             }
                         }
                     }
@@ -105,16 +106,16 @@ public Portal(string region, string portalType, int index)
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(-29, -19)),
+                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(92, 25)),
+                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(380, 25)),
                             }
                         },
                         {
                             "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(227, -41)),
+                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(210, 29)),
                             }
                         }
                     }
@@ -125,21 +126,22 @@ public Portal(string region, string portalType, int index)
                         {
                             "Portal", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(241f, -196f)),
                             }
                         },
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(26, -27)),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(310, -115)),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(542, -123)),
                             }
                         },
                         {
                             "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(138, -90)),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(439, -170)),
                             }
                         }
                     }
@@ -150,17 +152,17 @@ public Portal(string region, string portalType, int index)
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(194, -37)),
+                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(663, -27)),
+                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(1085, -45)),
                             }
                         },
                         {
                             "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(161, -54)),
+                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(410, -42)),
+                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(916, -26)),
                             }
                         }
                     }
@@ -171,24 +173,25 @@ public Portal(string region, string portalType, int index)
                         {
                             "Portal", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(384.5f, 135f)),
                             }
                         },
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(61, -27)),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(147, 69)),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(226, 151)),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(282, 23)),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(380, 309)),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(120, 248), EBits.BITS_8),
                             }
                         },
                         {
                             "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(109, 63)),
+                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(296, 189), EBits.BITS_8),
                             }
                         }
                     }
@@ -199,23 +202,23 @@ public Portal(string region, string portalType, int index)
                         {
                             "Portal", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(220.6358f, -67f)),
                             }
                         },
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(216, -456)),
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(260, -297)),
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(156, -27)),
                             }
                         },
                         {
                             "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(227, -405)),
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(251, -235)),
+                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(195, -131)),
                             }
                         }
                     }
@@ -226,18 +229,19 @@ public Portal(string region, string portalType, int index)
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(71, -11), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(84, 237), EBits.BITS_8),
                             }
                         },
                         {
                             "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(29, 21), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(5, 37), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(50, 77), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(57, 85), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(31, 133), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(58, 165), EBits.BITS_8),
                             }
                         }
                     }
@@ -248,21 +252,22 @@ public Portal(string region, string portalType, int index)
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-368, -26), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-116, -35), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(108, -24)),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(355, -27), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(721, -22), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(816, -26), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(1148, -27), EBits.BITS_8),
                             }
                         },
                         {
                             "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-146, 24), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(159, -29)),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(780, -26)),
+                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-251, 13)),
                             }
                         }
                     }
@@ -273,18 +278,19 @@ public Portal(string region, string portalType, int index)
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-305, -51), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-186, -24), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-125, -91), EBits.BITS_8),
+                                //new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(124, -43)), // barm'athaziel which isn't accessible in second quest
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(132, -130)),
                             }
                         },
                         {
                             "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-225, -89), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(1, 72), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-110, -98), EBits.BITS_8),
                             }
                         }
                     }
@@ -295,24 +301,24 @@ public Portal(string region, string portalType, int index)
                         {
                             "Portal", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(837, 13)),
                             }
                         },
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(804, -40)),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(499, -132), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(337, -131)),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(149, -89)),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(-8, 13)),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(-259, 7)),
                             }
                         },
                         {
-                            "Checkpoitns", new List<LevelConstants.RandoLevel>
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(648, -83), EBits.BITS_8),
                             }
                         }
                     }
@@ -323,26 +329,26 @@ public Portal(string region, string portalType, int index)
                         {
                             "Portal", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(29f, -55f)),
                             }
                         },
                         {
                             "Shops", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(36, -41)),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(186, -9), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(8, -65), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(-102, -121), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(100, -81), EBits.BITS_8),
                             }
                         },
                         {
-                            "Checkpoitns", new List<LevelConstants.RandoLevel>
+                            "Checkpoints", new List<LevelConstants.RandoLevel>
                             {
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3()),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(76, -16), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(30, -87), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(166, -178), EBits.BITS_8),
+                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(92, -100), EBits.BITS_8),
                             }
                         }
                     }
diff --git a/GameOverrideManagers/RandoPowerSealManager.cs b/GameOverrideManagers/RandoPowerSealManager.cs
index c71592e..c1e33b4 100644
--- a/GameOverrideManagers/RandoPowerSealManager.cs
+++ b/GameOverrideManagers/RandoPowerSealManager.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using MessengerRando.Archipelago;
 using MessengerRando.Utils;
+using UnityEngine;
 using Object = UnityEngine.Object;
 
 namespace MessengerRando.GameOverrideManagers
@@ -52,6 +53,7 @@ private void OnShopChestOpen()
         {
             try
             {
+                Debug.Log("Opening the shop chest...");
                 Object.FindObjectOfType<Shop>().LeaveToCurrentLevel();
                 RandoLevelManager.SkipMusicBox();
             }
diff --git a/GameOverrideManagers/RandoRoomManager.cs b/GameOverrideManagers/RandoRoomManager.cs
index bf834be..18da46b 100644
--- a/GameOverrideManagers/RandoRoomManager.cs
+++ b/GameOverrideManagers/RandoRoomManager.cs
@@ -11,19 +11,19 @@ public static class RandoRoomManager
         public static bool RoomOverride;
         public static Dictionary<string, string> RoomMap; // old room name - new room name
         
-        private static string GetRoomKey(ScreenEdge left, ScreenEdge right, ScreenEdge bottom, ScreenEdge top)
+        static string GetRoomKey(ScreenEdge left, ScreenEdge right, ScreenEdge bottom, ScreenEdge top)
         {
             return $"{left.edgeIdX} {right.edgeIdX} {bottom.edgeIdY} {top.edgeIdY}";
         }
 
-        private static void SetRoomKey(ScreenEdge left, ScreenEdge right, ScreenEdge bottom, ScreenEdge top,
+        static void SetRoomKey(ScreenEdge left, ScreenEdge right, ScreenEdge bottom, ScreenEdge top,
             string roomKey)
         {
             var edges = roomKey.Split(' ');
             left.edgeIdX = edges[0]; right.edgeIdX = edges[1]; bottom.edgeIdY = edges[2]; top.edgeIdY = edges[3];
         }
 
-        public static bool IsBossRoom(string roomKey, out string bossName)
+        static bool IsBossRoom(string roomKey, out string bossName)
         {
             Console.WriteLine($"Checking if {roomKey} is a boss room");
             bossName = string.Empty;
@@ -90,7 +90,7 @@ static bool WithinRange(float pos1, float pos2)
             return comparison <= 10;
         }
 
-        public static RoomConstants.RandoRoom PlaceInRoom(string oldRoomKey, ELevel currentLevel, out RoomConstants.RoomTransition newTransition)
+        static RoomConstants.RandoRoom PlaceInRoom(string oldRoomKey, ELevel currentLevel, out RoomConstants.RoomTransition newTransition)
         {
             newTransition = new RoomConstants.RoomTransition();
             if (!RoomConstants.RoomNameLookup.TryGetValue(new RoomConstants.RandoRoom(oldRoomKey, currentLevel),
diff --git a/Utils/Constants/LevelConstants.cs b/Utils/Constants/LevelConstants.cs
index 143cdc3..a3bb3a6 100644
--- a/Utils/Constants/LevelConstants.cs
+++ b/Utils/Constants/LevelConstants.cs
@@ -84,10 +84,6 @@ public override int GetHashCode()
                     "Ninja Village - Right",
                     new RandoLevel(ELevel.Level_01_NinjaVillage, new Vector3(-153.32f, -57f))
                 },
-                {
-                    "Autumn Hills - Portal",
-                    new RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(-20076.59f, -20004f))
-                },
                 {
                     "Autumn Hills - Left",
                     new RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(-304.7717f, -72.99999f))
@@ -97,7 +93,7 @@ public override int GetHashCode()
                     new RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(968.5283f, -27f))
                 },
                 {
-                    "Autumn Hills - Bottom", new RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(679.6884f, -139f))
+                    "Autumn Hills - Bottom", new RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(679.6884f, -139f), EBits.BITS_16)
                 }, // Must be 16
                 {
                     "Forlorn Temple - Left",
@@ -105,7 +101,7 @@ public override int GetHashCode()
                 },
                 {
                     "Forlorn Temple - Bottom",
-                    new RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(36.87273f, -20.98116f))
+                    new RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(36.87273f, -20.98116f), EBits.BITS_16)
                 }, // Must be 16
                 {
                     "Forlorn Temple - Right",
@@ -121,15 +117,15 @@ public override int GetHashCode()
                 },
                 {
                     "Catacombs - Bottom",
-                    new RandoLevel(ELevel.Level_04_Catacombs, new Vector3(511.0319f, -123f))
+                    new RandoLevel(ELevel.Level_04_Catacombs, new Vector3(511.0319f, -123f), EBits.BITS_16)
                 }, // Must be 16
                 {
                     "Catacombs - Bottom Left",
-                    new RandoLevel(ELevel.Level_04_Catacombs, new Vector3(144.5119f, -59f))
+                    new RandoLevel(ELevel.Level_04_Catacombs, new Vector3(144.5119f, -59f), EBits.BITS_16)
                 }, // Must be 16
                 {
                     "Dark Cave - Right",
-                    new RandoLevel(ELevel.Level_04_B_DarkCave, new Vector3(-4.059998f, -4f))
+                    new RandoLevel(ELevel.Level_04_B_DarkCave, new Vector3(-4.059998f, -4f), EBits.BITS_16)
                 }, // This needs to be forced to 16 bit to not soft lock the player
                 // { "Dark Cave - Left", new RandoLevel(ELevel.Level_04_B_DarkCave, new Vector3()) }, // This may or may not be possible. This is a drop down into riviere in vanilla and you can't return from riviere
                 {
@@ -138,12 +134,8 @@ public override int GetHashCode()
                 }, //TOT D
                 {
                     "Riviere Turquoise - Right",
-                    new RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(997.7f, 5.999998f))
+                    new RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(997.7f, 5.999998f), EBits.BITS_8)
                 }, // This needs to be forced to 8 bit
-                {
-                    "Howling Grotto - Portal",
-                    new RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(241f, -196f))
-                }, //TOT G
                 {
                     "Howling Grotto - Left",
                     new RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(-46.82001f, -11f))
@@ -154,19 +146,15 @@ public override int GetHashCode()
                 }, // Emerald Golem is here. Need to either figure out teleporting out of boss rooms without fighting them or temporarily mark it as dead. Scene loaded gets called before the check, but level loaded is after 
                 {
                     "Howling Grotto - Top",
-                    new RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(419.95f, -58.66491f))
+                    new RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(419.95f, -58.66491f), EBits.BITS_16)
                 }, // This needs to be forced to 16 bit
                 {
                     "Howling Grotto - Bottom",
-                    new RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(194.9271f, -151.665f))
+                    new RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(194.9271f, -151.665f), EBits.BITS_16)
                 }, // needs to be 16
-                {
-                    "Sunken Shrine - Portal",
-                    new RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(29f, -55f))
-                }, // 16
                 {
                     "Sunken Shrine - Left",
-                    new RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(-46.41f, -58.66499f))
+                    new RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(-46.41f, -58.66499f), EBits.BITS_16)
                 }, // This needs to be forced to 16 bit
                 {
                     "Bamboo Creek - Top Left",
@@ -186,7 +174,7 @@ public override int GetHashCode()
                 },
                 {
                     "Quillshroom Marsh - Bottom Left",
-                    new RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(598.1053f, -75.66499f))
+                    new RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(598.1053f, -75.66499f), EBits.BITS_16)
                 }, // This needs to be forced to 16 bit
                 {
                     "Quillshroom Marsh - Top Right",
@@ -194,32 +182,24 @@ public override int GetHashCode()
                 },
                 {
                     "Quillshroom Marsh - Bottom Right",
-                    new RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(841.3f, -121f))
+                    new RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(841.3f, -121f), EBits.BITS_16)
                 }, // 16
-                {
-                    "Searing Crags - Portal",
-                    new RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(384.5f, 135f))
-                },
                 {
                     "Searing Crags - Left",
                     new RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(-17.23438f, -27f))
                 },
                 {
                     "Searing Crags - Bottom",
-                    new RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(303.3f, 39f))
+                    new RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(303.3f, 39f), EBits.BITS_16)
                 },
                 {
                     "Searing Crags - Right",
-                    new RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(521.8f, 71f))
+                    new RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(521.8f, 71f), EBits.BITS_8)
                 }, // Force 8 bit
                 {
                     "Searing Crags - Top",
                     new RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(351.5f, 324.2888f))
                 },
-                {
-                    "Glacial Peak - Portal",
-                    new RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(220.6358f, -67f))
-                },
                 {
                     "Glacial Peak - Bottom",
                     new RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(194.9839f, -517.7611f))
@@ -231,11 +211,11 @@ public override int GetHashCode()
                 },
                 // {
                 //     "Elemental Skylands - Left",
-                //     new RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(-424.9693f, 366.5677f))
+                //     new RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(-424.9693f, 366.5677f), EBits.BITS_16)
                 // }, // 16 - This will probably be really difficult since it uses a different controller
                 {
                     "Tower of Time - Left",
-                    new RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(-18f, -11f))
+                    new RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(-18f, -11f), EBits.BITS_8)
                 }, // 8
                 {
                     "Cloud Ruins - Left",
@@ -247,11 +227,11 @@ public override int GetHashCode()
                 },
                 {
                     "Underworld - Top Left",
-                    new RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-337.5526f, -25f))
+                    new RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-337.5526f, -25f), EBits.BITS_8)
                 }, // Force 8 bit
                 {
                     "Underworld - Bottom Left",
-                    new RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-431.7626f, -57f))
+                    new RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-431.7626f, -57f), EBits.BITS_16)
                 }, // force 16 bit - one time and one way only - after defeating manfred - might be able to force it by calling ManfredBossOutroCutscene?
                 {
                     "Corrupted Future - Portal",
@@ -259,7 +239,7 @@ public override int GetHashCode()
                 }, // 16
                 {
                     "Ruxxtin Surfin'",
-                    new RandoLevel(ELevel.Level_15_Surf, new Vector3(-472.191f, 472f))
+                    new RandoLevel(ELevel.Level_15_Surf, new Vector3(-472.191f, 472f), EBits.BITS_8)
                 }, // 8
                 {
                     "Beach - Left",
@@ -271,7 +251,7 @@ public override int GetHashCode()
                 },
                 {
                     "Voodoo Heart - Left",
-                    new RandoLevel(ELevel.Level_18_Volcano_Chase, new Vector3(-165.5f, 104.5551f))
+                    new RandoLevel(ELevel.Level_18_Volcano_Chase, new Vector3(-165.5f, 104.5551f), EBits.BITS_8)
                 }, // 8
             };
 
@@ -466,45 +446,5 @@ public override int GetHashCode()
             "Howling Grotto - Right", "Quillshroom Marsh - Left",
             "Quillshroom Marsh - Right", "Searing Crags - Left"
         };
-
-        /// <summary>
-        /// entrance that have to be in 16 bit or we get soft locked
-        /// </summary>
-        public static readonly List<string> Force16 = new List<string>
-        {
-            "Autumn Hills - Bottom",
-            "Forlorn Temple - Bottom",
-            "Catacombs - Bottom Left",
-            "Catacombs - Bottom",
-            "Dark Cave - Right",
-            "Howling Grotto - Top",
-            "Howling Grotto - Bottom",
-            "Sunken Shrine - Left",
-            "Quillshroom Marsh - Bottom Left",
-            "Quillshroom Marsh - Bottom Right",
-            "Searing Crags - Bottom Left",
-            "Underworld - Bottom Left",
-            "Elemental Skylands - Left",
-            "Autumn Hills - Portal",
-            "Riviere Turquoise - Portal",
-            "Howling Grotto - Portal",
-            "Sunken Shrine - Portal",
-            "Searing Crags - Portal",
-            "Glacial Peak - Portal",
-            "Corrupted Future - Portal"
-        };
-
-        /// <summary>
-        /// entrances that have to be in 8 bit or we get soft locked
-        /// </summary>
-        public static readonly List<string> Force8 = new List<string>
-        {
-            "Riviere Turquoise - Right",
-            "Searing Crags - Right",
-            "Tower of Time - Left",
-            "Underworld - Top Left",
-            "Ruxxtin Surfin'",
-            "Voodoo Heart - Left",
-        };
     }
 }
\ No newline at end of file

From 9f16d8afabacc3fbf144a880c6911d9fafd13dd0 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Thu, 11 Jan 2024 16:31:11 -0600
Subject: [PATCH 16/63] use all ints for portals

---
 GameOverrideManagers/RandoPortalManager.cs | 120 +++++++++++----------
 Utils/RandomizerStateManager.cs            |  11 +-
 2 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index f48a8a7..d050d2f 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using MessengerRando.Utils.Constants;
 using UnityEngine;
 
@@ -8,35 +9,36 @@ public static class RandoPortalManager
     {
         public readonly struct Portal
         {
-            public readonly string Region;
-            public readonly string PortalType;
+            public readonly int Region;
+            public readonly int PortalType;
             public readonly int Index;
 
-            public Portal(string region, string portalType, int index)
+            public Portal(int portalWarp)
             {
-                Region = region;
-                PortalType = portalType;
-                Index = index;
+                var modWarp = portalWarp.ToString();
+                Region = Convert.ToInt32(modWarp[0]);
+                PortalType = Convert.ToInt32(modWarp[1]);
+                Index = Convert.ToInt32(modWarp[2]);
             }
         }
         
         public static List<string> StartingPortals;
         public static Dictionary<string, Portal> PortalMapping;
 
-        static readonly Dictionary<string, Dictionary<string, List<LevelConstants.RandoLevel>>> AreaCheckpoints =
-            new Dictionary<string, Dictionary<string, List<LevelConstants.RandoLevel>>>
+        static readonly List<List<List<LevelConstants.RandoLevel>>> AreaCheckpoints =
+            new List<List<List<LevelConstants.RandoLevel>>>
             {
                 {
-                    "AutumnHills", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Portal", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(-20076.46f, -200004)),
                             }
                         },
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(-45.5f, -89)),
                                 new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(68, -111)),
@@ -45,7 +47,7 @@ public Portal(string region, string portalType, int index)
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(175, -148)),
                                 new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(92, -87)),
@@ -57,10 +59,10 @@ public Portal(string region, string portalType, int index)
                     }
                 },
                 {
-                    "ForlornTemple", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(1, -11)),
                                 new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(89, -10)),
@@ -72,7 +74,7 @@ public Portal(string region, string portalType, int index)
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(125, 47)),
                                 new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(260, 24)),
@@ -81,17 +83,17 @@ public Portal(string region, string portalType, int index)
                     }
                 },
                 {
-                    "Catacombs", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(241, -25)),
                                 new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(732, -75)),
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(380, -23)),
                                 new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(530, -75)),
@@ -101,10 +103,10 @@ public Portal(string region, string portalType, int index)
                     }
                 },
                 {
-                    "BambooCreek", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(-29, -19)),
                                 new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(92, 25)),
@@ -112,7 +114,7 @@ public Portal(string region, string portalType, int index)
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(227, -41)),
                                 new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(210, 29)),
@@ -121,16 +123,16 @@ public Portal(string region, string portalType, int index)
                     }
                 },
                 {
-                    "HowlingGrotto", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Portal", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(241f, -196f)),
                             }
                         },
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(26, -27)),
                                 new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(310, -115)),
@@ -138,7 +140,7 @@ public Portal(string region, string portalType, int index)
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(138, -90)),
                                 new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(439, -170)),
@@ -147,10 +149,10 @@ public Portal(string region, string portalType, int index)
                     }
                 },
                 {
-                    "QuillshroomMarsh", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(194, -37)),
                                 new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(663, -27)),
@@ -158,7 +160,7 @@ public Portal(string region, string portalType, int index)
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(161, -54)),
                                 new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(410, -42)),
@@ -168,16 +170,16 @@ public Portal(string region, string portalType, int index)
                     }
                 },
                 {
-                    "SearingCrags", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Portal", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(384.5f, 135f)),
                             }
                         },
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(61, -27)),
                                 new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(147, 69)),
@@ -188,7 +190,7 @@ public Portal(string region, string portalType, int index)
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(109, 63)),
                                 new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(296, 189), EBits.BITS_8),
@@ -197,16 +199,16 @@ public Portal(string region, string portalType, int index)
                     }
                 },
                 {
-                    "GlacialPeak", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Portal", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(220.6358f, -67f)),
                             }
                         },
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(216, -456)),
                                 new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(260, -297)),
@@ -214,7 +216,7 @@ public Portal(string region, string portalType, int index)
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(227, -405)),
                                 new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(251, -235)),
@@ -224,17 +226,17 @@ public Portal(string region, string portalType, int index)
                     }
                 },
                 {
-                    "TowerOfTime", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(71, -11), EBits.BITS_8),
                                 new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(84, 237), EBits.BITS_8),
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(29, 21), EBits.BITS_8),
                                 new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(5, 37), EBits.BITS_8),
@@ -247,10 +249,10 @@ public Portal(string region, string portalType, int index)
                     }
                 },
                 {
-                    "CloudRuins", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-368, -26), EBits.BITS_8),
                                 new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-116, -35), EBits.BITS_8),
@@ -262,7 +264,7 @@ public Portal(string region, string portalType, int index)
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-146, 24), EBits.BITS_8),
                                 new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(159, -29)),
@@ -273,10 +275,10 @@ public Portal(string region, string portalType, int index)
                     }
                 },
                 {
-                    "Underworld", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-305, -51), EBits.BITS_8),
                                 new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-186, -24), EBits.BITS_8),
@@ -286,7 +288,7 @@ public Portal(string region, string portalType, int index)
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-225, -89), EBits.BITS_8),
                                 new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(1, 72), EBits.BITS_8),
@@ -296,16 +298,16 @@ public Portal(string region, string portalType, int index)
                     }
                 },
                 {
-                    "RiviereTurquoise", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Portal", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(837, 13)),
                             }
                         },
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(804, -40)),
                                 new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(499, -132), EBits.BITS_8),
@@ -316,7 +318,7 @@ public Portal(string region, string portalType, int index)
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(648, -83), EBits.BITS_8),
                             }
@@ -324,16 +326,16 @@ public Portal(string region, string portalType, int index)
                     }
                 },
                 {
-                    "SunkenShrine", new Dictionary<string, List<LevelConstants.RandoLevel>>
+                    new List<List<LevelConstants.RandoLevel>>
                     {
                         {
-                            "Portal", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(29f, -55f)),
                             }
                         },
                         {
-                            "Shops", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(36, -41)),
                                 new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(186, -9), EBits.BITS_8),
@@ -343,7 +345,7 @@ public Portal(string region, string portalType, int index)
                             }
                         },
                         {
-                            "Checkpoints", new List<LevelConstants.RandoLevel>
+                            new List<LevelConstants.RandoLevel>
                             {
                                 new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(76, -16), EBits.BITS_8),
                                 new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(30, -87), EBits.BITS_8),
@@ -354,6 +356,16 @@ public Portal(string region, string portalType, int index)
                     }
                 }
             };
+
+        public static readonly List<string> Portals = new List<string>
+        {
+            "Autumn Hills - Portal",
+            "Riviere Turquoise - Portal",
+            "Howling Grotto - Portal",
+            "Sunken Shrine - Portal",
+            "Searing Crags - Portal",
+            "Glacial Peak - Portal",
+        };
         
         public static LevelConstants.RandoLevel GetPortalExit(string enteredPortal)
         {
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index df68e9b..b132461 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -87,15 +87,12 @@ public static void InitializeMultiSeed()
                     RandoPortalManager.StartingPortals.Add(scene);
                 }
 
-                var portalExits = ((JObject)slotData["portal_exits"]).ToObject<Dictionary<string, string>>();
+                var portalExits = ((JObject)slotData["portal_exits"]).ToObject<List<int>>();
                 RandoPortalManager.PortalMapping = new Dictionary<string, RandoPortalManager.Portal>();
-                foreach (var kvp in portalExits)
+                for (int i = 0; i < RandoPortalManager.Portals.Count; i++)
                 {
-                    var currentPortalExit = kvp.Value.Split(' ');
-                    RandoPortalManager.PortalMapping[kvp.Key] =
-                        new RandoPortalManager.Portal(
-                            currentPortalExit[0], currentPortalExit[1], Convert.ToInt32(currentPortalExit[2])
-                            );
+                    RandoPortalManager.PortalMapping[RandoPortalManager.Portals[i]] =
+                        new RandoPortalManager.Portal(portalExits[i]);
                 }
             }
             else

From 529c75535f82013c59c535189068eb513c190d5e Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Wed, 17 Jan 2024 06:47:49 -0600
Subject: [PATCH 17/63] 0 at the beginning gets removed

---
 GameOverrideManagers/RandoPortalManager.cs | 27 +++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index d050d2f..4dfc6f3 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -16,9 +16,30 @@ public readonly struct Portal
             public Portal(int portalWarp)
             {
                 var modWarp = portalWarp.ToString();
-                Region = Convert.ToInt32(modWarp[0]);
-                PortalType = Convert.ToInt32(modWarp[1]);
-                Index = Convert.ToInt32(modWarp[2]);
+                if (modWarp.Length == 4)
+                {
+                    Region = Convert.ToInt32(modWarp.Substring(0, 2));
+                    PortalType = Convert.ToInt32(modWarp[2]);
+                    Index = Convert.ToInt32(modWarp[3]);
+                }
+                else if (modWarp.Length == 3)
+                {
+                    Region = Convert.ToInt32(modWarp[0]);
+                    PortalType = Convert.ToInt32(modWarp[1]);
+                    Index = Convert.ToInt32(modWarp[2]);
+                }
+                else if (modWarp.Length == 2)
+                {
+                    Region = 0;
+                    PortalType = Convert.ToInt32(modWarp[0]);
+                    Index = Convert.ToInt32(modWarp[1]);
+                }
+                else
+                {
+                    Region = 0;
+                    PortalType = 0;
+                    Index = Convert.ToInt32(modWarp);
+                }
             }
         }
         

From 431b80eb5df36f7ac380d3733c9d0a7c66e46b4a Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Thu, 25 Jan 2024 03:05:58 -0600
Subject: [PATCH 18/63] finish client side portal rando

---
 APRandomizerMain.cs                        |  33 +-
 Archipelago/ArchipelagoClient.cs           |  16 +-
 GameOverrideManagers/RandoLevelManager.cs  |  45 +-
 GameOverrideManagers/RandoPortalManager.cs | 540 +++++++++------------
 GameOverrideManagers/RandoRoomManager.cs   |   2 +-
 Utils/Constants/LevelConstants.cs          |   5 +
 Utils/RandomizerStateManager.cs            |   2 +-
 7 files changed, 318 insertions(+), 325 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index a24b037..a38017a 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -7,7 +7,6 @@
 using MessengerRando.RO;
 using Mod.Courier;
 using Mod.Courier.Module;
-using Mod.Courier.UI;
 using MonoMod.Cil;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -297,6 +296,7 @@ void BuildHintMenu()
             On.MegaTimeShard.OnBreakDone += MegaTimeShard_OnBreakDone;
             On.DialogSequence.GetDialogList += DialogSequence_GetDialogList;
             On.LevelManager.EndLevelLoading += RandoLevelManager.EndLevelLoading;
+            On.TotHQ.LeaveToLevel += RandoPortalManager.LeaveHQ;
             On.Cutscene.Play += Cutscene_Play;
             //temp add
             #if DEBUG
@@ -716,7 +716,7 @@ void OnSelectTeleportToHq()
             Manager<PauseManager>.Instance.Resume();
             Manager<UIManager>.Instance.GetView<OptionScreen>().Close(false);                
             Console.WriteLine("Teleporting to HQ!");
-            Courier.UI.ModOptionScreen.Close(false);
+            RandoMenu.randoScreen.Close(false);
 
             //Fade the music out because musiception is annoying
             Manager<AudioManager>.Instance.FadeMusicVolume(1f, 0f, true);
@@ -732,7 +732,7 @@ void OnSelectTeleportToNinjaVillage()
             // Properly close out of the mod options and get the game state back together
             Manager<PauseManager>.Instance.Resume();
             Manager<UIManager>.Instance.GetView<OptionScreen>().Close(false);
-            Courier.UI.ModOptionScreen.Close(false);
+            RandoMenu.randoScreen.Close(false);
             EBits dimension = Manager<DimensionManager>.Instance.currentDimension;
 
             //Fade the music out because musiception is annoying
@@ -920,17 +920,30 @@ private void SaveManager_DoActualSave(On.SaveManager.orig_DoActualSaving orig, S
             // var checkpoint = Manager<ProgressionManager>.Instance.checkpointSaveInfo;
             // var pos = checkpoint.loadedLevelPlayerPosition;
             // Console.WriteLine($"{checkpoint.loadedLevelCheckpointIndex} \n{checkpoint.playerFacingDirection}\n {pos.x} {pos.y} {pos.z}");
-            if (ArchipelagoClient.HasConnected)
+            orig(self, applySaveDelay);
+            Save?.Update();
+            if (!ArchipelagoClient.HasConnected) return;
+            try
             {
-                // The game calls the save method after the ending cutscene before rolling credits
-                if (ArchipelagoClient.Authenticated
-                    && Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.Level_Ending))
+                if (RandoPortalManager.LeftHQPortal)
                 {
-                    ArchipelagoClient.UpdateClientStatus(ArchipelagoClientState.ClientGoal);
+                    Manager<UIManager>.Instance.CloseAllScreensOfType<TransitionScreen>(false);
+                    Manager<UIManager>.Instance.CloseAllScreensOfType<SavingScreen>(false);
+                    Manager<UIManager>.Instance.CloseAllScreensOfType<LoadingAnimation>(false);
+                    RandoPortalManager.Teleport();
                 }
             }
-            Save?.Update();
-            orig(self, applySaveDelay);
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
+                
+            // The game calls the save method after the ending cutscene before rolling credits
+            if (ArchipelagoClient.Authenticated
+                && Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.Level_Ending))
+            {
+                ArchipelagoClient.UpdateClientStatus(ArchipelagoClientState.ClientGoal);
+            }
         }
 
         private void OnPlayerDie(On.PlayerController.orig_Die orig, PlayerController self, EDeathType deathType,
diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
index 41f96ca..27157df 100644
--- a/Archipelago/ArchipelagoClient.cs
+++ b/Archipelago/ArchipelagoClient.cs
@@ -135,7 +135,21 @@ public static string Connect()
                 ServerData.SeedName = Session.RoomState.Seed;
                 Authenticated = true;
 
-                RandomizerStateManager.InitializeMultiSeed();
+                try
+                {
+                    RandomizerStateManager.InitializeMultiSeed();
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e);
+                    outputText =
+                        "Something went wrong.\n" +
+                        "Please submit a bug report with the log.txt, " +
+                        "which can be found by the game executable.";
+                    Authenticated = false;
+                    Disconnect();
+                    return outputText;
+                }
                 
                 DeathLinkHandler = new DeathLinkInterface();
                 
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index f6af9cb..eaf349d 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -1,9 +1,6 @@
 using System;
 using MessengerRando.Utils;
 using System.Collections.Generic;
-using System.Linq;
-using Archipelago.MultiClient.Net.Enums;
-using MessengerRando.Archipelago;
 using MessengerRando.Utils.Constants;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -13,8 +10,8 @@ namespace MessengerRando.GameOverrideManagers
     public static class RandoLevelManager
     {
         private static bool teleporting;
-        private static ELevel lastLevel;
-        private static ELevel currentLevel;
+        public static ELevel LastLevel;
+        public static ELevel CurrentLevel;
 
         public static Dictionary<LevelConstants.RandoLevel, LevelConstants.RandoLevel> RandoLevelMapping;
 
@@ -26,9 +23,9 @@ public static void LoadLevel(On.LevelManager.orig_LoadLevel orig, LevelManager s
             Console.WriteLine($"Entrance ID: {levelInfo.levelEntranceId}, Dimension: {levelInfo.dimension}");
             #endif
             orig(self, levelInfo);
-            if (RandoLevelMapping == null || teleporting) return;
-            lastLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
-            currentLevel = Manager<LevelManager>.Instance.GetLevelEnumFromLevelName(levelInfo.levelName);
+            if (teleporting) return;
+            LastLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
+            CurrentLevel = Manager<LevelManager>.Instance.GetLevelEnumFromLevelName(levelInfo.levelName);
         }
 
         static bool WithinRange(float pos1, float pos2)
@@ -38,14 +35,18 @@ static bool WithinRange(float pos1, float pos2)
             return comparison <= 10;
         }
 
-        private static LevelConstants.RandoLevel FindEntrance()
+        public static LevelConstants.RandoLevel FindEntrance()
         {
             try
             {
+                Console.WriteLine("looking for entrance we just entered");
                 var playerPos = Manager<PlayerManager>.Instance.Player.transform.position;
+                Console.WriteLine(LastLevel);
+                Console.WriteLine(CurrentLevel);
                 if (!LevelConstants.TransitionToEntranceName.TryGetValue(
-                        new LevelConstants.Transition(lastLevel, currentLevel), out var entrance))
+                        new LevelConstants.Transition(LastLevel, CurrentLevel), out var entrance))
                     return new LevelConstants.RandoLevel(ELevel.NONE, new Vector3());
+                Console.WriteLine(entrance);
                 if (entrance.Contains("Portal"))
                     return RandoPortalManager.PortalMapping == null
                         ? new LevelConstants.RandoLevel(ELevel.NONE, new Vector3())
@@ -156,22 +157,38 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
                 SkipMusicBox();
                 return;
             }
+#if DEBUG
+            Console.WriteLine("loaded into level...");
+            Console.WriteLine(self.lastLevelLoaded);
+            Console.WriteLine(self.GetCurrentLevelEnum());
+            if (self.lastLevelLoaded.Equals(ELevel.Level_13_TowerOfTimeHQ + "_Build"))
+            {
+                // we just teleported into HQ
+                
+            }
             var oldLevel = FindEntrance();
             if (RandoLevelMapping != null && RandoLevelMapping.TryGetValue(oldLevel, out var newLevel))
                 TeleportInArea(
                     newLevel.LevelName,
                     newLevel.PlayerPos,
-                    newLevel.Dimension == EBits.NONE
-                        ? Manager<DimensionManager>.Instance.currentDimension
-                        : newLevel.Dimension);
+                    newLevel.Dimension);
+            else if (RandoPortalManager.PortalMapping != null && !oldLevel.Equals(ELevel.NONE))
+            {
+                TeleportInArea(
+                    oldLevel.LevelName,
+                    oldLevel.PlayerPos,
+                    oldLevel.Dimension
+                    );
+            }
             // put the region we just loaded into in AP data storage for tracking
-            if (!ArchipelagoClient.Authenticated) return;
+            if (!ArchipelagoClient.Authenticated || teleporting) return;
             if (self.lastLevelLoaded.Equals(ELevel.Level_13_TowerOfTimeHQ + "_Build"))
                 ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
                     ELevel.Level_13_TowerOfTimeHQ.ToString();
             else
                 ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
                     self.GetCurrentLevelEnum().ToString();
+#endif
         }
         
         public static void SkipMusicBox()
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 4dfc6f3..20bb31e 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -18,362 +18,280 @@ public Portal(int portalWarp)
                 var modWarp = portalWarp.ToString();
                 if (modWarp.Length == 4)
                 {
-                    Region = Convert.ToInt32(modWarp.Substring(0, 2));
-                    PortalType = Convert.ToInt32(modWarp[2]);
-                    Index = Convert.ToInt32(modWarp[3]);
+                    Region = int.Parse(modWarp.Substring(0, 2));
+                    PortalType = int.Parse(modWarp[2].ToString());
+                    Index = int.Parse(modWarp[3].ToString());
                 }
                 else if (modWarp.Length == 3)
                 {
-                    Region = Convert.ToInt32(modWarp[0]);
-                    PortalType = Convert.ToInt32(modWarp[1]);
-                    Index = Convert.ToInt32(modWarp[2]);
+                    Region = int.Parse(modWarp[0].ToString());
+                    PortalType = int.Parse(modWarp[1].ToString());
+                    Index = int.Parse(modWarp[2].ToString());
                 }
                 else if (modWarp.Length == 2)
                 {
                     Region = 0;
-                    PortalType = Convert.ToInt32(modWarp[0]);
-                    Index = Convert.ToInt32(modWarp[1]);
+                    PortalType = int.Parse(modWarp[0].ToString());
+                    Index = int.Parse(modWarp[1].ToString());
                 }
                 else
                 {
                     Region = 0;
                     PortalType = 0;
-                    Index = Convert.ToInt32(modWarp);
+                    Index = int.Parse(modWarp);
                 }
             }
         }
-        
+
+        public static bool LeftHQPortal;
         public static List<string> StartingPortals;
         public static Dictionary<string, Portal> PortalMapping;
 
         static readonly List<List<List<LevelConstants.RandoLevel>>> AreaCheckpoints =
             new List<List<List<LevelConstants.RandoLevel>>>
             {
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(-20076.46f, -200004)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(-45.5f, -89)),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(68, -111)),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(407, -74)),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(893, -27)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(175, -148)),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(92, -87)),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(267.94f, -67)),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(608, -35)),
-                                new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(718, -61), EBits.BITS_8),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(-20076.46f, -200004)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(-45.5f, -89)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(68, -111)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(407, -74)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(893, -27)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(175, -148)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(92, -87)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(267.94f, -67)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(608, -35)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(718, -61), EBits.BITS_8),
                     }
                 },
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(1, -11)),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(89, -10)),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(252, 53)),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(156, 85)),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(272, 61)),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(347, 31)),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(355, -11)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(125, 47)),
-                                new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(260, 24)),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>(),
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(1, -11)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(89, -10)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(252, 53)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(156, 85)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(272, 61)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(347, 31)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(355, -11)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(125, 47)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(260, 24)),
                     }
                 },
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(241, -25)),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(732, -75)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(380, -23)),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(530, -75)),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(500, -43)),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>(),
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(241, -25)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(732, -75)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(380, -23)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(530, -75), EBits.BITS_16),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(500, -43)),
                     }
                 },
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(-29, -19)),
-                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(92, 25)),
-                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(380, 25)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(227, -41)),
-                                new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(210, 29)),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>(),
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(-29, -19)),
+                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(92, 25)),
+                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(380, 25)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(227, -41)),
+                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(210, 29)),
                     }
                 },
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(241f, -196f)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(26, -27)),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(310, -115)),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(542, -123)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(138, -90)),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(439, -170)),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(241f, -196f)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(26, -27)),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(310, -115)),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(542, -123)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(138, -90)),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(439, -170)),
                     }
                 },
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(194, -37)),
-                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(663, -27)),
-                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(1085, -45)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(161, -54)),
-                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(410, -42)),
-                                new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(916, -26)),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>(),
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(194, -37)),
+                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(663, -27)),
+                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(1085, -45)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(161, -54)),
+                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(410, -42)),
+                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(916, -26)),
                     }
                 },
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(384.5f, 135f)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(61, -27)),
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(147, 69)),
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(226, 151)),
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(282, 23)),
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(380, 309)),
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(120, 248), EBits.BITS_8),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(109, 63)),
-                                new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(296, 189), EBits.BITS_8),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(384.5f, 135f)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(61, -27)),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(147, 69)),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(226, 151)),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(282, 23)),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(380, 309)),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(120, 248), EBits.BITS_8),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(109, 63)),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(296, 189), EBits.BITS_8),
                     }
                 },
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(220.6358f, -67f)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(216, -456)),
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(260, -297)),
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(156, -27)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(227, -405)),
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(251, -235)),
-                                new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(195, -131)),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(220.6358f, -67f)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(216, -456)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(260, -297)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(156, -27)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(227, -405)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(251, -235)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(195, -131)),
                     }
                 },
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(71, -11), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(84, 237), EBits.BITS_8),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(29, 21), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(5, 37), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(50, 77), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(57, 85), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(31, 133), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(58, 165), EBits.BITS_8),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>(),
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(71, -11), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(84, 237), EBits.BITS_8),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(29, 21), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(5, 37), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(50, 77), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(57, 85), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(31, 133), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(58, 165), EBits.BITS_8),
                     }
                 },
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-368, -26), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-116, -35), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(108, -24)),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(355, -27), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(721, -22), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(816, -26), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(1148, -27), EBits.BITS_8),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-146, 24), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(159, -29)),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(780, -26)),
-                                new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-251, 13)),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>(),
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-368, -26), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-116, -35), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(108, -24)),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(355, -27), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(721, -22), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(816, -26), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(1148, -27), EBits.BITS_8),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-146, 24), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(159, -29)),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(780, -26)),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-251, 13)),
                     }
                 },
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-305, -51), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-186, -24), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-125, -91), EBits.BITS_8),
-                                //new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(124, -43)), // barm'athaziel which isn't accessible in second quest
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(132, -130)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-225, -89), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(1, 72), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-110, -98), EBits.BITS_8),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>(),
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-305, -51), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-186, -24), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-125, -91), EBits.BITS_8),
+                        //new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(124, -43)), // barm'athaziel which isn't accessible in second quest
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(132, -130)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-225, -89), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(1, 72), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-110, -98), EBits.BITS_8),
                     }
                 },
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(837, 13)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(804, -40)),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(499, -132), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(337, -131)),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(149, -89)),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(-8, 13)),
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(-259, 7)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(648, -83), EBits.BITS_8),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(837, 13)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(804, -40)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(499, -132), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(337, -131)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(149, -89)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(-8, 13)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(-259, 7)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(648, -83), EBits.BITS_8),
                     }
                 },
+                new List<List<LevelConstants.RandoLevel>>
                 {
-                    new List<List<LevelConstants.RandoLevel>>
-                    {
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(29f, -55f)),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(36, -41)),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(186, -9), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(8, -65), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(-102, -121), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(100, -81), EBits.BITS_8),
-                            }
-                        },
-                        {
-                            new List<LevelConstants.RandoLevel>
-                            {
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(76, -16), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(30, -87), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(166, -178), EBits.BITS_8),
-                                new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(92, -100), EBits.BITS_8),
-                            }
-                        }
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(29f, -55f)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(36, -41)),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(186, -9), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(8, -65), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(-102, -121), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(100, -81), EBits.BITS_8),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(76, -16), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(30, -87), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(166, -178), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(92, -100), EBits.BITS_8),
                     }
                 }
             };
@@ -390,8 +308,34 @@ public Portal(int portalWarp)
         
         public static LevelConstants.RandoLevel GetPortalExit(string enteredPortal)
         {
+            Console.WriteLine($"getting portal. entered {enteredPortal}");
             var portalExit = PortalMapping[enteredPortal];
+            Console.WriteLine($"{portalExit.Region}, {portalExit.PortalType}, {portalExit.Index}");
             return AreaCheckpoints[portalExit.Region][portalExit.PortalType][portalExit.Index];
         }
+
+        public static void Teleport()
+        {
+            LeftHQPortal = false;
+            var currentLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
+            if (LevelConstants.TransitionToEntranceName.TryGetValue(
+                    new LevelConstants.Transition(ELevel.Level_13_TowerOfTimeHQ,
+                        currentLevel), out var portal))
+            {
+                var newLevel = GetPortalExit(portal);
+                RandoLevelManager.TeleportInArea(newLevel.LevelName, newLevel.PlayerPos, newLevel.Dimension);
+            }
+            else
+            {
+                Console.WriteLine($"unable to find portal for {currentLevel}");
+            }
+        }
+
+        public static void LeaveHQ(On.TotHQ.orig_LeaveToLevel orig, TotHQ self, bool playlevelmusic, bool loadingnewlevel)
+        {
+            Console.WriteLine($"leaving hq.. should be teleporting: {PortalMapping != null}");
+            LeftHQPortal = PortalMapping != null;
+            orig(self, playlevelmusic, loadingnewlevel);
+        }
     }
 }
\ No newline at end of file
diff --git a/GameOverrideManagers/RandoRoomManager.cs b/GameOverrideManagers/RandoRoomManager.cs
index 18da46b..dc94382 100644
--- a/GameOverrideManagers/RandoRoomManager.cs
+++ b/GameOverrideManagers/RandoRoomManager.cs
@@ -63,6 +63,7 @@ public static void Level_ChangeRoom(On.Level.orig_ChangeRoom orig, Level self,
                 return;
             }
 
+            var currentLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
             var bossRoomKey = oldRoomKey.Replace(" ", string.Empty);
             if (IsBossRoom(bossRoomKey, out var bossName))
             {
@@ -70,7 +71,6 @@ public static void Level_ChangeRoom(On.Level.orig_ChangeRoom orig, Level self,
             }
             else if (RoomRando)
             {
-                var currentLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
                 var newRoom = PlaceInRoom(oldRoomKey, currentLevel, out var transition);
                 if (newRoom.RoomKey.IsNullOrEmpty() || transition.Direction.IsNullOrEmpty()) return;
                 
diff --git a/Utils/Constants/LevelConstants.cs b/Utils/Constants/LevelConstants.cs
index a3bb3a6..3d5a591 100644
--- a/Utils/Constants/LevelConstants.cs
+++ b/Utils/Constants/LevelConstants.cs
@@ -31,6 +31,11 @@ public bool Equals(RandoLevel other)
                 return LevelName == other.LevelName && PlayerPos.Equals(other.PlayerPos);
             }
 
+            public bool Equals(ELevel level)
+            {
+                return LevelName == level;
+            }
+
             public override bool Equals(object obj)
             {
                 return obj is RandoLevel other && Equals(other);
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index b132461..439f6e4 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -87,7 +87,7 @@ public static void InitializeMultiSeed()
                     RandoPortalManager.StartingPortals.Add(scene);
                 }
 
-                var portalExits = ((JObject)slotData["portal_exits"]).ToObject<List<int>>();
+                var portalExits = ((JArray)slotData["portal_exits"]).ToObject<List<int>>();
                 RandoPortalManager.PortalMapping = new Dictionary<string, RandoPortalManager.Portal>();
                 for (int i = 0; i < RandoPortalManager.Portals.Count; i++)
                 {

From 4dd26bd77b0d78a609cfc4ed4419e6aa260f0387 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Thu, 25 Jan 2024 08:49:24 -0600
Subject: [PATCH 19/63] don't apply music shuffle on sound effects

---
 GameOverrideManagers/RandoMusicManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/GameOverrideManagers/RandoMusicManager.cs b/GameOverrideManagers/RandoMusicManager.cs
index cbe1c67..4a4348e 100644
--- a/GameOverrideManagers/RandoMusicManager.cs
+++ b/GameOverrideManagers/RandoMusicManager.cs
@@ -50,7 +50,8 @@ public static MusicAudioObject OnPlayMusic(
             // Debug.Log(audioObjectDefinition.GetInstanceID());
             var cantShuffleLevels = new List<ELevel> { ELevel.NONE, ELevel.Level_05_B_SunkenShrine };
             if (!audioObjectDefinition.IsMusic() || !shuffleMusic ||
-                cantShuffleLevels.Contains(Manager<LevelManager>.Instance.GetCurrentLevelEnum()))
+                cantShuffleLevels.Contains(Manager<LevelManager>.Instance.GetCurrentLevelEnum()) ||
+                audioObjectDefinition.IsSFX())
                 return orig(self, audioObjectDefinition, loop, fadeInDuration, playbackTime, customAudioObject);
             var newAudio = Manager<AudioManager>.Instance.GetRandomLevelTrack();
             var dimension = random.Next(0, 2);

From b4781834f78964a6ea47f1cb3c0584e8e689a324 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Thu, 25 Jan 2024 08:51:20 -0600
Subject: [PATCH 20/63] fix missing import

---
 GameOverrideManagers/RandoLevelManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index eaf349d..129fff6 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -1,6 +1,8 @@
 using System;
 using MessengerRando.Utils;
 using System.Collections.Generic;
+using Archipelago.MultiClient.Net.Enums;
+using MessengerRando.Archipelago;
 using MessengerRando.Utils.Constants;
 using UnityEngine;
 using UnityEngine.SceneManagement;

From de11fb27cef87993363924e593d08a5768eba248 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Fri, 26 Jan 2024 18:02:45 -0600
Subject: [PATCH 21/63] fix issues with save data

---
 APRandomizerMain.cs                        | 28 +++++++++----------
 Archipelago/ArchipelagoClient.cs           | 19 +++++++------
 Archipelago/ArchipelagoData.cs             |  2 +-
 GameOverrideManagers/RandoLevelManager.cs  |  8 +++++-
 GameOverrideManagers/RandoPortalManager.cs | 10 +++----
 Utils/RandoSave.cs                         | 31 +++++++++++-----------
 Utils/RandomizerStateManager.cs            | 13 ++++-----
 7 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index a38017a..ab19ba3 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using MessengerRando.Archipelago;
 using MessengerRando.Overrides;
 using MessengerRando.Utils;
@@ -27,7 +26,6 @@ public class APRandomizerMain : CourierModule
     {
         private float updateTimer;
         private float updateTime = 3.0f;
-        private bool clearedData;
 
         private RandomizerStateManager randoStateManager;
 
@@ -498,8 +496,7 @@ void SaveGameSelectionScreen_OnLoadGame(On.SaveGameSelectionScreen.orig_OnLoadGa
             //This is probably a bad way to do this
             try
             {
-                if (!clearedData)
-                    RandoSave.TryLoad(Save.APSaveData);
+                RandoSave.TryLoad(Save.APSaveData);
                 if (ArchipelagoData.LoadData(randoStateManager.CurrentFileSlot))
                 {
                     Manager<DialogManager>.Instance.LoadDialogs(Manager<LocalizationManager>.Instance.CurrentLanguage);
@@ -518,8 +515,13 @@ void SaveGameSelectionScreen_OnLoadGame(On.SaveGameSelectionScreen.orig_OnLoadGa
                     //We force a reload of all dialog when loading the game
                     try
                     {
-                        Manager<DialogManager>.Instance.LoadDialogs(Manager<LocalizationManager>.Instance.CurrentLanguage);   
-                    } catch (Exception e){Console.WriteLine(e);}
+                        Manager<DialogManager>.Instance.LoadDialogs(Manager<LocalizationManager>.Instance
+                            .CurrentLanguage);
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine(e);
+                    }
                 }
             }
             catch (Exception e)
@@ -541,14 +543,10 @@ void SaveGameSelectionScreen_OnLoadGame(On.SaveGameSelectionScreen.orig_OnLoadGa
 
         void SaveGameSelectionScreen_OnNewGame(On.SaveGameSelectionScreen.orig_OnNewGame orig, SaveGameSelectionScreen self, SaveSlotUI slot)
         {
-#if DEBUG
-            RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
-#elif RELEASE
             if (ArchipelagoClient.Authenticated)
                 RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
             else
                 orig(self, slot);
-#endif
         }
 
         private void SaveGameSelectionScreen_ConfirmSaveDelete(On.SaveGameSelectionScreen.orig_ConfirmSaveDelete orig, SaveGameSelectionScreen self, SaveSlotUI slot)
@@ -561,8 +559,9 @@ private void SaveGameSelectionScreen_OnDelete(On.SaveGameSelectionScreen.orig_On
         {
             if (delete)
             {
+                RandoSave.TryLoad(Save.APSaveData);
                 randoStateManager.APSave[randoStateManager.CurrentFileSlot] = new ArchipelagoData();
-                Save.APSaveData = RandoSave.GetSaveData();
+                Save?.ForceUpdate();
             }
             orig(self, delete);
         }
@@ -574,13 +573,13 @@ void PauseScreen_OnQuitToTitle(On.BackToTitleScreen.orig_GoBackToTitleScreen ori
                 ArchipelagoClient.Disconnect();
                 ArchipelagoClient.HasConnected = false;
                 RandoBossManager.DefeatedBosses = new List<string>();
+                Manager<ProgressionManager>.Instance.powerSealTotal = 0;
             }
             randoStateManager = new RandomizerStateManager();
             ArchipelagoClient.ServerData = new ArchipelagoData();
-            
-            clearedData = false;
             orig();
             Console.WriteLine("returned to title");
+            Manager<UIManager>.Instance.GetView<InGameHud>().UpdateShurikenVisibility();
         }
 
         //Fixing necro cutscene check
@@ -921,8 +920,8 @@ private void SaveManager_DoActualSave(On.SaveManager.orig_DoActualSaving orig, S
             // var pos = checkpoint.loadedLevelPlayerPosition;
             // Console.WriteLine($"{checkpoint.loadedLevelCheckpointIndex} \n{checkpoint.playerFacingDirection}\n {pos.x} {pos.y} {pos.z}");
             orig(self, applySaveDelay);
-            Save?.Update();
             if (!ArchipelagoClient.HasConnected) return;
+            Save?.Update();
             try
             {
                 if (RandoPortalManager.LeftHQPortal)
@@ -931,6 +930,7 @@ private void SaveManager_DoActualSave(On.SaveManager.orig_DoActualSaving orig, S
                     Manager<UIManager>.Instance.CloseAllScreensOfType<SavingScreen>(false);
                     Manager<UIManager>.Instance.CloseAllScreensOfType<LoadingAnimation>(false);
                     RandoPortalManager.Teleport();
+                    return;
                 }
             }
             catch (Exception e)
diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
index 27157df..86a1732 100644
--- a/Archipelago/ArchipelagoClient.cs
+++ b/Archipelago/ArchipelagoClient.cs
@@ -34,9 +34,9 @@ public static class ArchipelagoClient
         public static ArchipelagoSession Session;
         public static DeathLinkInterface DeathLinkHandler;
 
-        public static readonly Queue ItemQueue = new Queue();
-        public static readonly Queue DialogQueue = new Queue();
-        private static readonly Queue MessageQueue = new Queue();
+        public static Queue ItemQueue = new Queue();
+        public static Queue DialogQueue = new Queue();
+        private static Queue messageQueue = new Queue();
 
         public static List<string> EventsICareAbout = new List<string>
         {
@@ -222,7 +222,7 @@ private static void OnMessageReceived(LogMessage message)
                         if (hintMessage.IsFound || !hintMessage.IsRelatedToActivePlayer || !HintPopUps ||
                             RandomizerStateManager.SeenHints.Contains(hintMessage.Item)) break;
                         RandomizerStateManager.SeenHints.Add(hintMessage.Item);
-                        MessageQueue.Enqueue(hintMessage.ToString());
+                        messageQueue.Enqueue(hintMessage.ToString());
                         DialogQueue.Enqueue(ConvertHintMessage(hintMessage));
                         break;
                     case ItemSendLogMessage itemSendMessage:
@@ -233,7 +233,7 @@ private static void OnMessageReceived(LogMessage message)
                                 Console.WriteLine($"adding {itemSendMessage.Item.ToReadableString()} to dialog queue.");
                                 DialogQueue.Enqueue(itemSendMessage.Item.ToReadableString(itemSendMessage.Receiver.Alias));
                             }
-                            MessageQueue.Enqueue(itemSendMessage.ToString());
+                            messageQueue.Enqueue(itemSendMessage.ToString());
                         }
                         break;
                 }
@@ -242,7 +242,7 @@ private static void OnMessageReceived(LogMessage message)
             {
                 if (HintPopUps && message is HintItemSendLogMessage hintMessage)
                     DialogQueue.Enqueue(ConvertHintMessage(hintMessage));
-                MessageQueue.Enqueue(message.ToString());
+                messageQueue.Enqueue(message.ToString());
             }
         }
 
@@ -346,6 +346,9 @@ public static void Disconnect()
             Session = null;
             Authenticated = false;
             attemptingConnection = false;
+            DialogQueue = new Queue();
+            ItemQueue = new Queue();
+            messageQueue = new Queue();
         }
 
         public static void UpdateArchipelagoState()
@@ -456,9 +459,9 @@ public static string UpdateStatusText()
         public static string UpdateMessagesText()
         {
             var text = string.Empty;
-            if (MessageQueue.Count <= 0) return text;
+            if (messageQueue.Count <= 0) return text;
             if (DisplayAPMessages)
-                text = (string)MessageQueue.Dequeue();
+                text = (string)messageQueue.Dequeue();
             return text;
         }
     }
diff --git a/Archipelago/ArchipelagoData.cs b/Archipelago/ArchipelagoData.cs
index 328971c..93ba601 100644
--- a/Archipelago/ArchipelagoData.cs
+++ b/Archipelago/ArchipelagoData.cs
@@ -52,7 +52,7 @@ public static bool LoadData(int slot)
         private bool loadData(int slot)
         {
             if (!RandomizerStateManager.Instance.APSave.TryGetValue(slot, out var tempServerData) ||
-                string.IsNullOrEmpty(tempServerData.SlotName))
+                tempServerData.SeedName == null || tempServerData.SeedName.Equals("Unknown"))
                 return false;
             try
             {
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index 129fff6..36b1599 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -150,6 +150,13 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
             if (teleporting)
             {
                 teleporting = false;
+                // put the region we just loaded into in AP data storage for tracking
+                if (self.lastLevelLoaded.Equals(ELevel.Level_13_TowerOfTimeHQ + "_Build"))
+                    ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
+                        ELevel.Level_13_TowerOfTimeHQ.ToString();
+                else
+                    ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
+                        self.GetCurrentLevelEnum().ToString();
                 return;
             }
             
@@ -183,7 +190,6 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
                     );
             }
             // put the region we just loaded into in AP data storage for tracking
-            if (!ArchipelagoClient.Authenticated || teleporting) return;
             if (self.lastLevelLoaded.Equals(ELevel.Level_13_TowerOfTimeHQ + "_Build"))
                 ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
                     ELevel.Level_13_TowerOfTimeHQ.ToString();
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 20bb31e..0d946f2 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -219,9 +219,9 @@ public Portal(int portalWarp)
                     new List<LevelConstants.RandoLevel>
                     {
                         new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-368, -26), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-116, -35), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(108, -24)),
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(355, -27), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-140, -26), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(116, -26)),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(366, -27), EBits.BITS_8),
                         new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(721, -22), EBits.BITS_8),
                         new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(816, -26), EBits.BITS_8),
                         new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(1148, -27), EBits.BITS_8),
@@ -229,8 +229,8 @@ public Portal(int portalWarp)
                     new List<LevelConstants.RandoLevel>
                     {
                         new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-146, 24), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(159, -29)),
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(780, -26)),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(164, -21)),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(770, -26)),
                         new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-251, 13)),
                     }
                 },
diff --git a/Utils/RandoSave.cs b/Utils/RandoSave.cs
index e46803d..30dc1bc 100644
--- a/Utils/RandoSave.cs
+++ b/Utils/RandoSave.cs
@@ -17,25 +17,26 @@ public class RandoSave : CourierModSave
 
         public void Update()
         {
-            if (ArchipelagoClient.HasConnected)
-            {
-                RandomizerStateManager.Instance.APSave[RandomizerStateManager.Instance.CurrentFileSlot] =
-                    ArchipelagoClient.ServerData;
-                
-                if (ArchipelagoClient.Authenticated && RandomizerStateManager.IsSafeTeleportState())
-                    ArchipelagoClient.SyncLocations();
-                APSaveData = GetSaveData();
-            }
+            if (Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.NONE)) return;
+            RandomizerStateManager.Instance.APSave[RandomizerStateManager.Instance.CurrentFileSlot] =
+                ArchipelagoClient.ServerData;
+
+            if (ArchipelagoClient.Authenticated && RandomizerStateManager.IsSafeTeleportState())
+                ArchipelagoClient.SyncLocations();
+            APSaveData = GetSaveData();
         }
 
-        public static string GetSaveData()
+        public void ForceUpdate()
         {
-            var output = "";
-            for (int i = 1; i <= 3; i++)
-            {
-                output += $"{RandomizerStateManager.Instance.APSave[i]}|";
-            }
+            APSaveData = GetSaveData();
+        }
 
+        public static string GetSaveData()
+        {
+            var output =
+                $"{RandomizerStateManager.Instance.APSave[1]}|" +
+                $"{RandomizerStateManager.Instance.APSave[2]}|" +
+                $"{RandomizerStateManager.Instance.APSave[3]}";
             return output;
         }
         
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 439f6e4..195ac71 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -33,7 +33,7 @@ public class RandomizerStateManager
         public RandomizerStateManager()
         {
             #if DEBUG
-            SkipPhantom = true;
+            // SkipPhantom = true;
             #endif
             try
             {
@@ -178,11 +178,8 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
             var saveManager = Manager<SaveManager>.Instance;
             saveManager.SelectSaveGameSlot(slot);
             saveManager.NewGame();
-            if (ArchipelagoClient.Authenticated)
-                saveManager.GetCurrentSaveGameSlot().SlotName =
-                    ArchipelagoClient.Session.Players.GetPlayerAlias(ArchipelagoClient.Session.ConnectionInfo.Slot);
-            else
-                saveManager.GetCurrentSaveGameSlot().SlotName = "Ayy Lmao";
+            saveManager.GetCurrentSaveGameSlot().SlotName =
+                ArchipelagoClient.Session.Players.GetPlayerAlias(ArchipelagoClient.Session.ConnectionInfo.Slot);
             // add everything to the various managers that we need for our save slot, following the order in SaveGameSlot.UpdateSaveGameData()
             var progManager = Manager<ProgressionManager>.Instance;
             progManager.lastSaveTime = Time.time;
@@ -270,8 +267,8 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
                 // "ManfredBossOutroCutscene",
                 // "DemonGeneralBossIntroCutscene",
                 // "DemonGeneralBossOutroCutscene",
-                // "UnderworldManfredEscapeCutscene",
-                // "FutureMessengerCutscene",
+                "UnderworldManfredEscapeCutscene",
+                "FutureMessengerCutscene",
                 "SecondQuestStartShopCutscene",
                 "ArmoireOpeningCutscene",
                 "DialogCutscene",

From 74dc10f4a7f758257733138b73e2a317ba3f6889 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sat, 27 Jan 2024 07:33:42 -0600
Subject: [PATCH 22/63] use coordinates from trainer reborn

---
 GameOverrideManagers/RandoPortalManager.cs | 166 ++++++++++-----------
 1 file changed, 83 insertions(+), 83 deletions(-)

diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 0d946f2..6d980cd 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -59,17 +59,17 @@ public Portal(int portalWarp)
                     new List<LevelConstants.RandoLevel>
                     {
                         new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(-45.5f, -89)),
-                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(68, -111)),
-                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(407, -74)),
-                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(893, -27)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(68.5f, -111)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(407.5f, -74)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(892.5f, -27)),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
                         new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(175, -148)),
-                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(92, -87)),
-                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(267.94f, -67)),
-                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(608, -35)),
-                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(718, -61), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(91.5f, -87)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(238.5f, -74)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(607.48f, -35)),
+                        new LevelConstants.RandoLevel(ELevel.Level_02_AutumnHills, new Vector3(718.5f, -73), EBits.BITS_8),
                     }
                 },
                 new List<List<LevelConstants.RandoLevel>>
@@ -77,18 +77,18 @@ public Portal(int portalWarp)
                     new List<LevelConstants.RandoLevel>(),
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(1, -11)),
-                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(89, -10)),
-                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(252, 53)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(0.5f, -11)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(88.5f, -10)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(251.5f, 53)),
                         new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(156, 85)),
-                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(272, 61)),
-                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(347, 31)),
-                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(355, -11)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(271.5f, 61)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(347.5f, 31)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(354.5f, -11)),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(125, 47)),
-                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(260, 24)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(124.5f, 47)),
+                        new LevelConstants.RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(260.5f, 24)),
                     }
                 },
                 new List<List<LevelConstants.RandoLevel>>
@@ -96,14 +96,14 @@ public Portal(int portalWarp)
                     new List<LevelConstants.RandoLevel>(),
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(241, -25)),
-                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(732, -75)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(241.5f, -25)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(731.5f, -75)),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(380, -23)),
-                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(530, -75), EBits.BITS_16),
-                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(500, -43)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(379.5f, -23)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(5329.5f, -75), EBits.BITS_16),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_Catacombs, new Vector3(499.5f, -43)),
                     }
                 },
                 new List<List<LevelConstants.RandoLevel>>
@@ -111,14 +111,14 @@ public Portal(int portalWarp)
                     new List<LevelConstants.RandoLevel>(),
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(-29, -19)),
-                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(92, 25)),
-                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(380, 25)),
+                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(-28.5f, -19)),
+                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(92.5f, 25)),
+                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(379.5f, 25)),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(227, -41)),
-                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(210, 29)),
+                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(227.5f, -41)),
+                        new LevelConstants.RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(210.5f, 29)),
                     }
                 },
                 new List<List<LevelConstants.RandoLevel>>
@@ -129,13 +129,13 @@ public Portal(int portalWarp)
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(26, -27)),
-                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(310, -115)),
-                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(542, -123)),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(26.5f, -27)),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(310.5f, -115)),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(541.5f, -123)),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(138, -90)),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(138.5f, -90)),
                         new LevelConstants.RandoLevel(ELevel.Level_05_A_HowlingGrotto, new Vector3(439, -170)),
                     }
                 },
@@ -144,15 +144,15 @@ public Portal(int portalWarp)
                     new List<LevelConstants.RandoLevel>(),
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(194, -37)),
-                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(663, -27)),
-                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(1085, -45)),
+                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(193.5f, -37)),
+                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(663.5f, -27)),
+                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(1085.5f, -45)),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(161, -54)),
-                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(410, -42)),
-                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(916, -26)),
+                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(161.5f, -54)),
+                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(409.5f, -42)),
+                        new LevelConstants.RandoLevel(ELevel.Level_07_QuillshroomMarsh, new Vector3(916.5f, -26)),
                     }
                 },
                 new List<List<LevelConstants.RandoLevel>>
@@ -164,35 +164,35 @@ public Portal(int portalWarp)
                     new List<LevelConstants.RandoLevel>
                     {
                         new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(61, -27)),
-                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(147, 69)),
-                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(226, 151)),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(147.5f, 69)),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(226.5f, 151)),
                         new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(282, 23)),
-                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(380, 309)),
-                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(120, 248), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(380.5f, 309)),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(119.5f, 248), EBits.BITS_8),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(109, 63)),
-                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(296, 189), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(109.5f, 63)),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(296.5f, 190.5f), EBits.BITS_8),
                     }
                 },
                 new List<List<LevelConstants.RandoLevel>>
                 {
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(220.6358f, -67f)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(220.6f, 66.5f)),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(216, -456)),
-                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(260, -297)),
-                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(156, -27)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(216.5f, -456)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(259.5f, -297)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(156.5f, -27)),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(227, -405)),
-                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(251, -235)),
-                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(195, -131)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(227.5f, -405)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(251.5f, -235)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(195.5f, -131)),
                     }
                 },
                 new List<List<LevelConstants.RandoLevel>>
@@ -200,17 +200,17 @@ public Portal(int portalWarp)
                     new List<LevelConstants.RandoLevel>(),
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(71, -11), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(84, 237), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(71.5f, -11), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(84.5f, 237), EBits.BITS_8),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(29, 21), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(5, 37), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(50, 77), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(57, 85), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(31, 133), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(58, 165), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(38.5f, 21.5f), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(5.5f, 37), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(50.5f, 77), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(57.5f, 85), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(31.5f, 133), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(58.5f, 165), EBits.BITS_8),
                     }
                 },
                 new List<List<LevelConstants.RandoLevel>>
@@ -218,19 +218,19 @@ public Portal(int portalWarp)
                     new List<LevelConstants.RandoLevel>(),
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-368, -26), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-140, -26), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(116, -26)),
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(366, -27), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(721, -22), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(816, -26), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(1148, -27), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-368.5f, -26), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-140.5f, -26), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(116.5f, -25)),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(366.5f, -27), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(721.5f, -22), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(816.5f, -26), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(1148.5f, -27), EBits.BITS_8),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
                         new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-146, 24), EBits.BITS_8),
                         new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(164, -21)),
-                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(770, -26)),
+                        new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(769.5f, -26)),
                         new LevelConstants.RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-251, 13)),
                     }
                 },
@@ -240,36 +240,36 @@ public Portal(int portalWarp)
                     new List<LevelConstants.RandoLevel>
                     {
                         new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-305, -51), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-186, -24), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-125, -91), EBits.BITS_8),
-                        //new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(124, -43)), // barm'athaziel which isn't accessible in second quest
-                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(132, -130)),
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-186.5f, -24), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-125.5f, -91), EBits.BITS_8),
+                        //new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(124.5f, -43)), // barm'athaziel which isn't accessible in second quest
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(132.5f, -130)),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-225, -89), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(1, 72), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-110, -98), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-226.5f, -89), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(0.5f, 72), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-110.5f, -98), EBits.BITS_8),
                     }
                 },
                 new List<List<LevelConstants.RandoLevel>>
                 {
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(837, 13)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(837, 13.5f)),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(804, -40)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(804.5f, -40)),
                         new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(499, -132), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(337, -131)),
-                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(149, -89)),
-                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(-8, 13)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(337.5f, -131)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(149.5f, -89)),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(-8.5f, 13)),
                         new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(-259, 7)),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(648, -83), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_04_C_RiviereTurquoise, new Vector3(648.5f, -83), EBits.BITS_8),
                     }
                 },
                 new List<List<LevelConstants.RandoLevel>>
@@ -280,18 +280,18 @@ public Portal(int portalWarp)
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(36, -41)),
-                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(186, -9), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(36.5f, -41)),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(186.5f, -9), EBits.BITS_8),
                         new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(8, -65), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(-102, -121), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(-102.5f, -121), EBits.BITS_8),
                         new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(100, -81), EBits.BITS_8),
                     },
                     new List<LevelConstants.RandoLevel>
                     {
-                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(76, -16), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(30, -87), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(53.5f, -25), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(29.5f, -87), EBits.BITS_8),
                         new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(166, -178), EBits.BITS_8),
-                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(92, -100), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_05_B_SunkenShrine, new Vector3(92.5f, -100), EBits.BITS_8),
                     }
                 }
             };

From ccaf8b72d487d1f2bd3a739986c13ccb226afaa0 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sat, 27 Jan 2024 07:36:11 -0600
Subject: [PATCH 23/63] use a list for the portal mapping instead of a
 dictionary

---
 GameOverrideManagers/RandoLevelManager.cs  |  4 ----
 GameOverrideManagers/RandoPortalManager.cs | 10 +++++-----
 Utils/RandomizerStateManager.cs            |  7 +++----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index 36b1599..a86d603 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -49,10 +49,6 @@ public static LevelConstants.RandoLevel FindEntrance()
                         new LevelConstants.Transition(LastLevel, CurrentLevel), out var entrance))
                     return new LevelConstants.RandoLevel(ELevel.NONE, new Vector3());
                 Console.WriteLine(entrance);
-                if (entrance.Contains("Portal"))
-                    return RandoPortalManager.PortalMapping == null
-                        ? new LevelConstants.RandoLevel(ELevel.NONE, new Vector3())
-                        : RandoPortalManager.GetPortalExit(entrance);
                 LevelConstants.RandoLevel oldLevel = default;
                 if (LevelConstants.SpecialEntranceNames.Contains(entrance))
                 {
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 6d980cd..59f6e85 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -45,7 +45,7 @@ public Portal(int portalWarp)
 
         public static bool LeftHQPortal;
         public static List<string> StartingPortals;
-        public static Dictionary<string, Portal> PortalMapping;
+        public static List<Portal> PortalMapping;
 
         static readonly List<List<List<LevelConstants.RandoLevel>>> AreaCheckpoints =
             new List<List<List<LevelConstants.RandoLevel>>>
@@ -296,7 +296,7 @@ public Portal(int portalWarp)
                 }
             };
 
-        public static readonly List<string> Portals = new List<string>
+        private static readonly List<string> Portals = new List<string>
         {
             "Autumn Hills - Portal",
             "Riviere Turquoise - Portal",
@@ -305,11 +305,11 @@ public Portal(int portalWarp)
             "Searing Crags - Portal",
             "Glacial Peak - Portal",
         };
-        
-        public static LevelConstants.RandoLevel GetPortalExit(string enteredPortal)
+
+        private static LevelConstants.RandoLevel GetPortalExit(string enteredPortal)
         {
             Console.WriteLine($"getting portal. entered {enteredPortal}");
-            var portalExit = PortalMapping[enteredPortal];
+            var portalExit = PortalMapping[Portals.IndexOf(enteredPortal)];
             Console.WriteLine($"{portalExit.Region}, {portalExit.PortalType}, {portalExit.Index}");
             return AreaCheckpoints[portalExit.Region][portalExit.PortalType][portalExit.Index];
         }
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 195ac71..385ab57 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -88,11 +88,10 @@ public static void InitializeMultiSeed()
                 }
 
                 var portalExits = ((JArray)slotData["portal_exits"]).ToObject<List<int>>();
-                RandoPortalManager.PortalMapping = new Dictionary<string, RandoPortalManager.Portal>();
-                for (int i = 0; i < RandoPortalManager.Portals.Count; i++)
+                RandoPortalManager.PortalMapping = new List<RandoPortalManager.Portal>();
+                for (int i = 0; i < 5; i++)
                 {
-                    RandoPortalManager.PortalMapping[RandoPortalManager.Portals[i]] =
-                        new RandoPortalManager.Portal(portalExits[i]);
+                    RandoPortalManager.PortalMapping.Add(new RandoPortalManager.Portal(portalExits[i]));
                 }
             }
             else

From 9f40322c86e1283b94827f48653473275dd4e4f1 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sat, 27 Jan 2024 08:03:23 -0600
Subject: [PATCH 24/63] various cleanup

---
 APRandomizerMain.cs                           | 142 +++++++++---------
 Archipelago/ArchipelagoData.cs                |   1 +
 Archipelago/DeathLinkInterface.cs             |   2 +-
 Archipelago/ItemsAndLocationsHandler.cs       |  14 +-
 GameOverrideManagers/RandoBossManager.cs      |  39 ++---
 GameOverrideManagers/RandoLevelManager.cs     |  18 +--
 GameOverrideManagers/RandoMusicManager.cs     |   1 -
 GameOverrideManagers/RandoPortalManager.cs    |   6 +-
 GameOverrideManagers/RandoPowerSealManager.cs |   2 -
 GameOverrideManagers/RandoRoomManager.cs      |  12 +-
 GameOverrideManagers/RandoTimeShardManager.cs |   1 -
 MessengerRando.csproj                         |   2 +-
 Overrides/RandoCatacombLevelInitializer.cs    |   2 +-
 RO/RandoItemRO.cs                             |  10 +-
 Utils/{RandoMenu.cs => ArchipelagoMenu.cs}    |  54 +++----
 Utils/DialogChanger.cs                        |  58 +++----
 Utils/HintMenu.cs                             |   9 +-
 Utils/RandoSave.cs                            |   2 +-
 Utils/RandomizerStateManager.cs               |  55 +++----
 19 files changed, 213 insertions(+), 217 deletions(-)
 rename Utils/{RandoMenu.cs => ArchipelagoMenu.cs} (90%)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index ab19ba3..73c05a3 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -1,27 +1,30 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Archipelago.MultiClient.Net.Enums;
+using Archipelago.MultiClient.Net.Packets;
 using MessengerRando.Archipelago;
+using MessengerRando.GameOverrideManagers;
 using MessengerRando.Overrides;
-using MessengerRando.Utils;
 using MessengerRando.RO;
+using MessengerRando.Utils;
 using Mod.Courier;
 using Mod.Courier.Module;
 using MonoMod.Cil;
+using TMPro;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-using static Mod.Courier.UI.TextEntryButtonInfo;
-using TMPro;
-using System.Linq;
-using Archipelago.MultiClient.Net.Enums;
-using Archipelago.MultiClient.Net.Packets;
-using MessengerRando.GameOverrideManagers;
 using WebSocketSharp;
+using static Mod.Courier.UI.TextEntryButtonInfo;
+using Object = UnityEngine.Object;
 
 namespace MessengerRando 
 {
     /// <summary>
     /// Where it all begins! This class defines and injects all the necessary for the mod.
     /// </summary>
+    // ReSharper disable once ClassNeverInstantiated.Global
     public class APRandomizerMain : CourierModule
     {
         private float updateTimer;
@@ -36,6 +39,7 @@ public class APRandomizerMain : CourierModule
 
         //Set up save data
         public override Type ModuleSaveType => typeof(RandoSave);
+        // ReSharper disable once MemberCanBePrivate.Global
         public RandoSave Save => (RandoSave)ModuleSave;
 
         public override void Load()
@@ -49,18 +53,18 @@ public override void Load()
             
             void BuildRandoMenu()
             {
-                RandoMenu.ArchipelagoMenuButton =
-                    Courier.UI.RegisterSubMenuOptionButton(() => "Randomizer", RandoMenu.DisplayRandoMenu);
+                ArchipelagoMenu.ArchipelagoMenuButton =
+                    Courier.UI.RegisterSubMenuOptionButton(() => "Randomizer", ArchipelagoMenu.DisplayRandoMenu);
 
                 // These should always be visible
-                RandoMenu.versionButton =
-                    RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.versionButton =
+                    ArchipelagoMenu.RegisterSubRandoButton(
                         () => "Messenger AP Randomizer: v" + ItemRandomizerUtil.GetModVersion(), null);
-                RandoMenu.versionButton.IsEnabled = () => true;
+                ArchipelagoMenu.versionButton.IsEnabled = () => true;
                 
                 // these should only be visible from the main menu
                 //Add Archipelago host button
-                RandoMenu.ArchipelagoHostButton = RandoMenu.RegisterTextRandoButton(
+                ArchipelagoMenu.ArchipelagoHostButton = ArchipelagoMenu.RegisterTextRandoButton(
                     () => "Enter Archipelago Host Name",
                     OnSelectArchipelagoHost,
                     30,
@@ -68,159 +72,159 @@ void BuildRandoMenu()
                     () => ArchipelagoClient.ServerData?.Uri,
                     CharsetFlags.Dash | CharsetFlags.Dot | CharsetFlags.Letter
                     | CharsetFlags.Number | CharsetFlags.Space);
-                RandoMenu.ArchipelagoHostButton.IsEnabled = () =>
+                ArchipelagoMenu.ArchipelagoHostButton.IsEnabled = () =>
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
                     !ArchipelagoClient.Authenticated;
                 
                 //Add Archipelago port button
-                RandoMenu.ArchipelagoPortButton = RandoMenu.RegisterTextRandoButton(
+                ArchipelagoMenu.ArchipelagoPortButton = ArchipelagoMenu.RegisterTextRandoButton(
                     () => "Enter Archipelago Port",
                     OnSelectArchipelagoPort,
                     5,
                     () => "Enter the port for the Archipelago session",
                     () => ArchipelagoClient.ServerData?.Port.ToString(),
                     CharsetFlags.Number);
-                RandoMenu.ArchipelagoPortButton.IsEnabled =
+                ArchipelagoMenu.ArchipelagoPortButton.IsEnabled =
                     () => !ArchipelagoClient.Authenticated &&
                           (Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE ||
                            (Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
                             ArchipelagoClient.HasConnected));
                 
                 //Add archipelago name button
-                RandoMenu.ArchipelagoNameButton = RandoMenu.RegisterTextRandoButton(
+                ArchipelagoMenu.ArchipelagoNameButton = ArchipelagoMenu.RegisterTextRandoButton(
                     () => "Enter Archipelago Slot Name", OnSelectArchipelagoName,
                     16,
                     () => "Enter player name:",
                     () => ArchipelagoClient.ServerData?.SlotName,
                     CharsetFlags.Dash | CharsetFlags.Dot | CharsetFlags.Letter
                     | CharsetFlags.Number | CharsetFlags.Space);
-                RandoMenu.ArchipelagoNameButton.IsEnabled = () =>
+                ArchipelagoMenu.ArchipelagoNameButton.IsEnabled = () =>
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
                     !ArchipelagoClient.Authenticated;
                 
                 //Add archipelago password button
-                RandoMenu.ArchipelagoPassButton = RandoMenu.RegisterTextRandoButton(
+                ArchipelagoMenu.ArchipelagoPassButton = ArchipelagoMenu.RegisterTextRandoButton(
                     () => "Enter Archipelago Password", OnSelectArchipelagoPass,
                     30,
                     () => "Enter session password:",
                     () => ArchipelagoClient.ServerData?.Password);
-                RandoMenu.ArchipelagoPassButton.IsEnabled = () =>
+                ArchipelagoMenu.ArchipelagoPassButton.IsEnabled = () =>
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
                     !ArchipelagoClient.Authenticated;
                 
                 //Add Archipelago connection button
-                RandoMenu.ArchipelagoConnectButton = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.ArchipelagoConnectButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => "Connect to Archipelago",
                     OnSelectArchipelagoConnect);
-                RandoMenu.ArchipelagoConnectButton.IsEnabled = () =>
+                ArchipelagoMenu.ArchipelagoConnectButton.IsEnabled = () =>
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
                     !ArchipelagoClient.Authenticated;
 
                 // only visible while actually in the game
                 //Add current seed number button
-                RandoMenu.seedNumButton = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.seedNumButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => "Current seed number: " + GetCurrentSeedNum(),
                     null);
-                RandoMenu.seedNumButton.IsEnabled = () =>
+                ArchipelagoMenu.seedNumButton.IsEnabled = () =>
                     ArchipelagoClient.HasConnected && randoStateManager.CurrentFileSlot != 0;
 
                 //Add windmill shuriken toggle button
-                RandoMenu.windmillShurikenToggleButton = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.windmillShurikenToggleButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => Manager<ProgressionManager>.Instance.useWindmillShuriken
                         ? "Active Regular Shurikens"
                         : "Active Windmill Shurikens",
                     OnToggleWindmillShuriken);
-                RandoMenu.windmillShurikenToggleButton.IsEnabled =
+                ArchipelagoMenu.windmillShurikenToggleButton.IsEnabled =
                     () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
                           ArchipelagoClient.ServerData?.ReceivedItems != null &&
                           ArchipelagoClient.ServerData.ReceivedItems.ContainsKey(
                               ItemsAndLocationsHandler.ItemFromEItem(EItems.WINDMILL_SHURIKEN));
 
                 //Add teleport to HQ button
-                RandoMenu.teleportToHqButton = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.teleportToHqButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => "Teleport to HQ",
                     OnSelectTeleportToHq);
-                RandoMenu.teleportToHqButton.IsEnabled = () =>
+                ArchipelagoMenu.teleportToHqButton.IsEnabled = () =>
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
                     RandomizerStateManager.IsSafeTeleportState();
 
                 //Add teleport to Ninja Village button
-                RandoMenu.teleportToNinjaVillage = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.teleportToNinjaVillage = ArchipelagoMenu.RegisterSubRandoButton(
                     () => "Teleport to Ninja Village",
                     OnSelectTeleportToNinjaVillage);
-                RandoMenu.teleportToNinjaVillage.IsEnabled = () =>
+                ArchipelagoMenu.teleportToNinjaVillage.IsEnabled = () =>
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
                     Manager<ProgressionManager>.Instance.HasCutscenePlayed("ElderAwardSeedCutscene") &&
                     RandomizerStateManager.IsSafeTeleportState();
 
                 //Add Archipelago status button
-                RandoMenu.archipelagoStatusButton = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.archipelagoStatusButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => ArchipelagoClient.DisplayStatus
                         ? "Hide status information"
                         : "Display status information",
                     OnToggleAPStatus);
-                RandoMenu.archipelagoStatusButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+                ArchipelagoMenu.archipelagoStatusButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago message button
-                RandoMenu.archipelagoToggleMessagesButton = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.archipelagoToggleMessagesButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => ArchipelagoClient.DisplayAPMessages
                         ? "Hide server messages"
                         : "Display server messages",
                     OnToggleAPMessages);
-                RandoMenu.archipelagoToggleMessagesButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+                ArchipelagoMenu.archipelagoToggleMessagesButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago filter messages button
-                RandoMenu.archipelagoToggleFilterMessagesButton = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.archipelagoToggleFilterMessagesButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => ArchipelagoClient.FilterAPMessages
                         ? "Show all server messages"
                         : "Filter messages to only relevant to me",
                     () => ArchipelagoClient.FilterAPMessages = !ArchipelagoClient.FilterAPMessages);
-                RandoMenu.archipelagoToggleFilterMessagesButton.IsEnabled = () =>
+                ArchipelagoMenu.archipelagoToggleFilterMessagesButton.IsEnabled = () =>
                     ArchipelagoClient.Authenticated && ArchipelagoClient.DisplayAPMessages;
 
                 //Add Archipelago hint popup button
-                RandoMenu.archipelagoToggleHintPopupButton = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.archipelagoToggleHintPopupButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => ArchipelagoClient.HintPopUps ? "Disable hint popups" : "Enable hint popups",
                     () => ArchipelagoClient.HintPopUps = !ArchipelagoClient.HintPopUps);
-                RandoMenu.archipelagoToggleHintPopupButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+                ArchipelagoMenu.archipelagoToggleHintPopupButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago message display timer button
-                RandoMenu.archipelagoMessageTimerButton = RandoMenu.RegisterTextRandoButton(
+                ArchipelagoMenu.archipelagoMessageTimerButton = ArchipelagoMenu.RegisterTextRandoButton(
                     () => "AP Message Display Time",
                     OnSelectMessageTimer,
                     1,
                     () => "Enter amount of time to display Archipelago messages, in seconds",
-                    () => updateTime.ToString(), CharsetFlags.Number);
-                RandoMenu.archipelagoMessageTimerButton.IsEnabled =
+                    () => updateTime.ToString(CultureInfo.InvariantCulture), CharsetFlags.Number);
+                ArchipelagoMenu.archipelagoMessageTimerButton.IsEnabled =
                     () => ArchipelagoClient.Authenticated && ArchipelagoClient.DisplayStatus;
 
-                RandoMenu.shuffleMusicButton = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.shuffleMusicButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => RandoMusicManager.ShuffleMusic
                         ? "Disable Music Shuffle"
                         : "Enable Music Shuffle",
                     () => RandoMusicManager.ShuffleMusic = !RandoMusicManager.ShuffleMusic);
-                RandoMenu.shuffleMusicButton.IsEnabled =
+                ArchipelagoMenu.shuffleMusicButton.IsEnabled =
                     () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE;
                 
                 //Add Archipelago death link button
-                RandoMenu.archipelagoDeathLinkButton = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.archipelagoDeathLinkButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => ArchipelagoData.DeathLink
                         ? "Disable Death Link"
                         : "Enable Death Link",
                     OnToggleDeathLink);
-                RandoMenu.archipelagoDeathLinkButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+                ArchipelagoMenu.archipelagoDeathLinkButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago release button
-                RandoMenu.archipelagoReleaseButton = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.archipelagoReleaseButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => "Release remaining items",
                     OnSelectArchipelagoRelease);
-                RandoMenu.archipelagoReleaseButton.IsEnabled = ArchipelagoClient.CanRelease;
+                ArchipelagoMenu.archipelagoReleaseButton.IsEnabled = ArchipelagoClient.CanRelease;
 
                 //Add Archipelago collect button
-                RandoMenu.archipelagoCollectButton = RandoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.archipelagoCollectButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => "Collect remaining items",
                     OnSelectArchipelagoCollect);
-                RandoMenu.archipelagoCollectButton.IsEnabled = ArchipelagoClient.CanCollect;
+                ArchipelagoMenu.archipelagoCollectButton.IsEnabled = ArchipelagoClient.CanCollect;
             }
             
             BuildHintMenu();
@@ -232,7 +236,7 @@ void BuildHintMenu()
                 // HintMenu.ArchipelagoHintMenuButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago hint button
-                HintMenu.archipelagoHintButton = RandoMenu.RegisterTextRandoButton(
+                HintMenu.archipelagoHintButton = ArchipelagoMenu.RegisterTextRandoButton(
                     () => "Hint for an item",
                     OnSelectArchipelagoHint,
                     30,
@@ -298,7 +302,6 @@ void BuildHintMenu()
             On.Cutscene.Play += Cutscene_Play;
             //temp add
             #if DEBUG
-            On.InventoryManager.GetItemQuantity += InventoryManager_GetItemQuantity;
             On.PhantomIntroCutscene.OnEnterRoom += PhantomIntro_OnEnterRoom; //this lets us skip the phantom fight
             On.UIManager.ShowView += UIManager_ShowView;
             On.MusicBox.SetNotesState += MusicBox_SetNotesState;
@@ -455,17 +458,6 @@ bool HasItem_IsTrue(On.HasItem.orig_IsTrue orig, HasItem self)
             
         }
         
-        int InventoryManager_GetItemQuantity(On.InventoryManager.orig_GetItemQuantity orig, InventoryManager self, EItems item)
-        {
-            //Just doing some logging here
-            if (EItems.NONE.Equals(item))
-            {
-                Console.WriteLine($"INVENTORYMANAGER_GETITEMQUANTITY CALLED! Let's learn some stuff. Item: '{item}' | Quantity of said item: '{orig(self, item)}'");
-            }
-            //Manager<LevelManager>.Instance.onLevelLoaded
-            return orig(self, item);
-        }
-
         bool AwardNoteCutscene_ShouldPlay(On.AwardNoteCutscene.orig_ShouldPlay orig, AwardNoteCutscene self)
         {
             //Need to handle note cutscene triggers so they will play as long as I dont have the actual item it grants
@@ -604,11 +596,11 @@ ItemsAndLocationsHandler.LocationsLookup[new LocationRO("Necro")]))
         }
 
         // Breaking into Necro cutscene to fix things
-        void NecrophobicWorkerCutscene_Play(On.NecrophobicWorkerCutscene.orig_Play orig, NecrophobicWorkerCutscene self)
+        private static void NecrophobicWorkerCutscene_Play(On.NecrophobicWorkerCutscene.orig_Play orig, NecrophobicWorkerCutscene self)
         {
             //Cutscene moves Ninja around, lets see if i can stop it by making that "location" the current location the player is.
             if (ArchipelagoClient.HasConnected)
-                self.playerStartPosition = UnityEngine.Object.FindObjectOfType<PlayerController>().transform;
+                self.playerStartPosition = Object.FindObjectOfType<PlayerController>().transform;
             orig(self);
         }
 
@@ -657,7 +649,7 @@ void PhantomIntro_OnEnterRoom(On.PhantomIntroCutscene.orig_OnEnterRoom orig, Pha
             if (randoStateManager.SkipPhantom)
             {
                 Manager<AudioManager>.Instance.StopMusic();
-                UnityEngine.Object.FindObjectOfType<PhantomOutroCutscene>().Play();
+                Object.FindObjectOfType<PhantomOutroCutscene>().Play();
             }
             else
             {
@@ -715,13 +707,13 @@ void OnSelectTeleportToHq()
             Manager<PauseManager>.Instance.Resume();
             Manager<UIManager>.Instance.GetView<OptionScreen>().Close(false);                
             Console.WriteLine("Teleporting to HQ!");
-            RandoMenu.randoScreen.Close(false);
+            ArchipelagoMenu.archipelagoScreen.Close(false);
 
-            //Fade the music out because musiception is annoying
+            //Fade the music out because musicception is annoying
             Manager<AudioManager>.Instance.FadeMusicVolume(1f, 0f, true);
 
             //Load the HQ
-            Manager<TowerOfTimeHQManager>.Instance.TeleportInToTHQ(true, ELevelEntranceID.ENTRANCE_A, null, null, true);
+            Manager<TowerOfTimeHQManager>.Instance.TeleportInToTHQ(true, ELevelEntranceID.ENTRANCE_A, null);
         }
 
         void OnSelectTeleportToNinjaVillage()
@@ -731,10 +723,10 @@ void OnSelectTeleportToNinjaVillage()
             // Properly close out of the mod options and get the game state back together
             Manager<PauseManager>.Instance.Resume();
             Manager<UIManager>.Instance.GetView<OptionScreen>().Close(false);
-            RandoMenu.randoScreen.Close(false);
+            ArchipelagoMenu.archipelagoScreen.Close(false);
             EBits dimension = Manager<DimensionManager>.Instance.currentDimension;
 
-            //Fade the music out because musiception is annoying
+            //Fade the music out because musicception is annoying
             Manager<AudioManager>.Instance.FadeMusicVolume(1f, 0f, true);
 
             //Load to Ninja Village
@@ -792,7 +784,7 @@ void OnSelectArchipelagoConnect()
                 return;
             }
             
-            ArchipelagoClient.ConnectAsync(RandoMenu.ArchipelagoConnectButton);
+            ArchipelagoClient.ConnectAsync(ArchipelagoMenu.ArchipelagoConnectButton);
         }
 
         void OnSelectArchipelagoRelease()
@@ -889,8 +881,8 @@ private void InGameHud_OnGUI(On.InGameHud.orig_OnGUI orig, InGameHud self)
             orig(self);
             if (apTextDisplay8 == null)
             {
-                apTextDisplay8 = UnityEngine.Object.Instantiate(self.hud_8.coinCount, self.hud_8.gameObject.transform);
-                apTextDisplay16 = UnityEngine.Object.Instantiate(self.hud_16.coinCount, self.hud_16.gameObject.transform);
+                apTextDisplay8 = Object.Instantiate(self.hud_8.coinCount, self.hud_8.gameObject.transform);
+                apTextDisplay16 = Object.Instantiate(self.hud_16.coinCount, self.hud_16.gameObject.transform);
                 apTextDisplay8.transform.Translate(0f, -110f, 0f);
                 apTextDisplay16.transform.Translate(0f, -110f, 0f);
                 apTextDisplay16.fontSize = apTextDisplay8.fontSize = UserConfig.StatusTextSize;
@@ -898,8 +890,8 @@ private void InGameHud_OnGUI(On.InGameHud.orig_OnGUI orig, InGameHud self)
                 apTextDisplay16.enableWordWrapping = apTextDisplay8.enableWordWrapping = true;
                 apTextDisplay16.color = apTextDisplay8.color = Color.white;
 
-                apMessagesDisplay8 = UnityEngine.Object.Instantiate(self.hud_8.coinCount, self.hud_8.gameObject.transform);
-                apMessagesDisplay16 = UnityEngine.Object.Instantiate(self.hud_16.coinCount, self.hud_16.gameObject.transform);
+                apMessagesDisplay8 = Object.Instantiate(self.hud_8.coinCount, self.hud_8.gameObject.transform);
+                apMessagesDisplay16 = Object.Instantiate(self.hud_16.coinCount, self.hud_16.gameObject.transform);
                 apMessagesDisplay8.transform.Translate(0f, -200f, 0f);
                 apMessagesDisplay16.transform.Translate(0f, -200f, 0f);
                 apMessagesDisplay16.fontSize = apMessagesDisplay8.fontSize = UserConfig.MessageTextSize;
diff --git a/Archipelago/ArchipelagoData.cs b/Archipelago/ArchipelagoData.cs
index 93ba601..60c4904 100644
--- a/Archipelago/ArchipelagoData.cs
+++ b/Archipelago/ArchipelagoData.cs
@@ -49,6 +49,7 @@ public static bool LoadData(int slot)
             return ArchipelagoClient.ServerData.loadData(slot);
         }
 
+        // ReSharper disable once InconsistentNaming
         private bool loadData(int slot)
         {
             if (!RandomizerStateManager.Instance.APSave.TryGetValue(slot, out var tempServerData) ||
diff --git a/Archipelago/DeathLinkInterface.cs b/Archipelago/DeathLinkInterface.cs
index 9d0befe..4ef1d4a 100644
--- a/Archipelago/DeathLinkInterface.cs
+++ b/Archipelago/DeathLinkInterface.cs
@@ -62,7 +62,7 @@ public void KillPlayer()
                 receivedDeathDialog.name = cause;
                 receivedDeathDialog.choices = new List<DialogSequenceChoice>();
                 AwardItemPopupParams receivedDeathParams = new AwardItemPopupParams(receivedDeathDialog, false);
-                Manager<UIManager>.Instance.ShowView<AwardItemPopup>(EScreenLayers.PROMPT, receivedDeathParams, true);
+                Manager<UIManager>.Instance.ShowView<AwardItemPopup>(EScreenLayers.PROMPT, receivedDeathParams);
                 Player.Kill(EDeathType.GENERIC, null);
                 deathLinks.RemoveAt(0);
                 receivedDeath = false;
diff --git a/Archipelago/ItemsAndLocationsHandler.cs b/Archipelago/ItemsAndLocationsHandler.cs
index fb324fe..d29407a 100644
--- a/Archipelago/ItemsAndLocationsHandler.cs
+++ b/Archipelago/ItemsAndLocationsHandler.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using MessengerRando.RO;
 using MessengerRando.GameOverrideManagers;
+using MessengerRando.RO;
 using MessengerRando.Utils;
 
 namespace MessengerRando.Archipelago
@@ -12,7 +12,7 @@ public static class ItemsAndLocationsHandler
     {
         public static Dictionary<long, RandoItemRO> ItemsLookup;
         public static Dictionary<LocationRO, long> LocationsLookup;
-        private static Dictionary<EItems, long> EitemsLocationsLookup;
+        private static Dictionary<EItems, long> EItemsLocationsLookup;
         private static Dictionary<long, LocationRO> IDtoLocationsLookup;
 
         public static RandomizerStateManager RandoStateManager;
@@ -51,7 +51,7 @@ public static void Initialize()
             offset = BaseOffset;
             Console.WriteLine("Building LocationsLookup...");
             LocationsLookup = new Dictionary<LocationRO, long>();
-            EitemsLocationsLookup = new Dictionary<EItems, long>();
+            EItemsLocationsLookup = new Dictionary<EItems, long>();
             IDtoLocationsLookup = new Dictionary<long, LocationRO>();
             
             var megaShards = RandoTimeShardManager.MegaShardLookup.Select(item => item.Loc).ToList();
@@ -68,8 +68,8 @@ public static void Initialize()
                 IDtoLocationsLookup.Add(offset, progLocation);
                 // Console.WriteLine($"{progLocation.PrettyLocationName}: {offset}");
                 if (progLocation.VanillaItem != EItems.NONE &&
-                    !EitemsLocationsLookup.ContainsKey(progLocation.VanillaItem))
-                    EitemsLocationsLookup.Add(progLocation.VanillaItem, offset);
+                    !EItemsLocationsLookup.ContainsKey(progLocation.VanillaItem))
+                    EItemsLocationsLookup.Add(progLocation.VanillaItem, offset);
                 ++offset;
             }
         }
@@ -289,7 +289,7 @@ public static long ItemFromEItem(EItems item)
 
         public static long LocationFromEItem(EItems location)
         {
-            return !EitemsLocationsLookup.ContainsKey(location) ? 0 : EitemsLocationsLookup[location];
+            return !EItemsLocationsLookup.ContainsKey(location) ? 0 : EItemsLocationsLookup[location];
         }
 
         public static bool ShopLocation(long locationID, out LocationRO shopLocation)
@@ -376,7 +376,9 @@ public static void Unlock(long itemToUnlock, int quantity = APQuantity)
                     }
                     catch
                     {
+                        // ignored
                     }
+
                     break;
                 default:
                     Console.WriteLine($"Checking if {randoItem.Item} is a shop item: {ShopItem(randoItem.Item)}");
diff --git a/GameOverrideManagers/RandoBossManager.cs b/GameOverrideManagers/RandoBossManager.cs
index 82464b8..84b1367 100644
--- a/GameOverrideManagers/RandoBossManager.cs
+++ b/GameOverrideManagers/RandoBossManager.cs
@@ -6,15 +6,16 @@
 using MessengerRando.Utils;
 using UnityEngine;
 using Object = UnityEngine.Object;
+// ReSharper disable StringLiteralTypo
 
 namespace MessengerRando.GameOverrideManagers
 {
-    public class RandoBossManager
+    public abstract class RandoBossManager
     {
         public static List<string> DefeatedBosses = new List<string>();
 
-        private Dictionary<string, string> origToNewBoss;
-        private static bool BossOverride;
+        private readonly Dictionary<string, string> origToNewBoss;
+        private static bool bossOverride;
 
         private struct BossLocation
         {
@@ -30,7 +31,7 @@ public BossLocation(ELevel area, Vector2 pos, EBits dim)
             }
         }
 
-        private static readonly List<string> vanillaBossNames = new List<string>
+        private static readonly List<string> VanillaBossNames = new List<string>
         {
             "LeafGolem",
             "Necromancer",
@@ -54,7 +55,7 @@ public BossLocation(ELevel area, Vector2 pos, EBits dim)
             { 11391078, "QueenOfQuills" },
         };
 
-        public static readonly Dictionary<string, string> bossCutscenes = new Dictionary<string, string>
+        public static readonly Dictionary<string, string> BossCutscenes = new Dictionary<string, string>
         {
             { "LeafGolem", "LeafGolemIntroCutscene" },
             { "Necromancer", "NecromancerIntroCutscene" },
@@ -69,7 +70,7 @@ public BossLocation(ELevel area, Vector2 pos, EBits dim)
             { "Phantom", "PhantomIntroCutscene" }
         };
 
-        private static readonly Dictionary<string, string> roomToVanillBoss = new Dictionary<string, string>
+        private static readonly Dictionary<string, string> RoomToVanillaBoss = new Dictionary<string, string>
         {
             { "908940-28-12", "LeafGolem" },
             { "748780-76-60", "Necromancer" },
@@ -83,7 +84,7 @@ public BossLocation(ELevel area, Vector2 pos, EBits dim)
             { "-308-276420", "ButterflyMatriarch" }
         };
 
-        private static readonly Dictionary<string, BossLocation> bossLocations = new Dictionary<string, BossLocation> 
+        private static readonly Dictionary<string, BossLocation> BossLocations = new Dictionary<string, BossLocation> 
         {
             { "LeafGolem", new BossLocation(ELevel.Level_02_AutumnHills, new Vector2(908, -27), EBits.BITS_8) },
             { "Necromancer", new BossLocation(ELevel.Level_04_Catacombs, new Vector2(752, -75), EBits.BITS_8) },
@@ -113,12 +114,12 @@ public BossLocation(ELevel area, Vector2 pos, EBits dim)
 
         private static string GetVanillaBoss(string roomKey)
         {
-            return roomToVanillBoss[roomKey];
+            return RoomToVanillaBoss[roomKey];
         }
 
         private static void AdjustPlayerInBossRoom(string bossName)
         {
-            var newLocation = bossLocations[bossName];
+            var newLocation = BossLocations[bossName];
             if (Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(newLocation.BossRegion))
             {
                 Manager<PlayerManager>.Instance.Player.transform.position = newLocation.PlayerPosition;
@@ -126,7 +127,7 @@ private static void AdjustPlayerInBossRoom(string bossName)
             }
             else
             {
-                BossOverride = true;
+                bossOverride = true;
                 RandoLevelManager.TeleportInArea(newLocation.BossRegion, newLocation.PlayerPosition,
                     newLocation.PlayerDimension);
             }
@@ -134,13 +135,13 @@ private static void AdjustPlayerInBossRoom(string bossName)
         
         public static bool HasBossDefeated(string bossName)
         {
-            if (BossOverride)
+            if (bossOverride)
                 bossName = RandomizerStateManager.Instance.BossManager.origToNewBoss
                     .First(name => name.Value.Equals(bossName)).Key;
             Console.WriteLine($"Checking if {bossName} is defeated.");
             try
             {
-                return !vanillaBossNames.Contains(bossName) || DefeatedBosses.Contains(bossName);
+                return !VanillaBossNames.Contains(bossName) || DefeatedBosses.Contains(bossName);
             }
             catch (Exception e)
             {
@@ -153,15 +154,15 @@ public static void SetBossAsDefeated(string bossName)
         {
             if (DefeatedBosses.Contains(bossName))
                 return;
-            if (BossOverride)
+            if (bossOverride)
             {
                 bossName = RandomizerStateManager.Instance.BossManager.origToNewBoss[bossName];
-                BossOverride = false;
+                bossOverride = false;
             }
             if (ArchipelagoClient.HasConnected)
             {
                 ArchipelagoClient.ServerData.DefeatedBosses.Add(bossName);
-                if (bossLocations.ContainsKey(bossName))
+                if (BossLocations.ContainsKey(bossName))
                 {
                     var bossLoc = new LocationRO(bossName);
                     ItemsAndLocationsHandler.SendLocationCheck(bossLoc);
@@ -170,7 +171,7 @@ public static void SetBossAsDefeated(string bossName)
             DefeatedBosses.Add(bossName);
             if (RandomizerStateManager.Instance.BossManager != null)
             {
-                var newPosition = bossLocations[bossName];
+                var newPosition = BossLocations[bossName];
                 
                 RandoLevelManager.TeleportInArea(newPosition.BossRegion, newPosition.PlayerPosition,
                     newPosition.PlayerDimension);
@@ -179,10 +180,10 @@ public static void SetBossAsDefeated(string bossName)
 
         public static bool ShouldFightBoss(string bossName)
         {
-            if (BossOverride) return false;
+            if (bossOverride) return false;
             var currentLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
             Console.WriteLine($"Entered {bossName}'s room. Has Defeated: {HasBossDefeated(bossName)}");
-            if (HasBossDefeated(bossName) || !currentLevel.Equals(bossLocations[bossName].BossRegion)) return false;
+            if (HasBossDefeated(bossName) || !currentLevel.Equals(BossLocations[bossName].BossRegion)) return false;
             
             var teleporting = RandomizerStateManager.Instance.BossManager != null;
             Console.WriteLine($"Should teleport: {teleporting}");
@@ -240,7 +241,7 @@ public static void TryCollectLocation(long locationID)
             }
         }
 
-        public RandoBossManager(Dictionary<string, string> bossMapping)
+        protected RandoBossManager(Dictionary<string, string> bossMapping)
         {
             Manager<ProgressionManager>.Instance.bossesDefeated =
                 Manager<ProgressionManager>.Instance.allTimeBossesDefeated = new List<string>();
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index a86d603..d24ff6b 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -12,9 +12,10 @@ namespace MessengerRando.GameOverrideManagers
     public static class RandoLevelManager
     {
         private static bool teleporting;
-        public static ELevel LastLevel;
-        public static ELevel CurrentLevel;
+        private static ELevel lastLevel;
+        private static ELevel currentLevel;
 
+        // ReSharper disable once UnassignedField.Global
         public static Dictionary<LevelConstants.RandoLevel, LevelConstants.RandoLevel> RandoLevelMapping;
 
         public static void LoadLevel(On.LevelManager.orig_LoadLevel orig, LevelManager self, LevelLoadingInfo levelInfo)
@@ -26,8 +27,8 @@ public static void LoadLevel(On.LevelManager.orig_LoadLevel orig, LevelManager s
             #endif
             orig(self, levelInfo);
             if (teleporting) return;
-            LastLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
-            CurrentLevel = Manager<LevelManager>.Instance.GetLevelEnumFromLevelName(levelInfo.levelName);
+            lastLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
+            currentLevel = Manager<LevelManager>.Instance.GetLevelEnumFromLevelName(levelInfo.levelName);
         }
 
         static bool WithinRange(float pos1, float pos2)
@@ -37,22 +38,21 @@ static bool WithinRange(float pos1, float pos2)
             return comparison <= 10;
         }
 
-        public static LevelConstants.RandoLevel FindEntrance()
+        private static LevelConstants.RandoLevel FindEntrance()
         {
             try
             {
                 Console.WriteLine("looking for entrance we just entered");
                 var playerPos = Manager<PlayerManager>.Instance.Player.transform.position;
-                Console.WriteLine(LastLevel);
-                Console.WriteLine(CurrentLevel);
+                Console.WriteLine(lastLevel);
+                Console.WriteLine(currentLevel);
                 if (!LevelConstants.TransitionToEntranceName.TryGetValue(
-                        new LevelConstants.Transition(LastLevel, CurrentLevel), out var entrance))
+                        new LevelConstants.Transition(lastLevel, currentLevel), out var entrance))
                     return new LevelConstants.RandoLevel(ELevel.NONE, new Vector3());
                 Console.WriteLine(entrance);
                 LevelConstants.RandoLevel oldLevel = default;
                 if (LevelConstants.SpecialEntranceNames.Contains(entrance))
                 {
-
                     Vector3 comparePos;
                     switch (entrance)
                     {
diff --git a/GameOverrideManagers/RandoMusicManager.cs b/GameOverrideManagers/RandoMusicManager.cs
index 4a4348e..eb5e96b 100644
--- a/GameOverrideManagers/RandoMusicManager.cs
+++ b/GameOverrideManagers/RandoMusicManager.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using Object = UnityEngine.Object;
 using Random = System.Random;
 
 namespace MessengerRando.GameOverrideManagers
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 59f6e85..5eacb8e 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -242,7 +242,7 @@ public Portal(int portalWarp)
                         new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-305, -51), EBits.BITS_8),
                         new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-186.5f, -24), EBits.BITS_8),
                         new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-125.5f, -91), EBits.BITS_8),
-                        //new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(124.5f, -43)), // barm'athaziel which isn't accessible in second quest
+                        //new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(124.5f, -43)), // barm'athazel which isn't accessible in second quest
                         new LevelConstants.RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(132.5f, -130)),
                     },
                     new List<LevelConstants.RandoLevel>
@@ -331,11 +331,11 @@ public static void Teleport()
             }
         }
 
-        public static void LeaveHQ(On.TotHQ.orig_LeaveToLevel orig, TotHQ self, bool playlevelmusic, bool loadingnewlevel)
+        public static void LeaveHQ(On.TotHQ.orig_LeaveToLevel orig, TotHQ self, bool playLevelMusic, bool loadingNewLevel)
         {
             Console.WriteLine($"leaving hq.. should be teleporting: {PortalMapping != null}");
             LeftHQPortal = PortalMapping != null;
-            orig(self, playlevelmusic, loadingnewlevel);
+            orig(self, playLevelMusic, loadingNewLevel);
         }
     }
 }
\ No newline at end of file
diff --git a/GameOverrideManagers/RandoPowerSealManager.cs b/GameOverrideManagers/RandoPowerSealManager.cs
index c1e33b4..ef0c3e5 100644
--- a/GameOverrideManagers/RandoPowerSealManager.cs
+++ b/GameOverrideManagers/RandoPowerSealManager.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using MessengerRando.Archipelago;
-using MessengerRando.Utils;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
diff --git a/GameOverrideManagers/RandoRoomManager.cs b/GameOverrideManagers/RandoRoomManager.cs
index dc94382..d3e0911 100644
--- a/GameOverrideManagers/RandoRoomManager.cs
+++ b/GameOverrideManagers/RandoRoomManager.cs
@@ -8,8 +8,8 @@ namespace MessengerRando.GameOverrideManagers
     public static class RandoRoomManager
     {
         public static bool RoomRando;
-        public static bool RoomOverride;
-        public static Dictionary<string, string> RoomMap; // old room name - new room name
+        private static bool roomOverride;
+        private static Dictionary<string, string> roomMap; // old room name - new room name
         
         static string GetRoomKey(ScreenEdge left, ScreenEdge right, ScreenEdge bottom, ScreenEdge top)
         {
@@ -57,9 +57,9 @@ public static void Level_ChangeRoom(On.Level.orig_ChangeRoom orig, Level self,
             //if we're in a room, it leaves the current room then enters the new room with the teleported bool
             //no idea what the teleported bool does currently
             orig(self, leftEdge, rightEdge, bottomEdge, topEdge, teleportedInRoom);
-            if (RoomOverride)
+            if (roomOverride)
             {
-                RoomOverride = false;
+                roomOverride = false;
                 return;
             }
 
@@ -75,7 +75,7 @@ public static void Level_ChangeRoom(On.Level.orig_ChangeRoom orig, Level self,
                 if (newRoom.RoomKey.IsNullOrEmpty() || transition.Direction.IsNullOrEmpty()) return;
                 
                 SetRoomKey(leftEdge, rightEdge, bottomEdge, topEdge, newRoom.RoomKey);
-                RoomOverride = true;
+                roomOverride = true;
                 if (newRoom.Region.Equals(currentLevel))
                     Manager<Level>.Instance.ChangeRoom(leftEdge, rightEdge, bottomEdge, topEdge, teleportedInRoom);
                 else
@@ -96,7 +96,7 @@ static RoomConstants.RandoRoom PlaceInRoom(string oldRoomKey, ELevel currentLeve
             if (!RoomConstants.RoomNameLookup.TryGetValue(new RoomConstants.RandoRoom(oldRoomKey, currentLevel),
                     out var oldRoomName)
                 || !RoomConstants.TransitionLookup.TryGetValue(oldRoomName, out var oldTransitions)
-                || !RoomMap.TryGetValue(oldRoomName, out var newName)
+                || !roomMap.TryGetValue(oldRoomName, out var newName)
                 || !RoomConstants.TransitionLookup.TryGetValue(newName, out var newTransitions))
                 return new RoomConstants.RandoRoom();
             
diff --git a/GameOverrideManagers/RandoTimeShardManager.cs b/GameOverrideManagers/RandoTimeShardManager.cs
index fc864d8..723e014 100644
--- a/GameOverrideManagers/RandoTimeShardManager.cs
+++ b/GameOverrideManagers/RandoTimeShardManager.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using MessengerRando.Archipelago;
 using MessengerRando.RO;
-using MessengerRando.Utils;
 
 namespace MessengerRando.GameOverrideManagers
 {
diff --git a/MessengerRando.csproj b/MessengerRando.csproj
index b73c40e..5bb2340 100644
--- a/MessengerRando.csproj
+++ b/MessengerRando.csproj
@@ -106,7 +106,7 @@
     <Compile Include="Utils\Constants\BossConstants.cs" />
     <Compile Include="Utils\Constants\LevelConstants.cs" />
     <Compile Include="Utils\Constants\RoomConstants.cs" />
-    <Compile Include="Utils\RandoMenu.cs" />
+    <Compile Include="Utils\ArchipelagoMenu.cs" />
     <Compile Include="Utils\RandoSave.cs" />
     <Compile Include="Utils\LocationInfo.cs" />
     <Compile Include="Utils\DialogChanger.cs" />
diff --git a/Overrides/RandoCatacombLevelInitializer.cs b/Overrides/RandoCatacombLevelInitializer.cs
index 4f4bfc7..a2bcd4e 100644
--- a/Overrides/RandoCatacombLevelInitializer.cs
+++ b/Overrides/RandoCatacombLevelInitializer.cs
@@ -6,7 +6,7 @@ namespace MessengerRando.Overrides
 	/// <summary>
 	/// This class is meant to override functions of CatacombLevelInitializer for ease of access.
 	/// </summary>
-	class RandoCatacombLevelInitializer
+	static class RandoCatacombLevelInitializer
     {
 		/// <summary>
 		/// Overriding FixPlayerStuckInChallengeRoom method that is private in orig code. No changes made to orig code.
diff --git a/RO/RandoItemRO.cs b/RO/RandoItemRO.cs
index 8c5875a..f8210a3 100644
--- a/RO/RandoItemRO.cs
+++ b/RO/RandoItemRO.cs
@@ -11,15 +11,12 @@ public struct RandoItemRO
         public EItems Item { get; }
         //amount to give
         public int Quantity { get; }
-        //player name for other players' items
-        public string RecipientName { get; }
 
-        public RandoItemRO(string name, EItems item, int quantity = 1, string recipient = null)
+        public RandoItemRO(string name, EItems item, int quantity = 1)
         {
             Name = name;
             Item = item;
             Quantity = quantity;
-            RecipientName = recipient;
         }
 
         public override string ToString()
@@ -57,12 +54,11 @@ public static RandoItemRO ParseString(string itemToParse)
 
             if(itemToParse == null)
             {
-                throw new ArgumentNullException("Attempted to parse null!");
+                throw new ArgumentNullException(nameof(itemToParse));
             }
 
             string[] randoItemDetails = itemToParse.Split('-');
-            int quantity = 0;
-            if (randoItemDetails.Length == 3 && Enum.IsDefined(typeof(EItems), randoItemDetails[1]) && int.TryParse(randoItemDetails[2], out quantity))
+            if (randoItemDetails.Length == 3 && Enum.IsDefined(typeof(EItems), randoItemDetails[1]) && int.TryParse(randoItemDetails[2], out var quantity))
             {
                 return new RandoItemRO(randoItemDetails[0], (EItems)Enum.Parse(typeof(EItems), randoItemDetails[1], true), quantity);
             }
diff --git a/Utils/RandoMenu.cs b/Utils/ArchipelagoMenu.cs
similarity index 90%
rename from Utils/RandoMenu.cs
rename to Utils/ArchipelagoMenu.cs
index 58a30eb..6d1339f 100644
--- a/Utils/RandoMenu.cs
+++ b/Utils/ArchipelagoMenu.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using MessengerRando.Archipelago;
 using Mod.Courier;
 using Mod.Courier.UI;
 using TMPro;
@@ -14,10 +12,10 @@
 
 namespace MessengerRando.Utils
 {
-    public class RandoMenu
+    public class ArchipelagoMenu
     {
         public static OptionsButtonInfo ArchipelagoMenuButton;
-        public static RandoScreen randoScreen;
+        public static ArchipelagoScreen archipelagoScreen;
 
         public static SubMenuButtonInfo versionButton;
         public static SubMenuButtonInfo seedNumButton;
@@ -47,13 +45,13 @@ public class RandoMenu
         public static void DisplayRandoMenu()
         {
             Manager<UIManager>.Instance.GetView<OptionScreen>().gameObject.SetActive(false);
-            if (!RandoScreen.RandoScreenLoaded)
-                randoScreen = RandoScreen.BuildModOptionScreen(Manager<UIManager>.Instance.GetView<OptionScreen>());
+            if (!ArchipelagoScreen.RandoScreenLoaded)
+                archipelagoScreen = ArchipelagoScreen.BuildModOptionScreen(Manager<UIManager>.Instance.GetView<OptionScreen>());
 
-            Courier.UI.ShowView(randoScreen, EScreenLayers.PROMPT, null, false);
+            Courier.UI.ShowView(archipelagoScreen, EScreenLayers.PROMPT, null, false);
         }
 
-        public class RandoScreen : ModOptionScreen
+        public class ArchipelagoScreen : ModOptionScreen
         {
             public static bool RandoScreenLoaded;
             public static readonly List<OptionsButtonInfo> OptionButtons = new List<OptionsButtonInfo>();
@@ -99,15 +97,15 @@ public void InitOptionsViewWithModButtons()
                             break;
                         default:
                             CourierLogger.Log(LogType.Warning, "OptionsMenu",
-                                button.GetType()?.ToString() + " not a known type of OptionsButtonInfo!");
+                                button.GetType() + " not a known type of OptionsButtonInfo!");
                             break;
                     }
 
                     button.gameObject.transform.SetAsLastSibling();
-                    GameObject gameObject = button.gameObject;
+                    GameObject buttonGameObject = button.gameObject;
                     Func<string> getText = button.GetText;
                     string str = getText?.Invoke() ?? "Nameless Modded Options Button";
-                    gameObject.name = str;
+                    buttonGameObject.name = str;
                     button.addedTo = view;
                     foreach (TextMeshProUGUI componentsInChild in button.gameObject
                                  .GetComponentsInChildren<TextMeshProUGUI>())
@@ -132,43 +130,43 @@ public void InitOptionsViewWithModButtons()
                 parent.Find("Back")?.SetAsLastSibling();
             }
 
-            public new static RandoScreen BuildModOptionScreen(OptionScreen optionScreen)
+            public new static ArchipelagoScreen BuildModOptionScreen(OptionScreen optionScreen)
             {
                 GameObject gameObject = new GameObject();
-                RandoScreen randoScreen = gameObject.AddComponent<RandoScreen>();
+                ArchipelagoScreen archipelagoScreen = gameObject.AddComponent<ArchipelagoScreen>();
                 OptionScreen newScreen = Instantiate(optionScreen);
-                randoScreen.name = "RandoScreen";
+                archipelagoScreen.name = "RandoScreen";
                 // Swap everything under the option screen to the mod option screen
                 // Iterate backwards so elements don't shift as lower ones are removed
                 for (int i = newScreen.transform.childCount - 1; i >= 0; i--)
                 {
-                    newScreen.transform.GetChild(i).SetParent(randoScreen.transform, false);
+                    newScreen.transform.GetChild(i).SetParent(archipelagoScreen.transform, false);
                 }
 
-                randoScreen.optionMenuButtons = randoScreen.transform.Find("Container").Find("BackgroundFrame")
+                archipelagoScreen.optionMenuButtons = archipelagoScreen.transform.Find("Container").Find("BackgroundFrame")
                     .Find("OptionsFrame").Find("OptionMenuButtons");
-                randoScreen.backButton = randoScreen.optionMenuButtons.Find("Back");
+                archipelagoScreen.backButton = archipelagoScreen.optionMenuButtons.Find("Back");
                 // Delete OptionScreen buttons except for the Back button
-                foreach (Transform child in randoScreen.optionMenuButtons.GetChildren())
+                foreach (Transform child in archipelagoScreen.optionMenuButtons.GetChildren())
                 {
-                    if (!child.Equals(randoScreen.backButton))
+                    if (!child.Equals(archipelagoScreen.backButton))
                         Destroy(child.gameObject);
                 }
 
                 //TODO put back if things brake
                 // randoScreen.optionMenuButtons.DetachChildren();
-                randoScreen.backButton.SetParent(randoScreen.optionMenuButtons);
+                archipelagoScreen.backButton.SetParent(archipelagoScreen.optionMenuButtons);
 
                 // Make back button take you to the OptionScreen instead of the pause menu
-                Button button = randoScreen.backButton.GetComponentInChildren<Button>();
+                Button button = archipelagoScreen.backButton.GetComponentInChildren<Button>();
                 button.onClick = new Button.ButtonClickedEvent();
-                button.onClick.AddListener(randoScreen.BackToOptionMenu);
+                button.onClick.AddListener(archipelagoScreen.BackToOptionMenu);
 
-                randoScreen.InitStuffUnityWouldDo();
+                archipelagoScreen.InitStuffUnityWouldDo();
 
-                randoScreen.gameObject.SetActive(false);
+                archipelagoScreen.gameObject.SetActive(false);
                 RandoScreenLoaded = true;
-                return randoScreen;
+                return archipelagoScreen;
             }
 
             private void InitStuffUnityWouldDo()
@@ -290,10 +288,11 @@ private void HideUnavailableOptions()
                     new Vector2(sizeDelta.x, 110 + heightPerButton * OptionsCount());
             }
 
+            // ReSharper disable Unity.PerformanceAnalysis
             private void SetInitialSelection()
             {
                 GameObject defaultSelectionButton =
-                    (initialSelection ?? defaultSelection).transform.Find("Button").gameObject;
+                    (initialSelection ? initialSelection : defaultSelection).transform.Find("Button").gameObject;
                 defaultSelectionButton.transform.GetComponent<UIObjectAudioHandler>().playAudio = false;
                 EventSystem.current.SetSelectedGameObject(defaultSelectionButton);
                 defaultSelectionButton.GetComponent<Button>().OnSelect(null);
@@ -307,6 +306,7 @@ private void SetInitialSelection()
                 RandoScreenLoaded = false;
             }
 
+            // ReSharper disable Unity.PerformanceAnalysis
             public new int GetSelectedButtonIndex()
             {
                 if (backButton.Find("Button").gameObject.Equals(EventSystem.current.currentSelectedGameObject))
@@ -427,7 +427,7 @@ public override void Close(bool transitionOut)
         }
 
         private static void RegisterRandoButton(OptionsButtonInfo buttonInfo) =>
-            RandoScreen.OptionButtons.Add(buttonInfo);
+            ArchipelagoScreen.OptionButtons.Add(buttonInfo);
 
         public static SubMenuButtonInfo RegisterSubRandoButton(Func<string> GetText, UnityAction onClick)
         {
diff --git a/Utils/DialogChanger.cs b/Utils/DialogChanger.cs
index 69bdfd5..e89222e 100644
--- a/Utils/DialogChanger.cs
+++ b/Utils/DialogChanger.cs
@@ -70,43 +70,49 @@ public static void LoadDialogs_Elanguage(On.DialogManager.orig_LoadDialogs_ELang
             FieldInfo dialogByLocIDField = typeof(DialogManager).GetField("dialogByLocID", BindingFlags.NonPublic | BindingFlags.Instance);
 
             //Gets all loaded dialogs and makes a copy
-            Dictionary<string, List<DialogInfo>> Loc = dialogByLocIDField.GetValue(self) as Dictionary<string, List<DialogInfo>>;
-            Dictionary<string, List<DialogInfo>> LocCopy = new Dictionary<string, List<DialogInfo>>(Loc);
-
-            //Loop through each dialog replacement - Will output the replacements to log for debugging
-            foreach (var replaceableKey in Loc.Select(kvp => kvp.Key).Where(toBeReplaced => ItemDialogID.ContainsValue(toBeReplaced)))
+            if (dialogByLocIDField != null)
             {
-                //Sets them to be all center and no portrait (This really only applies to phobekins but was 
-                LocCopy[replaceableKey][0].autoClose = false;
-                LocCopy[replaceableKey][0].autoCloseDelay = 0;
-                LocCopy[replaceableKey][0].characterDefinition = null;
-                LocCopy[replaceableKey][0].forcedPortraitOrientation = 0;
-                LocCopy[replaceableKey][0].position = EDialogPosition.CENTER;
-                LocCopy[replaceableKey][0].skippable = true;
-                if (RandomizerStateManager.Instance.ScoutedLocations != null &&
-                    RandomizerStateManager.Instance.IsLocationRandomized(
-                        ItemDialogID.First(x => x.Value.Equals(replaceableKey)).Key,
-                        out var locationID))
+                Dictionary<string, List<DialogInfo>> Loc = dialogByLocIDField.GetValue(self) as Dictionary<string, List<DialogInfo>>;
+                if (Loc != null)
                 {
-                    LocCopy[replaceableKey][0].text =
-                        RandomizerStateManager.Instance.ScoutedLocations[locationID].ToReadableString();
-                }
+                    Dictionary<string, List<DialogInfo>> LocCopy = new Dictionary<string, List<DialogInfo>>(Loc);
 
-                //This will remove all additional dialog that comes after the initial reward text
-                for (int i = LocCopy[replaceableKey].Count - 1; i > 0; i--)
-                {
-                    LocCopy[replaceableKey].RemoveAt(i);
+                    //Loop through each dialog replacement - Will output the replacements to log for debugging
+                    foreach (var replaceableKey in Loc.Select(kvp => kvp.Key).Where(toBeReplaced => ItemDialogID.ContainsValue(toBeReplaced)))
+                    {
+                        //Sets them to be all center and no portrait (This really only applies to phobekins but was 
+                        LocCopy[replaceableKey][0].autoClose = false;
+                        LocCopy[replaceableKey][0].autoCloseDelay = 0;
+                        LocCopy[replaceableKey][0].characterDefinition = null;
+                        LocCopy[replaceableKey][0].forcedPortraitOrientation = 0;
+                        LocCopy[replaceableKey][0].position = EDialogPosition.CENTER;
+                        LocCopy[replaceableKey][0].skippable = true;
+                        if (RandomizerStateManager.Instance.ScoutedLocations != null &&
+                            RandomizerStateManager.Instance.IsLocationRandomized(
+                                ItemDialogID.First(x => x.Value.Equals(replaceableKey)).Key,
+                                out var locationID))
+                        {
+                            LocCopy[replaceableKey][0].text =
+                                RandomizerStateManager.Instance.ScoutedLocations[locationID].ToReadableString();
+                        }
+
+                        //This will remove all additional dialog that comes after the initial reward text
+                        for (int i = LocCopy[replaceableKey].Count - 1; i > 0; i--)
+                        {
+                            LocCopy[replaceableKey].RemoveAt(i);
+                        }
+                    }
+                    //Sets the replacements
+                    dialogByLocIDField.SetValue(self, LocCopy);
                 }
             }
-            //Sets the replacements
-            dialogByLocIDField.SetValue(self, LocCopy);
 
             //There is probably a better way to do this but I chose to use reflection to call all onLanguageChanged events to update the localization completely.
             if (Manager<LocalizationManager>.Instance != null)
             {
                 Type type = typeof(LocalizationManager);
                 FieldInfo field = type.GetField("onLanguageChanged", BindingFlags.NonPublic | BindingFlags.Instance);
-                MulticastDelegate eventDelegate = field.GetValue(Manager<LocalizationManager>.Instance) as MulticastDelegate;
+                MulticastDelegate eventDelegate = field?.GetValue(Manager<LocalizationManager>.Instance) as MulticastDelegate;
 
 
                 if (eventDelegate != null)
diff --git a/Utils/HintMenu.cs b/Utils/HintMenu.cs
index 6246a36..d5dbe6c 100644
--- a/Utils/HintMenu.cs
+++ b/Utils/HintMenu.cs
@@ -74,15 +74,15 @@ public void InitOptionsViewWithModButtons()
                             break;
                         default:
                             CourierLogger.Log(LogType.Warning, "OptionsMenu",
-                                button.GetType()?.ToString() + " not a known type of OptionsButtonInfo!");
+                                button.GetType() + " not a known type of OptionsButtonInfo!");
                             break;
                     }
 
                     button.gameObject.transform.SetAsLastSibling();
-                    GameObject gameObject = button.gameObject;
+                    GameObject buttonGameObject = button.gameObject;
                     Func<string> getText = button.GetText;
                     string str = getText?.Invoke() ?? "Nameless Modded Options Button";
-                    gameObject.name = str;
+                    buttonGameObject.name = str;
                     button.addedTo = view;
                     foreach (TextMeshProUGUI componentsInChild in button.gameObject
                                  .GetComponentsInChildren<TextMeshProUGUI>())
@@ -265,10 +265,11 @@ private void HideUnavailableOptions()
                     new Vector2(sizeDelta.x, 110 + heightPerButton * OptionsCount());
             }
 
+            // ReSharper disable Unity.PerformanceAnalysis
             private void SetInitialSelection()
             {
                 GameObject defaultSelectionButton =
-                    (initialSelection ?? defaultSelection).transform.Find("Button").gameObject;
+                    (initialSelection ? initialSelection : defaultSelection).transform.Find("Button").gameObject;
                 defaultSelectionButton.transform.GetComponent<UIObjectAudioHandler>().playAudio = false;
                 EventSystem.current.SetSelectedGameObject(defaultSelectionButton);
                 defaultSelectionButton.GetComponent<Button>().OnSelect(null);
diff --git a/Utils/RandoSave.cs b/Utils/RandoSave.cs
index 30dc1bc..47448a5 100644
--- a/Utils/RandoSave.cs
+++ b/Utils/RandoSave.cs
@@ -31,7 +31,7 @@ public void ForceUpdate()
             APSaveData = GetSaveData();
         }
 
-        public static string GetSaveData()
+        private static string GetSaveData()
         {
             var output =
                 $"{RandomizerStateManager.Instance.APSave[1]}|" +
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 385ab57..f5d65d8 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -1,17 +1,14 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using AdvancedInspector;
 using Archipelago.MultiClient.Net.Models;
 using Archipelago.MultiClient.Net.Packets;
 using MessengerRando.Archipelago;
 using MessengerRando.GameOverrideManagers;
-using MonoMod.Utils;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
-using Random = System.Random;
+// ReSharper disable StringLiteralTypo
+// ReSharper disable CommentTypo
 
 namespace MessengerRando.Utils
 {
@@ -21,14 +18,18 @@ public class RandomizerStateManager
         public int CurrentFileSlot { set; get; }
 
         public RandoPowerSealManager PowerSealManager;
+        // ReSharper disable once UnassignedField.Global
+        // gets assigned externally
         public RandoBossManager BossManager;
         public static List<NetworkItem> SeenHints = new List<NetworkItem>();
 
         public bool SkipMusicBox;
+        // ReSharper disable once UnassignedField.Global
+        // useful for debugging
         public bool SkipPhantom;
 
         public Dictionary<long, NetworkItem> ScoutedLocations;
-        public Dictionary<int, ArchipelagoData> APSave;
+        public readonly Dictionary<int, ArchipelagoData> APSave;
 
         public RandomizerStateManager()
         {
@@ -132,7 +133,7 @@ public static bool IsSafeTeleportState()
                          Manager<PlayerManager>.Instance.Player.InputBlocked() ||
                          Manager<PlayerManager>.Instance.Player.IsKnockedBack);
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return false;
             }
@@ -211,26 +212,26 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
             invManager.AllTimeItemQuantityByItemId = invManager.ItemQuantityByItemId;
             
             progManager.secondQuest = true;
-            var discoveredLevels = new List<ELevel>
-            {
-                // ELevel.Level_01_NinjaVillage,
-                // ELevel.Level_02_AutumnHills,
-                // ELevel.Level_03_ForlornTemple,
-                // ELevel.Level_04_Catacombs,
-                // ELevel.Level_06_A_BambooCreek,
-                // ELevel.Level_05_A_HowlingGrotto,
-                // ELevel.Level_07_QuillshroomMarsh,
-                // ELevel.Level_08_SearingCrags,
-                // ELevel.Level_09_A_GlacialPeak,
-                // ELevel.Level_10_A_TowerOfTime,
-                // ELevel.Level_11_A_CloudRuins,
-                // ELevel.Level_12_UnderWorld,
-                // ELevel.Level_13_TowerOfTimeHQ,
-                // ELevel.Level_04_C_RiviereTurquoise,
-                // ELevel.Level_05_B_SunkenShrine,
-            };
-            progManager.levelsDiscovered.AddRange(discoveredLevels);
-            progManager.allTimeDiscoveredLevels.AddRange(discoveredLevels);
+            // var discoveredLevels = new List<ELevel>
+            // {
+            //     ELevel.Level_01_NinjaVillage,
+            //     ELevel.Level_02_AutumnHills,
+            //     ELevel.Level_03_ForlornTemple,
+            //     ELevel.Level_04_Catacombs,
+            //     ELevel.Level_06_A_BambooCreek,
+            //     ELevel.Level_05_A_HowlingGrotto,
+            //     ELevel.Level_07_QuillshroomMarsh,
+            //     ELevel.Level_08_SearingCrags,
+            //     ELevel.Level_09_A_GlacialPeak,
+            //     ELevel.Level_10_A_TowerOfTime,
+            //     ELevel.Level_11_A_CloudRuins,
+            //     ELevel.Level_12_UnderWorld,
+            //     ELevel.Level_13_TowerOfTimeHQ,
+            //     ELevel.Level_04_C_RiviereTurquoise,
+            //     ELevel.Level_05_B_SunkenShrine,
+            // };
+            // progManager.levelsDiscovered.AddRange(discoveredLevels);
+            // progManager.allTimeDiscoveredLevels.AddRange(discoveredLevels);
             progManager.isLevelDiscoveredAwarded = true;
             
             var skipCutscenes = new List<string>

From 6bbd24cea0ff5bb830c63d6db7f7be3055242028 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sat, 27 Jan 2024 12:34:15 -0600
Subject: [PATCH 25/63] implement solo rando menu

---
 APRandomizerMain.cs        | 155 +++++++++---
 MessengerRando.csproj      |   4 +
 Utils/ArchipelagoMenu.cs   |  33 +--
 Utils/OptionsExporter.cs   |  44 ++++
 Utils/RandoMenu.cs         | 488 +++++++++++++++++++++++++++++++++++++
 Utils/RandomizerOptions.cs | 158 ++++++++++++
 Utils/SeedGenerator.cs     |  45 ++++
 7 files changed, 879 insertions(+), 48 deletions(-)
 create mode 100644 Utils/OptionsExporter.cs
 create mode 100644 Utils/RandoMenu.cs
 create mode 100644 Utils/RandomizerOptions.cs
 create mode 100644 Utils/SeedGenerator.cs

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 73c05a3..4535c27 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -49,18 +49,21 @@ public override void Load()
             //Initialize the randomizer state manager
             randoStateManager = new RandomizerStateManager();
 
-            BuildRandoMenu();
+            BuildArchipelagoMenu();
             
-            void BuildRandoMenu()
+            void BuildArchipelagoMenu()
             {
                 ArchipelagoMenu.ArchipelagoMenuButton =
-                    Courier.UI.RegisterSubMenuOptionButton(() => "Randomizer", ArchipelagoMenu.DisplayRandoMenu);
+                    Courier.UI.RegisterSubMenuOptionButton(
+                        () => "Archipelago Randomizer",
+                        ArchipelagoMenu.DisplayArchipelagoMenu);
 
                 // These should always be visible
-                ArchipelagoMenu.versionButton =
+                ArchipelagoMenu.VersionButton =
                     ArchipelagoMenu.RegisterSubRandoButton(
-                        () => "Messenger AP Randomizer: v" + ItemRandomizerUtil.GetModVersion(), null);
-                ArchipelagoMenu.versionButton.IsEnabled = () => true;
+                        () => "Messenger AP Randomizer: v" + ItemRandomizerUtil.GetModVersion(),
+                        null);
+                ArchipelagoMenu.VersionButton.IsEnabled = () => true;
                 
                 // these should only be visible from the main menu
                 //Add Archipelago host button
@@ -104,7 +107,8 @@ void BuildRandoMenu()
                 
                 //Add archipelago password button
                 ArchipelagoMenu.ArchipelagoPassButton = ArchipelagoMenu.RegisterTextRandoButton(
-                    () => "Enter Archipelago Password", OnSelectArchipelagoPass,
+                    () => "Enter Archipelago Password",
+                    OnSelectArchipelagoPass,
                     30,
                     () => "Enter session password:",
                     () => ArchipelagoClient.ServerData?.Password);
@@ -122,109 +126,194 @@ void BuildRandoMenu()
 
                 // only visible while actually in the game
                 //Add current seed number button
-                ArchipelagoMenu.seedNumButton = ArchipelagoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.SeedNumButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => "Current seed number: " + GetCurrentSeedNum(),
                     null);
-                ArchipelagoMenu.seedNumButton.IsEnabled = () =>
+                ArchipelagoMenu.SeedNumButton.IsEnabled = () =>
                     ArchipelagoClient.HasConnected && randoStateManager.CurrentFileSlot != 0;
 
                 //Add windmill shuriken toggle button
-                ArchipelagoMenu.windmillShurikenToggleButton = ArchipelagoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.WindmillShurikenToggleButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => Manager<ProgressionManager>.Instance.useWindmillShuriken
                         ? "Active Regular Shurikens"
                         : "Active Windmill Shurikens",
                     OnToggleWindmillShuriken);
-                ArchipelagoMenu.windmillShurikenToggleButton.IsEnabled =
+                ArchipelagoMenu.WindmillShurikenToggleButton.IsEnabled =
                     () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
                           ArchipelagoClient.ServerData?.ReceivedItems != null &&
                           ArchipelagoClient.ServerData.ReceivedItems.ContainsKey(
                               ItemsAndLocationsHandler.ItemFromEItem(EItems.WINDMILL_SHURIKEN));
 
                 //Add teleport to HQ button
-                ArchipelagoMenu.teleportToHqButton = ArchipelagoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.TeleportToHqButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => "Teleport to HQ",
                     OnSelectTeleportToHq);
-                ArchipelagoMenu.teleportToHqButton.IsEnabled = () =>
+                ArchipelagoMenu.TeleportToHqButton.IsEnabled = () =>
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
                     RandomizerStateManager.IsSafeTeleportState();
 
                 //Add teleport to Ninja Village button
-                ArchipelagoMenu.teleportToNinjaVillage = ArchipelagoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.TeleportToNinjaVillage = ArchipelagoMenu.RegisterSubRandoButton(
                     () => "Teleport to Ninja Village",
                     OnSelectTeleportToNinjaVillage);
-                ArchipelagoMenu.teleportToNinjaVillage.IsEnabled = () =>
+                ArchipelagoMenu.TeleportToNinjaVillage.IsEnabled = () =>
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
                     Manager<ProgressionManager>.Instance.HasCutscenePlayed("ElderAwardSeedCutscene") &&
                     RandomizerStateManager.IsSafeTeleportState();
 
                 //Add Archipelago status button
-                ArchipelagoMenu.archipelagoStatusButton = ArchipelagoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.ArchipelagoStatusButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => ArchipelagoClient.DisplayStatus
                         ? "Hide status information"
                         : "Display status information",
                     OnToggleAPStatus);
-                ArchipelagoMenu.archipelagoStatusButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+                ArchipelagoMenu.ArchipelagoStatusButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago message button
-                ArchipelagoMenu.archipelagoToggleMessagesButton = ArchipelagoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.ArchipelagoToggleMessagesButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => ArchipelagoClient.DisplayAPMessages
                         ? "Hide server messages"
                         : "Display server messages",
                     OnToggleAPMessages);
-                ArchipelagoMenu.archipelagoToggleMessagesButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+                ArchipelagoMenu.ArchipelagoToggleMessagesButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago filter messages button
-                ArchipelagoMenu.archipelagoToggleFilterMessagesButton = ArchipelagoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.ArchipelagoToggleFilterMessagesButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => ArchipelagoClient.FilterAPMessages
                         ? "Show all server messages"
                         : "Filter messages to only relevant to me",
                     () => ArchipelagoClient.FilterAPMessages = !ArchipelagoClient.FilterAPMessages);
-                ArchipelagoMenu.archipelagoToggleFilterMessagesButton.IsEnabled = () =>
+                ArchipelagoMenu.ArchipelagoToggleFilterMessagesButton.IsEnabled = () =>
                     ArchipelagoClient.Authenticated && ArchipelagoClient.DisplayAPMessages;
 
                 //Add Archipelago hint popup button
-                ArchipelagoMenu.archipelagoToggleHintPopupButton = ArchipelagoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.ArchipelagoToggleHintPopupButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => ArchipelagoClient.HintPopUps ? "Disable hint popups" : "Enable hint popups",
                     () => ArchipelagoClient.HintPopUps = !ArchipelagoClient.HintPopUps);
-                ArchipelagoMenu.archipelagoToggleHintPopupButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+                ArchipelagoMenu.ArchipelagoToggleHintPopupButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago message display timer button
-                ArchipelagoMenu.archipelagoMessageTimerButton = ArchipelagoMenu.RegisterTextRandoButton(
+                ArchipelagoMenu.ArchipelagoMessageTimerButton = ArchipelagoMenu.RegisterTextRandoButton(
                     () => "AP Message Display Time",
                     OnSelectMessageTimer,
                     1,
                     () => "Enter amount of time to display Archipelago messages, in seconds",
                     () => updateTime.ToString(CultureInfo.InvariantCulture), CharsetFlags.Number);
-                ArchipelagoMenu.archipelagoMessageTimerButton.IsEnabled =
+                ArchipelagoMenu.ArchipelagoMessageTimerButton.IsEnabled =
                     () => ArchipelagoClient.Authenticated && ArchipelagoClient.DisplayStatus;
 
-                ArchipelagoMenu.shuffleMusicButton = ArchipelagoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.ShuffleMusicButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => RandoMusicManager.ShuffleMusic
                         ? "Disable Music Shuffle"
                         : "Enable Music Shuffle",
                     () => RandoMusicManager.ShuffleMusic = !RandoMusicManager.ShuffleMusic);
-                ArchipelagoMenu.shuffleMusicButton.IsEnabled =
+                ArchipelagoMenu.ShuffleMusicButton.IsEnabled =
                     () => Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE;
                 
                 //Add Archipelago death link button
-                ArchipelagoMenu.archipelagoDeathLinkButton = ArchipelagoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.ArchipelagoDeathLinkButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => ArchipelagoData.DeathLink
                         ? "Disable Death Link"
                         : "Enable Death Link",
                     OnToggleDeathLink);
-                ArchipelagoMenu.archipelagoDeathLinkButton.IsEnabled = () => ArchipelagoClient.Authenticated;
+                ArchipelagoMenu.ArchipelagoDeathLinkButton.IsEnabled = () => ArchipelagoClient.Authenticated;
 
                 //Add Archipelago release button
-                ArchipelagoMenu.archipelagoReleaseButton = ArchipelagoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.ArchipelagoReleaseButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => "Release remaining items",
                     OnSelectArchipelagoRelease);
-                ArchipelagoMenu.archipelagoReleaseButton.IsEnabled = ArchipelagoClient.CanRelease;
+                ArchipelagoMenu.ArchipelagoReleaseButton.IsEnabled = ArchipelagoClient.CanRelease;
 
                 //Add Archipelago collect button
-                ArchipelagoMenu.archipelagoCollectButton = ArchipelagoMenu.RegisterSubRandoButton(
+                ArchipelagoMenu.ArchipelagoCollectButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => "Collect remaining items",
                     OnSelectArchipelagoCollect);
-                ArchipelagoMenu.archipelagoCollectButton.IsEnabled = ArchipelagoClient.CanCollect;
+                ArchipelagoMenu.ArchipelagoCollectButton.IsEnabled = ArchipelagoClient.CanCollect;
+            }
+
+            BuildRandoMenu();
+
+            void BuildRandoMenu()
+            {
+                RandoMenu.SoloRandoMenuButton =
+                    Courier.UI.RegisterSubMenuOptionButton(() => "Solo Randomizer", RandoMenu.DisplayRandoMenu);
+                RandoMenu.SoloRandoMenuButton.IsEnabled = () =>
+                    Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.NONE) &&
+                    !ArchipelagoClient.HasConnected;
+
+                RandoMenu.SeedNumButton = RandoMenu.RegisterTextRandoButton(
+                    () => $"Seed: {RandomizerOptions.Seed}",
+                    RandomizerOptions.OnSeedEntry,
+                    20,
+                    () => "Enter seed to be used for generation",
+                    charset: CharsetFlags.Number);
+
+                RandoMenu.BlankSpaceOne = RandoMenu.RegisterSubRandoButton(null, null);
+                
+                RandoMenu.Accessibility = RandoMenu.RegisterSubRandoButton(
+                    RandomizerOptions.GetAccessibilityText,
+                    RandomizerOptions.ChangeAccessibility);
+
+                RandoMenu.Logic =
+                    RandoMenu.RegisterSubRandoButton(RandomizerOptions.GetLogicText, RandomizerOptions.ChangeLogic);
+
+                RandoMenu.Shards = RandoMenu.RegisterSubRandoButton(
+                    () => RandomizerOptions.Shards ? "Shuffle Mega Shards" : "No Mega Shards",
+                    () => RandomizerOptions.Shards = !RandomizerOptions.Shards);
+
+                RandoMenu.LimitedMovement = RandoMenu.RegisterSubRandoButton(
+                    () => RandomizerOptions.LimMovement ? "Limited Movement" : "All Movement Available",
+                    () => RandomizerOptions.LimMovement = !RandomizerOptions.LimMovement);
+                
+                RandoMenu.EarlyMed = RandoMenu.RegisterSubRandoButton(
+                    () => RandomizerOptions.EarlyMed ? "Early Meditation" : "No Early Guaranteed Meditation",
+                    () => RandomizerOptions.EarlyMed = !RandomizerOptions.EarlyMed);
+
+                RandoMenu.AvailablePortals = RandoMenu.RegisterSubRandoButton(
+                    RandomizerOptions.GetAvailablePortalsText,
+                    RandomizerOptions.ChangeAvailablePortals);
+
+                RandoMenu.ShufflePortals = RandoMenu.RegisterSubRandoButton(
+                    RandomizerOptions.GetPortalShuffleText,
+                    RandomizerOptions.ChangePortalShuffle);
+
+                RandoMenu.Goal = RandoMenu.RegisterSubRandoButton(
+                    () => RandomizerOptions.Goal ? "Power Seal Hunt" : "Open Music Box",
+                    () => RandomizerOptions.Goal = !RandomizerOptions.Goal);
+
+                RandoMenu.MusicBox = RandoMenu.RegisterSubRandoButton(
+                    () => RandomizerOptions.MusicBox ? "Do Music Box" : "Skip Music Box",
+                    () => RandomizerOptions.MusicBox = !RandomizerOptions.MusicBox);
+
+                RandoMenu.NotesNeeded =
+                    RandoMenu.RegisterSubRandoButton(RandomizerOptions.GetNotesText, RandomizerOptions.ChangeNotes);
+
+                RandoMenu.AmountSeals = RandoMenu.RegisterTextRandoButton(
+                    () => $"Total Power Seals Available: {RandomizerOptions.TotalSeals}",
+                    RandomizerOptions.OnTotalSealsEntry,
+                    2,
+                    charset: CharsetFlags.Number);
+
+                RandoMenu.RequiredSeals = RandoMenu.RegisterTextRandoButton(
+                    () => $"Percentage of Seals Required: {RandomizerOptions.RequiredSeals}",
+                    RandomizerOptions.OnRequiredSealsEntry,
+                    3,
+                    charset: CharsetFlags.Number);
+
+                RandoMenu.ShopPrices = RandoMenu.RegisterTextRandoButton(
+                    () => $"Randomized Shop Price Modifier: {RandomizerOptions.ShopPriceMod}",
+                    RandomizerOptions.OnShopPriceModEntry, 
+                    3,
+                    charset: CharsetFlags.Number);
+
+                RandoMenu.BlankSpaceTwo = RandoMenu.RegisterSubRandoButton(null, null);
+                
+                RandoMenu.ExportButton = RandoMenu.RegisterSubRandoButton(
+                    () => "Export Randomizer options",
+                    () => OptionsExporter.ExportAsync(RandoMenu.ExportButton));
+                RandoMenu.GenerateButton = RandoMenu.RegisterSubRandoButton(
+                    () => "Generate solo seed",
+                    () => SeedGenerator.GenerateAsync(RandoMenu.GenerateButton));
             }
             
             BuildHintMenu();
diff --git a/MessengerRando.csproj b/MessengerRando.csproj
index 5bb2340..59e8d1b 100644
--- a/MessengerRando.csproj
+++ b/MessengerRando.csproj
@@ -102,11 +102,15 @@
     <Compile Include="Overrides\RandoCatacombLevelInitializer.cs" />
     <Compile Include="RO\RandoItemRO.cs" />
     <Compile Include="RO\LocationRO.cs" />
+    <Compile Include="Utils\OptionsExporter.cs" />
+    <Compile Include="Utils\SeedGenerator.cs" />
     <Compile Include="Utils\HintMenu.cs" />
     <Compile Include="Utils\Constants\BossConstants.cs" />
     <Compile Include="Utils\Constants\LevelConstants.cs" />
     <Compile Include="Utils\Constants\RoomConstants.cs" />
     <Compile Include="Utils\ArchipelagoMenu.cs" />
+    <Compile Include="Utils\RandoMenu.cs" />
+    <Compile Include="Utils\RandomizerOptions.cs" />
     <Compile Include="Utils\RandoSave.cs" />
     <Compile Include="Utils\LocationInfo.cs" />
     <Compile Include="Utils\DialogChanger.cs" />
diff --git a/Utils/ArchipelagoMenu.cs b/Utils/ArchipelagoMenu.cs
index 6d1339f..50f9ba1 100644
--- a/Utils/ArchipelagoMenu.cs
+++ b/Utils/ArchipelagoMenu.cs
@@ -12,18 +12,21 @@
 
 namespace MessengerRando.Utils
 {
+    /// <summary>
+    /// Options menu for various archipelago stuff. has options to connect to a multiworld, teleporting while playing etc
+    /// </summary>
     public class ArchipelagoMenu
     {
         public static OptionsButtonInfo ArchipelagoMenuButton;
         public static ArchipelagoScreen archipelagoScreen;
 
-        public static SubMenuButtonInfo versionButton;
-        public static SubMenuButtonInfo seedNumButton;
+        public static SubMenuButtonInfo VersionButton;
+        public static SubMenuButtonInfo SeedNumButton;
 
-        public static SubMenuButtonInfo windmillShurikenToggleButton;
-        public static SubMenuButtonInfo teleportToHqButton;
-        public static SubMenuButtonInfo teleportToNinjaVillage;
-        public static SubMenuButtonInfo shuffleMusicButton;
+        public static SubMenuButtonInfo WindmillShurikenToggleButton;
+        public static SubMenuButtonInfo TeleportToHqButton;
+        public static SubMenuButtonInfo TeleportToNinjaVillage;
+        public static SubMenuButtonInfo ShuffleMusicButton;
 
         public static SubMenuButtonInfo ArchipelagoHostButton;
         public static SubMenuButtonInfo ArchipelagoPortButton;
@@ -31,18 +34,18 @@ public class ArchipelagoMenu
         public static SubMenuButtonInfo ArchipelagoPassButton;
         public static SubMenuButtonInfo ArchipelagoConnectButton;
         
-        public static SubMenuButtonInfo archipelagoReleaseButton;
-        public static SubMenuButtonInfo archipelagoCollectButton;
-        public static SubMenuButtonInfo archipelagoToggleMessagesButton;
-        public static SubMenuButtonInfo archipelagoToggleFilterMessagesButton;
-        public static SubMenuButtonInfo archipelagoToggleHintPopupButton;
-        public static SubMenuButtonInfo archipelagoStatusButton;
-        public static SubMenuButtonInfo archipelagoDeathLinkButton;
-        public static SubMenuButtonInfo archipelagoMessageTimerButton;
+        public static SubMenuButtonInfo ArchipelagoReleaseButton;
+        public static SubMenuButtonInfo ArchipelagoCollectButton;
+        public static SubMenuButtonInfo ArchipelagoToggleMessagesButton;
+        public static SubMenuButtonInfo ArchipelagoToggleFilterMessagesButton;
+        public static SubMenuButtonInfo ArchipelagoToggleHintPopupButton;
+        public static SubMenuButtonInfo ArchipelagoStatusButton;
+        public static SubMenuButtonInfo ArchipelagoDeathLinkButton;
+        public static SubMenuButtonInfo ArchipelagoMessageTimerButton;
 
 
 
-        public static void DisplayRandoMenu()
+        public static void DisplayArchipelagoMenu()
         {
             Manager<UIManager>.Instance.GetView<OptionScreen>().gameObject.SetActive(false);
             if (!ArchipelagoScreen.RandoScreenLoaded)
diff --git a/Utils/OptionsExporter.cs b/Utils/OptionsExporter.cs
new file mode 100644
index 0000000..df7abf2
--- /dev/null
+++ b/Utils/OptionsExporter.cs
@@ -0,0 +1,44 @@
+using System;
+using Mod.Courier.UI;
+
+namespace MessengerRando.Utils
+{
+    public static class OptionsExporter
+    {
+        private delegate void OnExport(bool result);
+        private static bool exporting;
+
+        public static void ExportAsync(SubMenuButtonInfo exportButton)
+        {
+            if (exporting) return;
+            exporting = true;
+            Console.WriteLine("Exporting options");
+            Export(result => OnExported(result, exportButton));
+        }
+
+        private static void Export(OnExport attempt)
+        {
+            attempt(Export());
+        }
+
+        private static bool Export()
+        {
+            return true;
+        }
+
+        private static void OnExported(bool result, SubMenuButtonInfo exportButton)
+        {
+            TextEntryPopup generatePopup = TextEntryButtonInfo.InitTextEntryPopup(
+                exportButton.addedTo,
+                string.Empty,
+                entry => true,
+                0,
+                null,
+                TextEntryButtonInfo.CharsetFlags.Space);
+            
+            generatePopup.Init(result ? "Options successfully exported!" : "Options export failed");
+            generatePopup.gameObject.SetActive(true);
+            exporting = false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Utils/RandoMenu.cs b/Utils/RandoMenu.cs
new file mode 100644
index 0000000..803facf
--- /dev/null
+++ b/Utils/RandoMenu.cs
@@ -0,0 +1,488 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Mod.Courier;
+using Mod.Courier.UI;
+using TMPro;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+namespace MessengerRando.Utils
+{
+    /// <summary>
+    /// Options menu for solo rando stuff. allows player to select various options to generate with, then either
+    /// export a yaml for use with AP, or generate a solo seed directly.
+    /// Should only exist from the main menu since the archipelago menu can be used for everything else.
+    /// </summary>
+    public class RandoMenu
+    {
+        public static OptionsButtonInfo SoloRandoMenuButton;
+        public static RandoScreen randoScreen;
+
+        // customizable seed input
+        public static SubMenuButtonInfo SeedNumButton;
+        public static SubMenuButtonInfo BlankSpaceOne;
+        // options
+        public static SubMenuButtonInfo Accessibility;
+        public static SubMenuButtonInfo Logic;
+        public static SubMenuButtonInfo Shards;
+        public static SubMenuButtonInfo LimitedMovement;
+        public static SubMenuButtonInfo EarlyMed;
+        public static SubMenuButtonInfo AvailablePortals;
+        public static SubMenuButtonInfo ShufflePortals;
+        public static SubMenuButtonInfo Goal;
+        public static SubMenuButtonInfo MusicBox;
+        public static SubMenuButtonInfo NotesNeeded;
+        public static SubMenuButtonInfo AmountSeals;
+        public static SubMenuButtonInfo RequiredSeals;
+        public static SubMenuButtonInfo ShopPrices;
+        public static SubMenuButtonInfo BlankSpaceTwo;
+        
+        // generate/export
+        public static SubMenuButtonInfo GenerateButton;
+        public static SubMenuButtonInfo ExportButton;
+
+        public static void DisplayRandoMenu()
+        {
+            Manager<UIManager>.Instance.GetView<OptionScreen>().gameObject.SetActive(false);
+            if (!RandoScreen.RandoScreenLoaded)
+                randoScreen = RandoScreen.BuildModOptionScreen(Manager<UIManager>.Instance.GetView<OptionScreen>());
+
+            Courier.UI.ShowView(randoScreen, EScreenLayers.PROMPT, null, false);
+        }
+
+        public class RandoScreen : ModOptionScreen
+        {
+            public static bool RandoScreenLoaded;
+            public static readonly List<OptionsButtonInfo> OptionButtons = new List<OptionsButtonInfo>();
+
+            private static int OptionsCount()
+            {
+                return OptionButtons.Count(modOptionButton => modOptionButton.gameObject.activeInHierarchy);
+            }
+
+            private static int EnabledModOptionsBeforeButton(OptionsButtonInfo button)
+            {
+                int num = 0;
+                foreach (OptionsButtonInfo modOptionButton in OptionButtons)
+                {
+                    if (modOptionButton.Equals(button))
+                        return num;
+                    if (modOptionButton.gameObject.activeInHierarchy)
+                        ++num;
+                }
+
+                return -1;
+            }
+
+            public void InitOptionsViewWithModButtons()
+            {
+                var view = this;
+                OptionScreen optionScreen = Manager<UIManager>.Instance.GetView<OptionScreen>();
+                Transform parent = view.transform.Find("Container").Find("BackgroundFrame").Find("OptionsFrame")
+                    .Find("OptionMenuButtons");
+                foreach (OptionsButtonInfo button in OptionButtons)
+                {
+                    switch (button)
+                    {
+                        case ToggleButtonInfo _:
+                            button.gameObject = Instantiate(optionScreen.fullscreenOption, parent);
+                            break;
+                        case SubMenuButtonInfo _:
+                            button.gameObject = Instantiate(optionScreen.controlsButton.transform.parent.gameObject,
+                                parent);
+                            break;
+                        case MultipleOptionButtonInfo _:
+                            button.gameObject = Instantiate(optionScreen.languageOption, parent);
+                            break;
+                        default:
+                            CourierLogger.Log(LogType.Warning, "OptionsMenu",
+                                button.GetType() + " not a known type of OptionsButtonInfo!");
+                            break;
+                    }
+
+                    button.gameObject.transform.SetAsLastSibling();
+                    GameObject buttonGameObject = button.gameObject;
+                    Func<string> getText = button.GetText;
+                    string str = getText?.Invoke() ?? "Nameless Modded Options Button";
+                    buttonGameObject.name = str;
+                    button.addedTo = view;
+                    foreach (TextMeshProUGUI componentsInChild in button.gameObject
+                                 .GetComponentsInChildren<TextMeshProUGUI>())
+                    {
+                        if (componentsInChild.name.Equals("OptionState") || componentsInChild.name.Equals("Text"))
+                            button.stateTextMesh = componentsInChild;
+                        if (componentsInChild.name.Equals("OptionName"))
+                        {
+                            button.nameTextMesh = componentsInChild;
+                            TextLocalizer component = componentsInChild.GetComponent<TextLocalizer>();
+                            if (component != null)
+                                component.locID = "";
+                        }
+                    }
+
+                    Button component1 = button.gameObject.transform.Find("Button").GetComponent<Button>();
+                    component1.onClick = new Button.ButtonClickedEvent();
+                    component1.onClick.AddListener(button.onClick);
+                    button.OnInit(view);
+                }
+
+                parent.Find("Back")?.SetAsLastSibling();
+            }
+
+            public new static RandoScreen BuildModOptionScreen(OptionScreen optionScreen)
+            {
+                GameObject gameObject = new GameObject();
+                RandoScreen randoScreen = gameObject.AddComponent<RandoScreen>();
+                OptionScreen newScreen = Instantiate(optionScreen);
+                randoScreen.name = "RandoScreen";
+                // Swap everything under the option screen to the mod option screen
+                // Iterate backwards so elements don't shift as lower ones are removed
+                for (int i = newScreen.transform.childCount - 1; i >= 0; i--)
+                {
+                    newScreen.transform.GetChild(i).SetParent(randoScreen.transform, false);
+                }
+
+                randoScreen.optionMenuButtons = randoScreen.transform.Find("Container").Find("BackgroundFrame")
+                    .Find("OptionsFrame").Find("OptionMenuButtons");
+                randoScreen.backButton = randoScreen.optionMenuButtons.Find("Back");
+                // Delete OptionScreen buttons except for the Back button
+                foreach (Transform child in randoScreen.optionMenuButtons.GetChildren())
+                {
+                    if (!child.Equals(randoScreen.backButton))
+                        Destroy(child.gameObject);
+                }
+
+                //TODO put back if things brake
+                // randoScreen.optionMenuButtons.DetachChildren();
+                randoScreen.backButton.SetParent(randoScreen.optionMenuButtons);
+
+                // Make back button take you to the OptionScreen instead of the pause menu
+                Button button = randoScreen.backButton.GetComponentInChildren<Button>();
+                button.onClick = new Button.ButtonClickedEvent();
+                button.onClick.AddListener(randoScreen.BackToOptionMenu);
+
+                randoScreen.InitStuffUnityWouldDo();
+
+                randoScreen.gameObject.SetActive(false);
+                RandoScreenLoaded = true;
+                return randoScreen;
+            }
+
+            private void InitStuffUnityWouldDo()
+            {
+                //transform.position = new Vector3(0, Math.Max(-90 - heightPerButton * Courier.UI.ModOptionButtons.Count, startYMax));
+                backgroundFrame = (RectTransform)transform.Find("Container").Find("BackgroundFrame");
+                initialHeight = backgroundFrame.sizeDelta.y;
+                gameObject.AddComponent<Canvas>();
+            }
+
+            private void Start()
+            {
+                InitOptions();
+            }
+
+            public override void Init(IViewParams screenParams)
+            {
+                base.Init(screenParams);
+
+                InitOptionsViewWithModButtons();
+
+                // Make the border frames blue
+                Sprite borderSprite = backgroundFrame.GetComponent<Image>().sprite =
+                    Courier.EmbeddedSprites["Mod.Courier.UI.mod_options_frame"];
+                borderSprite.bounds.extents.Set(1.7f, 1.7f, 0.1f);
+                borderSprite.texture.filterMode = FilterMode.Point;
+
+                borderSprite = backgroundFrame.Find("OptionsFrame").GetComponent<Image>().sprite =
+                    Courier.EmbeddedSprites["Mod.Courier.UI.mod_options_frame"];
+                borderSprite.bounds.extents.Set(1.7f, 1.7f, 0.1f);
+                borderSprite.texture.filterMode = FilterMode.Point;
+
+                HideUnavailableOptions();
+                InitOptions();
+                SetInitialSelection();
+
+                // Make the selection frames blue
+                foreach (Image image in transform.GetComponentsInChildren<Image>()
+                             .Where((c) => c.name.Equals("SelectionFrame")))
+                {
+                    try
+                    {
+                        if (image.overrideSprite != null && image.overrideSprite.name != "Empty")
+                        {
+                            RenderTexture rt = new RenderTexture(image.overrideSprite.texture.width,
+                                image.overrideSprite.texture.height, 0);
+                            RenderTexture.active = rt;
+                            Graphics.Blit(image.overrideSprite.texture, rt);
+
+                            Texture2D res = new Texture2D(rt.width, rt.height, TextureFormat.RGBA32, true);
+                            res.ReadPixels(new Rect(0, 0, rt.width, rt.height), 0, 0, false);
+
+                            Color[] pxls = res.GetPixels();
+                            for (int i = 0; i < pxls.Length; i++)
+                            {
+                                if (Math.Abs(pxls[i].r - .973) < .01 && Math.Abs(pxls[i].g - .722) < .01)
+                                {
+                                    pxls[i].r = 0;
+                                    pxls[i].g = .633f;
+                                    pxls[i].b = 1;
+                                }
+                            }
+
+                            res.SetPixels(pxls);
+                            res.Apply();
+
+                            Sprite sprite = image.overrideSprite = Sprite.Create(res,
+                                new Rect(0, 0, res.width, res.height), new Vector2(16, 16), 20, 1,
+                                SpriteMeshType.FullRect, new Vector4(5, 5, 5, 5));
+                            sprite.bounds.extents.Set(.8f, .8f, 0.1f);
+                            sprite.texture.filterMode = FilterMode.Point;
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        CourierLogger.Log(LogType.Exception, "RandoScreen",
+                            "Image not Read/Writeable when recoloring selection frames in ModOptionScreen");
+                        e.LogDetailed();
+                    }
+                }
+            }
+
+            private IEnumerator WaitAndSelectInitialButton()
+            {
+                yield return null;
+                SetInitialSelection();
+            }
+
+            private void OnEnable()
+            {
+                if (transform.parent != null)
+                {
+                    Manager<UIManager>.Instance.SetParentAndAlign(gameObject, transform.parent.gameObject);
+                }
+
+                EventSystem.current.SetSelectedGameObject(null);
+            }
+
+            private void OnDisable()
+            {
+                transform.position = defaultPos;
+            }
+
+            private void HideUnavailableOptions()
+            {
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    buttonInfo.gameObject.SetActive(buttonInfo.IsEnabled?.Invoke() ?? true);
+                }
+
+                foreach (OptionsButtonInfo buttonInfo in Courier.UI.ModOptionButtons)
+                {
+                    buttonInfo.gameObject.SetActive(false);
+                }
+
+                StartCoroutine(WaitAndSelectInitialButton());
+                Vector2 sizeDelta = backgroundFrame.sizeDelta;
+                backgroundFrame.sizeDelta =
+                    new Vector2(sizeDelta.x, 110 + heightPerButton * OptionsCount());
+            }
+
+            // ReSharper disable Unity.PerformanceAnalysis
+            private void SetInitialSelection()
+            {
+                GameObject defaultSelectionButton =
+                    (initialSelection ? initialSelection : defaultSelection).transform.Find("Button").gameObject;
+                defaultSelectionButton.transform.GetComponent<UIObjectAudioHandler>().playAudio = false;
+                EventSystem.current.SetSelectedGameObject(defaultSelectionButton);
+                defaultSelectionButton.GetComponent<Button>().OnSelect(null);
+                defaultSelectionButton.GetComponent<UIObjectAudioHandler>().playAudio = true;
+                initialSelection = null;
+            }
+
+            public new void GoOffscreenInstant()
+            {
+                gameObject.SetActive(false);
+                RandoScreenLoaded = false;
+            }
+
+            // ReSharper disable Unity.PerformanceAnalysis
+            public new int GetSelectedButtonIndex()
+            {
+                if (backButton.Find("Button").gameObject.Equals(EventSystem.current.currentSelectedGameObject))
+                    return OptionsCount();
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    if (buttonInfo.gameObject.transform.Find("Button").gameObject
+                        .Equals(EventSystem.current.currentSelectedGameObject))
+                    {
+                        return EnabledModOptionsBeforeButton(buttonInfo);
+                    }
+                }
+
+                return -1;
+            }
+
+            private void LateUpdate()
+            {
+                if (Manager<InputManager>.Instance.GetBackDown())
+                {
+                    BackToOptionMenu();
+                }
+
+                Vector3 windowOffset =
+                    new Vector3(0,
+                        Math.Min(GetSelectedButtonIndex(), Math.Max(0, OptionsCount() - 10)) *
+                        .9f) - new Vector3(0, Math.Max(0, OptionsCount() - 11) * .45f);
+                transform.position = defaultPos + windowOffset;
+
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    buttonInfo.UpdateNameText();
+                }
+
+                // Make the selection frames blue
+                // I should figure out if I can avoid doing this in LateUpdate()
+                foreach (Image image in transform.GetComponentsInChildren<Image>()
+                             .Where((c) => c.name.Equals("SelectionFrame")))
+                {
+                    try
+                    {
+                        if (image.overrideSprite != null && image.overrideSprite.name.Equals("ShopItemSelectionFrame"))
+                        {
+                            RenderTexture rt = new RenderTexture(image.overrideSprite.texture.width,
+                                image.overrideSprite.texture.height, 0);
+                            RenderTexture.active = rt;
+                            Graphics.Blit(image.overrideSprite.texture, rt);
+
+                            Texture2D res = new Texture2D(rt.width, rt.height, TextureFormat.RGBA32, true);
+                            res.ReadPixels(new Rect(0, 0, rt.width, rt.height), 0, 0, false);
+
+                            Color[] pxls = res.GetPixels();
+                            for (int i = 0; i < pxls.Length; i++)
+                            {
+                                if (Math.Abs(pxls[i].r - .973) < .01 && Math.Abs(pxls[i].g - .722) < .01)
+                                {
+                                    pxls[i].r = 0;
+                                    pxls[i].g = .633f;
+                                    pxls[i].b = 1;
+                                }
+                            }
+
+                            res.SetPixels(pxls);
+                            res.Apply();
+
+                            Sprite sprite = image.overrideSprite = Sprite.Create(res,
+                                new Rect(0, 0, res.width, res.height), new Vector2(16, 16), 20, 1,
+                                SpriteMeshType.FullRect, new Vector4(5, 5, 5, 5));
+                            sprite.bounds.extents.Set(.8f, .8f, 0.1f);
+                            sprite.texture.filterMode = FilterMode.Point;
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        CourierLogger.Log(LogType.Exception, "RandoScreen",
+                            "Image not Read/Writeable when recoloring selection frames in ModOptionScreen");
+                        CourierLogger.LogDetailed(e);
+                    }
+                }
+            }
+
+            private void InitOptions()
+            {
+                defaultSelection = backButton.gameObject;
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    if (buttonInfo.IsEnabled?.Invoke() ?? true)
+                    {
+                        defaultSelection = buttonInfo.gameObject;
+                        break;
+                    }
+                }
+
+                backgroundFrame.Find("Title").GetComponent<TextMeshProUGUI>().SetText("Randomizer Options");
+                foreach (OptionsButtonInfo buttonInfo in OptionButtons)
+                {
+                    buttonInfo.UpdateStateText();
+                }
+            }
+
+            // ReSharper disable Unity.PerformanceAnalysis
+            public new void BackToOptionMenu()
+            {
+                Close(false);
+                Manager<UIManager>.Instance.GetView<OptionScreen>().gameObject.SetActive(true);
+                SoloRandoMenuButton.gameObject.transform.Find("Button").GetComponent<UIObjectAudioHandler>()
+                    .playAudio = false;
+                EventSystem.current.SetSelectedGameObject(SoloRandoMenuButton.gameObject.transform.Find("Button")
+                    .gameObject);
+                SoloRandoMenuButton.gameObject.transform.Find("Button").GetComponent<UIObjectAudioHandler>()
+                    .playAudio = true;
+            }
+
+            public override void Close(bool transitionOut)
+            {
+                base.Close(transitionOut);
+                RandoScreenLoaded = false;
+            }
+        }
+
+        private static void RegisterRandoButton(OptionsButtonInfo buttonInfo) =>
+            RandoScreen.OptionButtons.Add(buttonInfo);
+
+        public static SubMenuButtonInfo RegisterSubRandoButton(Func<string> GetText, UnityAction onClick)
+        {
+            var buttonInfo = new SubMenuButtonInfo(GetText, onClick);
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static ToggleButtonInfo RegisterToggleRandoButton(Func<string> getText, UnityAction onClick,
+            Func<ToggleButtonInfo, bool> getState)
+        {
+            var buttonInfo = new ToggleButtonInfo(getText, onClick, getState,
+                optionScreen => Manager<LocalizationManager>.Instance.GetText(ModOptionScreen.onLocID),
+                optionScreen => Manager<LocalizationManager>.Instance.GetText(ModOptionScreen.offLocID));
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static TextEntryButtonInfo RegisterTextRandoButton(Func<string> getText, Func<string, bool> onEntry,
+            int maxCharacter = 15, Func<string> getEntryText = null, Func<string> getInitialText = null,
+            TextEntryButtonInfo.CharsetFlags charset = TextEntryButtonInfo.CharsetFlags.Letter |
+                                                       TextEntryButtonInfo.CharsetFlags.Number |
+                                                       TextEntryButtonInfo.CharsetFlags.Dash |
+                                                       TextEntryButtonInfo.CharsetFlags.Space)
+        {
+            var buttonInfo =
+                new TextEntryButtonInfo(getText, onEntry, maxCharacter, getEntryText, getInitialText, charset);
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static MultipleOptionButtonInfo RegisterMultipleRandoButton(Func<string> getText,
+            UnityAction onClick,
+            Action<int> onSwitch, Func<MultipleOptionButtonInfo, int> getIndex, Func<int, string> getTextForIndex)
+        {
+            var buttonInfo = new MultipleOptionButtonInfo(getText, onClick, onSwitch, getIndex, getTextForIndex);
+            RegisterRandoButton(buttonInfo);
+            return buttonInfo;
+        }
+
+        public static string GetTextForResetIndex(int index)
+        {
+            switch (index)
+            {
+                case 0:
+                    return "No";
+                case 1:
+                    return "Yes";
+            }
+
+            return "???";
+        }
+    }
+}
\ No newline at end of file
diff --git a/Utils/RandomizerOptions.cs b/Utils/RandomizerOptions.cs
new file mode 100644
index 0000000..aac8df3
--- /dev/null
+++ b/Utils/RandomizerOptions.cs
@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+
+namespace MessengerRando.Utils
+{
+    public static class RandomizerOptions
+    {
+        // seed
+        public static string Seed = "";
+
+        public static bool OnSeedEntry(string input)
+        {
+            Seed = input;
+            return true;
+        }
+        // accessibility
+        private static int accessibility;
+        private static readonly List<string> AccessibilityText = new List<string>
+        {
+            "Locations Accessibility",
+            "Items Accessibility",
+            "Minimal Accessibility",
+        };
+
+        public static string GetAccessibilityText()
+        {
+            return AccessibilityText[accessibility];
+        }
+
+        public static void ChangeAccessibility()
+        {
+            accessibility = accessibility == 2 ? 0 : accessibility + 1;
+        }
+        
+        // logic
+        private static int logic;
+
+        private static readonly List<string> LogicText = new List<string>
+        {
+            "Normal Logic",
+            "Hard Logic",
+            "Challenging Logic",
+            "oob Logic",
+        };
+
+        public static string GetLogicText()
+        {
+            return LogicText[logic];
+        }
+
+        public static void ChangeLogic()
+        {
+            switch (logic)
+            {
+                case 3:
+                    logic = 0;
+                    break;
+                case 1:  // TODO reimplement challenging and oob logic
+                    logic = 0;
+                    break;
+                default:
+                    logic += 1;
+                    break;
+            }
+        }
+        
+        // shards
+        public static bool Shards;
+
+        // limited movement
+        public static bool LimMovement;
+
+        // early meditation
+        public static bool EarlyMed;
+        
+        // available portals
+        private static int availablePortals = 3;
+
+        public static string GetAvailablePortalsText()
+        {
+            return $"Available Portals: {availablePortals}";
+        }
+
+        public static void ChangeAvailablePortals()
+        {
+            availablePortals = availablePortals == 6 ? 3 : availablePortals + 1;
+        }
+        
+        // portal shuffle
+        private static int portalShuffle;
+
+        private static readonly List<string> PortalShuffleText = new List<string>
+        {
+            "No Portal Shuffle",
+            "Shuffle Portals with Shops",
+            "Shuffle Portals with Shops and Checkpoints",
+            "Shuffle Portals Anywhere",
+        };
+        
+        public static string GetPortalShuffleText()
+        {
+            return PortalShuffleText[portalShuffle];
+        }
+
+        public static void ChangePortalShuffle()
+        {
+            portalShuffle = portalShuffle == 3 ? 0 : portalShuffle + 1;
+        }
+        
+        // goal
+        public static bool Goal;
+        
+        // music box gauntlet
+        public static bool MusicBox;
+        
+        // needed notes
+        private static int notes = 6;
+
+        public static string GetNotesText()
+        {
+            return $"Notes Needed for Music Box: {notes}";
+        }
+
+        public static void ChangeNotes()
+        {
+            notes = notes == 6 ? 1 : notes + 1;
+        }
+        
+        // total seals
+        public static int TotalSeals = 85;
+
+        public static bool OnTotalSealsEntry(string input)
+        {
+            TotalSeals = Math.Min(int.Parse(input), 85);
+            return true;
+        }
+        
+        // required seals
+        public static int RequiredSeals = 100;
+
+        public static bool OnRequiredSealsEntry(string input)
+        {
+            RequiredSeals = Math.Min(int.Parse(input), 100);
+            return true;
+        }
+        
+        // shop price modifier
+        public static int ShopPriceMod = 100;
+
+        public static bool OnShopPriceModEntry(string input)
+        {
+            ShopPriceMod = Math.Min(int.Parse(input), 400);
+            return true;
+        }
+        
+        
+    }
+}
\ No newline at end of file
diff --git a/Utils/SeedGenerator.cs b/Utils/SeedGenerator.cs
new file mode 100644
index 0000000..0bfc043
--- /dev/null
+++ b/Utils/SeedGenerator.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Threading;
+using Mod.Courier.UI;
+
+namespace MessengerRando.Utils
+{
+    public static class SeedGenerator
+    {
+        private delegate void OnGenerateAttempt(bool result);
+        private static bool generating;
+
+        public static void GenerateAsync(SubMenuButtonInfo generateButton)
+        {
+            if (generating) return;
+            generating = true;
+            Console.WriteLine("Attempting to generate");
+            Generate(result => OnGenerated(result, generateButton));
+        }
+
+        private static void Generate(OnGenerateAttempt attempt)
+        {
+            attempt(Generate());
+        }
+
+        private static bool Generate()
+        {
+            return true;
+        }
+
+        private static void OnGenerated(bool result, SubMenuButtonInfo generateButton)
+        {
+            TextEntryPopup generatePopup = TextEntryButtonInfo.InitTextEntryPopup(
+                generateButton.addedTo,
+                string.Empty,
+                entry => true,
+                0,
+                null,
+                TextEntryButtonInfo.CharsetFlags.Space);
+            
+            generatePopup.Init(result ? "Seed successfully generated!" : "Seed generation failed");
+            generatePopup.gameObject.SetActive(true);
+            generating = false;
+        }
+    }
+}
\ No newline at end of file

From 81f2b5d74b3960bb570eeb30b8c45193944979ea Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 28 Jan 2024 10:00:15 -0600
Subject: [PATCH 26/63] only teleport when necessary

---
 GameOverrideManagers/RandoBossManager.cs | 10 +++++-----
 Utils/ArchipelagoMenu.cs                 |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/GameOverrideManagers/RandoBossManager.cs b/GameOverrideManagers/RandoBossManager.cs
index 84b1367..9e9aee2 100644
--- a/GameOverrideManagers/RandoBossManager.cs
+++ b/GameOverrideManagers/RandoBossManager.cs
@@ -91,11 +91,11 @@ public BossLocation(ELevel area, Vector2 pos, EBits dim)
             { "EmeraldGolem", new BossLocation(ELevel.Level_05_A_HowlingGrotto, new Vector2(560, -123), EBits.BITS_8) },
             { "QueenOfQuills", new BossLocation( ELevel.Level_07_QuillshroomMarsh, new Vector2(1100, -43), EBits.BITS_8) },
             // { "Colos_Susses", new BossLocation(ELevel.Level_08_SearingCrags, new Vector2(364, 311), EBits.BITS_8) },
-            { "Manfred", new BossLocation(ELevel.Level_11_A_CloudRuins, new Vector2(1165, -26), EBits.BITS_16)},
+            // { "Manfred", new BossLocation(ELevel.Level_11_A_CloudRuins, new Vector2(1165, -26), EBits.BITS_16)},
             // { "Tower Golem", new BossLocation(ELevel.Level_10_A_TowerOfTime, new Vector2(108, 237), EBits.BITS_16) },
-            { "DemonGeneral", new BossLocation(ELevel.Level_12_UnderWorld, new Vector2(140, -43), EBits.BITS_16) },
-            { "DemonArtificier", new BossLocation(ELevel.Level_03_ForlornTemple, new Vector2(396, -11), EBits.BITS_16)},
-            { "ButterflyMatriarch", new BossLocation(ELevel.Level_04_C_RiviereTurquoise, new Vector2(-276, 6), EBits.BITS_16) }
+            // { "DemonGeneral", new BossLocation(ELevel.Level_12_UnderWorld, new Vector2(140, -43), EBits.BITS_16) },
+            // { "DemonArtificier", new BossLocation(ELevel.Level_03_ForlornTemple, new Vector2(396, -11), EBits.BITS_16)},
+            // { "ButterflyMatriarch", new BossLocation(ELevel.Level_04_C_RiviereTurquoise, new Vector2(-276, 6), EBits.BITS_16) }
         };
 
         private static readonly List<string> BossRoomKeys = new List<string>
@@ -119,7 +119,7 @@ private static string GetVanillaBoss(string roomKey)
 
         private static void AdjustPlayerInBossRoom(string bossName)
         {
-            var newLocation = BossLocations[bossName];
+            if (!BossLocations.TryGetValue(bossName, out var newLocation)) return;
             if (Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(newLocation.BossRegion))
             {
                 Manager<PlayerManager>.Instance.Player.transform.position = newLocation.PlayerPosition;
diff --git a/Utils/ArchipelagoMenu.cs b/Utils/ArchipelagoMenu.cs
index 50f9ba1..647869f 100644
--- a/Utils/ArchipelagoMenu.cs
+++ b/Utils/ArchipelagoMenu.cs
@@ -138,7 +138,7 @@ public void InitOptionsViewWithModButtons()
                 GameObject gameObject = new GameObject();
                 ArchipelagoScreen archipelagoScreen = gameObject.AddComponent<ArchipelagoScreen>();
                 OptionScreen newScreen = Instantiate(optionScreen);
-                archipelagoScreen.name = "RandoScreen";
+                archipelagoScreen.name = "ArchipelagoScreen";
                 // Swap everything under the option screen to the mod option screen
                 // Iterate backwards so elements don't shift as lower ones are removed
                 for (int i = newScreen.transform.childCount - 1; i >= 0; i--)
@@ -245,7 +245,7 @@ public override void Init(IViewParams screenParams)
                     }
                     catch (Exception e)
                     {
-                        CourierLogger.Log(LogType.Exception, "RandoScreen",
+                        CourierLogger.Log(LogType.Exception, "ArchipelagoScreen",
                             "Image not Read/Writeable when recoloring selection frames in ModOptionScreen");
                         e.LogDetailed();
                     }
@@ -384,7 +384,7 @@ private void LateUpdate()
                     }
                     catch (Exception e)
                     {
-                        CourierLogger.Log(LogType.Exception, "RandoScreen",
+                        CourierLogger.Log(LogType.Exception, "ArchipelagoScreen",
                             "Image not Read/Writeable when recoloring selection frames in ModOptionScreen");
                         CourierLogger.LogDetailed(e);
                     }

From 8eb3916986aba3bad0339332d61597f7a1d623cf Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Mon, 29 Jan 2024 17:40:53 -0600
Subject: [PATCH 27/63] support Uri from environment args

---
 APRandomizerMain.cs                        | 32 ++++++++++--
 Archipelago/ArchipelagoClient.cs           | 59 +++++++++++++++++++---
 GameOverrideManagers/RandoBossManager.cs   |  4 +-
 GameOverrideManagers/RandoLevelManager.cs  |  6 +++
 GameOverrideManagers/RandoPortalManager.cs | 38 ++++++++++++++
 MessengerRando.csproj                      |  4 ++
 Utils/RandomizerStateManager.cs            | 47 ++++++++++++-----
 7 files changed, 165 insertions(+), 25 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 4535c27..1087ddc 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using Archipelago.MultiClient.Net;
 using Archipelago.MultiClient.Net.Enums;
 using Archipelago.MultiClient.Net.Packets;
 using MessengerRando.Archipelago;
@@ -231,7 +232,7 @@ void BuildArchipelagoMenu()
                 ArchipelagoMenu.ArchipelagoCollectButton.IsEnabled = ArchipelagoClient.CanCollect;
             }
 
-            BuildRandoMenu();
+            // BuildRandoMenu();
 
             void BuildRandoMenu()
             {
@@ -369,7 +370,9 @@ void BuildHintMenu()
                 (orig, self, bossName) => RandoBossManager.SetBossAsDefeated(bossName);
             // level teleporting etc management
             On.Level.ChangeRoom += RandoRoomManager.Level_ChangeRoom;
+            On.LevelManager.EndLevelLoading += RandoLevelManager.EndLevelLoading;
             // On.PortalOpeningCutscene.OnOpenPortalEvent += RandoPortalManager.OpenPortalEvent;
+            On.TotHQ.LeaveToLevel += RandoPortalManager.LeaveHQ;
             //These functions let us override and manage power seals ourselves with 'fake' items
             On.ProgressionManager.TotalPowerSealCollected += ProgressionManager_TotalPowerSealCollected;
             On.ShopChestOpenCutscene.OnChestOpened += (orig, self) =>
@@ -386,8 +389,6 @@ void BuildHintMenu()
             // On.MegaTimeShard.ReceiveHit += RandoTimeShardManager.ReceiveHit;
             On.MegaTimeShard.OnBreakDone += MegaTimeShard_OnBreakDone;
             On.DialogSequence.GetDialogList += DialogSequence_GetDialogList;
-            On.LevelManager.EndLevelLoading += RandoLevelManager.EndLevelLoading;
-            On.TotHQ.LeaveToLevel += RandoPortalManager.LeaveHQ;
             On.Cutscene.Play += Cutscene_Play;
             //temp add
             #if DEBUG
@@ -626,6 +627,31 @@ void SaveGameSelectionScreen_OnNewGame(On.SaveGameSelectionScreen.orig_OnNewGame
         {
             if (ArchipelagoClient.Authenticated)
                 RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
+            else if (Environment.GetCommandLineArgs().Length > 0)
+            {
+                Console.WriteLine("loading new game save... found command line args");
+                foreach (var arg in Environment.GetCommandLineArgs())
+                {
+                    Console.WriteLine(arg);
+                    if (!arg.MaybeUri()) continue;
+                    var uri = arg.ToUri();
+                    ArchipelagoClient.ServerData = new ArchipelagoData();
+                    var userInfo = uri.UserInfo.Split(':');
+                    ArchipelagoClient.ServerData.SlotName = userInfo[0];
+                    ArchipelagoClient.ServerData.Password = userInfo[1];
+                    ArchipelagoClient.ServerData.Uri = uri.Host;
+                    ArchipelagoClient.ServerData.Port = uri.Port;
+                    var result = ArchipelagoClient.Connect(uri);
+                    if (result == "success")
+                    {
+                        RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
+                        return;
+                    }
+                    break;
+                }
+
+                orig(self, slot);
+            }
             else
                 orig(self, slot);
         }
diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
index 86a1732..36bcd76 100644
--- a/Archipelago/ArchipelagoClient.cs
+++ b/Archipelago/ArchipelagoClient.cs
@@ -92,24 +92,67 @@ private static void OnConnected(string outputText, SubMenuButtonInfo connectButt
         private static ArchipelagoSession CreateSession()
         {
             var session = ArchipelagoSessionFactory.CreateSession(ServerData.Uri, ServerData.Port);
+            SetupSession(session);
+            return session;
+        }
+
+        private static ArchipelagoSession CreateSession(Uri uri)
+        {
+            var session = ArchipelagoSessionFactory.CreateSession(uri);
+            SetupSession(session);
+            return session;
+        }
+
+        private static void SetupSession(ArchipelagoSession session)
+        {
             session.MessageLog.OnMessageReceived += OnMessageReceived;
             session.Items.ItemReceived += OnItemReceived;
             session.Socket.ErrorReceived += SessionErrorReceived;
             session.Socket.SocketClosed += SessionSocketClosed;
-            return session;
+        }
+
+        public static string Connect(Uri uri)
+        {
+            if (Authenticated) return "already connected";
+            
+            try
+            {
+                Session = CreateSession(uri);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine($"Error: {e}");
+                return e.ToString();
+            }
+
+            return TryConnect();
         }
 
         public static string Connect()
         {
             if (Authenticated) return "already connected";
+
+            try
+            {
+                Session = CreateSession();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine($"Error: {e}");
+                return e.ToString();
+            }
+
+            return TryConnect();
+        }
+
+        private static string TryConnect()
+        {
             if (ItemsAndLocationsHandler.ItemsLookup == null) ItemsAndLocationsHandler.Initialize();
             var needSlotData = ServerData.SlotData == null;
-
             LoginResult result;
 
             try
             {
-                Session = CreateSession();
                 result = Session.TryConnectAndLogin(
                     "The Messenger",
                     ServerData.SlotName,
@@ -121,11 +164,15 @@ public static string Connect()
             }
             catch (Exception e)
             {
-                Console.WriteLine($"Error: {e}");
+                Console.Write($"Error: {e}");
                 result = new LoginFailure(e.GetBaseException().Message);
             }
-            
 
+            return HandleConnectResult(result, needSlotData);
+        }
+
+        private static string HandleConnectResult(LoginResult result, bool needSlotData)
+        {
             string outputText;
             if (result.Successful)
             {
@@ -137,7 +184,7 @@ public static string Connect()
 
                 try
                 {
-                    RandomizerStateManager.InitializeMultiSeed();
+                    RandomizerStateManager.InitializeSeed();
                 }
                 catch (Exception e)
                 {
diff --git a/GameOverrideManagers/RandoBossManager.cs b/GameOverrideManagers/RandoBossManager.cs
index 9e9aee2..d44b601 100644
--- a/GameOverrideManagers/RandoBossManager.cs
+++ b/GameOverrideManagers/RandoBossManager.cs
@@ -38,9 +38,9 @@ public BossLocation(ELevel area, Vector2 pos, EBits dim)
             "EmeraldGolem",
             "QueenOfQuills",
             // "Colos_Susses",
-            // "Manfred",
+            "Manfred",
             // "TowerGolem",
-            // "DemonGeneral",
+            "DemonGeneral",
             "DemonArtificier",
             "ButterflyMatriarch",
             "ClockworkConcierge",
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index d24ff6b..5499840 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -143,6 +143,12 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
             //         return;
             //     }
             // }
+            if (self.GetCurrentLevelEnum().Equals(ELevel.Level_05_A_HowlingGrotto))
+            {
+                var progManager = Manager<ProgressionManager>.Instance;
+                progManager.levelsDiscovered.Remove(ELevel.Level_05_B_SunkenShrine);
+                progManager.allTimeDiscoveredLevels.Remove(ELevel.Level_05_B_SunkenShrine);
+            }
             if (teleporting)
             {
                 teleporting = false;
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 5eacb8e..fcc1050 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -306,6 +306,44 @@ public Portal(int portalWarp)
             "Glacial Peak - Portal",
         };
 
+        private static readonly List<string> AccessedStartingPortals = new List<string>();
+        public static bool ShouldPortalBeOpen(string portal)
+        {
+            return AccessedStartingPortals.Contains(portal);
+        }
+
+        public static void OpenPortalEvent(On.PortalOpeningCutscene.orig_OnOpenPortalEvent orig,
+            PortalOpeningCutscene self, string eventid)
+        {
+            switch (eventid)
+            {
+                case "AutumnHills":
+                    if (StartingPortals.Contains("Autumn Hills Portal"))
+                    {
+                        orig(self, eventid);
+                        AccessedStartingPortals.Add(eventid);
+                    }
+                    break;
+                case "HowlingGrotto":
+                    if (StartingPortals.Contains("Howling Grotto Portal"))
+                    {
+                        orig(self, eventid);
+                        AccessedStartingPortals.Add(eventid);
+                    }
+                    break;
+                case "GlacialPeak":
+                    if (StartingPortals.Contains("Glacial Peak Portal"))
+                    {
+                        orig(self, eventid);
+                        AccessedStartingPortals.Add(eventid);
+                    }
+                    break;
+                default:
+                    orig(self, eventid);
+                    break;
+            }
+        }
+        
         private static LevelConstants.RandoLevel GetPortalExit(string enteredPortal)
         {
             Console.WriteLine($"getting portal. entered {enteredPortal}");
diff --git a/MessengerRando.csproj b/MessengerRando.csproj
index 59e8d1b..1fb3f90 100644
--- a/MessengerRando.csproj
+++ b/MessengerRando.csproj
@@ -58,6 +58,10 @@
       <HintPath>C:\Program Files (x86)\Steam\steamapps\common\The Messenger\TheMessenger_Data\Managed\MonoMod.Utils.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="System">
+      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\The Messenger\TheMessenger_Data\Managed\System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\Archipelago.MultiClient.Net.5.0.6\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index f5d65d8..df678bd 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -46,11 +46,11 @@ public RandomizerStateManager()
                     { 2, new ArchipelagoData() },
                     { 3, new ArchipelagoData() },
                 };
-                if (ArchipelagoClient.Authenticated) InitializeMultiSeed();   
+                if (ArchipelagoClient.Authenticated) InitializeSeed();   
             } catch (Exception e) {Console.WriteLine(e);}
         }
 
-        public static void InitializeMultiSeed()
+        public static void InitializeSeed()
         {
             var slotData = ArchipelagoClient.ServerData.SlotData;
             SeenHints = new List<NetworkItem>();
@@ -83,9 +83,14 @@ public static void InitializeMultiSeed()
                 RandoPortalManager.StartingPortals = new List<string>();
                 foreach (var portal in startingPortals)
                 {
-                    var scene = $"{portal}OpeningCutscene".Replace(" ", "");
-                    Console.WriteLine(scene);
-                    RandoPortalManager.StartingPortals.Add(scene);
+                    if (portal.StartsWith("Autumn") || portal.StartsWith("Howling") || portal.StartsWith("Glacial"))
+                        RandoPortalManager.StartingPortals.Add(portal);
+                    else
+                    {
+                        var scene = $"{portal}OpeningCutscene".Replace(" ", "");
+                        Console.WriteLine(scene);
+                        RandoPortalManager.StartingPortals.Add(scene);
+                    }
                 }
 
                 var portalExits = ((JArray)slotData["portal_exits"]).ToObject<List<int>>();
@@ -99,9 +104,12 @@ public static void InitializeMultiSeed()
             {
                 RandoPortalManager.StartingPortals = new List<string>
                 {
-                    "RiviereTurquoisePortalOpeningCutscene",
-                    "SunkenShrinePortalOpeningCutscene",
-                    "SearingCragsPortalOpeningCutscene",
+                    "AutumnHillsPortal",
+                    "RiviereTurquoisePortal",
+                    "HowlingGrottoPortal",
+                    "SunkenShrinePortal",
+                    "SearingCragsPortal",
+                    "GlacialPeakPortal",
                 };
             }
         }
@@ -259,27 +267,38 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
                 // "QuibbleIntroCutscene",
                 // "TowerOfTimeBossIntroCutscene",
                 // "TowerOfTimeBossOutroCutscene",
-                "Teleport16BitsRoomCutscene",
-                "To16BitsCutscene",
-                "TowerOfTimeTeleportToCloudRuinsCutscene",
+                // "Teleport16BitsRoomCutscene",
+                // "To16BitsCutscene",
+                // "TowerOfTimeTeleportToCloudRuinsCutscene",
                 // "CloudRuinsTowerEntranceCutscene",
                 // "ManfredBossIntroCutscene",
                 // "ManfredBossOutroCutscene",
                 // "DemonGeneralBossIntroCutscene",
                 // "DemonGeneralBossOutroCutscene",
-                "UnderworldManfredEscapeCutscene",
+                // "UnderworldManfredEscapeCutscene",
                 "FutureMessengerCutscene",
                 "SecondQuestStartShopCutscene",
                 "ArmoireOpeningCutscene",
                 "DialogCutscene",
                 "GoToTotMageDialog",
                 "ProphetIntroCutscene",
-                "ExitPortalAwardMapCutscene"
+                "ProphetHeyCutscene",
+                // "PortalOpeningCutscene",
+                "ExitPortalAwardMapCutscene",
             };
             progManager.cutscenesPlayed.AddRange(skipCutscenes);
 
             if (RandoPortalManager.StartingPortals != null)
-                progManager.cutscenesPlayed.AddRange(RandoPortalManager.StartingPortals);
+            {
+                foreach (var portal in RandoPortalManager.StartingPortals.Where(
+                             portal => !portal.StartsWith("Autumn")
+                                       && !portal.StartsWith("Howling")
+                                       && !portal.StartsWith("Glacial")))
+                {
+                    var cutsceneName = $"{portal.Remove(' ')}OpeningCutscene";
+                    progManager.cutscenesPlayed.Add(cutsceneName);
+                }
+            }
             progManager.actionSequenceDone.AddRange(new []{
                 "AwardGrimplouSequence(Clone)",
                 "AwardGlidouSequence(Clone)",

From 74289fc6a69add6761214a27495acad7348f7050 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Tue, 30 Jan 2024 12:28:36 -0600
Subject: [PATCH 28/63] support exporting options, generating offline, and
 parsing the offline generated data

---
 APRandomizerMain.cs              | 45 +++++++++++++++++----
 Archipelago/ArchipelagoClient.cs |  1 +
 Archipelago/ArchipelagoData.cs   |  2 +
 Utils/OptionsExporter.cs         | 50 +++++++++++++++++++++++-
 Utils/RandoMenu.cs               |  2 +
 Utils/RandoSave.cs               | 15 ++++---
 Utils/RandomizerOptions.cs       | 67 +++++++++++++++++++++++---------
 Utils/RandomizerStateManager.cs  | 30 ++++++++++++++
 Utils/SeedGenerator.cs           | 62 ++++++++++++++++++++++++++++-
 9 files changed, 239 insertions(+), 35 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 1087ddc..d00d040 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -232,7 +232,7 @@ void BuildArchipelagoMenu()
                 ArchipelagoMenu.ArchipelagoCollectButton.IsEnabled = ArchipelagoClient.CanCollect;
             }
 
-            // BuildRandoMenu();
+            BuildRandoMenu();
 
             void BuildRandoMenu()
             {
@@ -242,6 +242,14 @@ void BuildRandoMenu()
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.NONE) &&
                     !ArchipelagoClient.HasConnected;
 
+                RandoMenu.Name = RandoMenu.RegisterTextRandoButton(
+                    () => $"Name: {RandomizerOptions.Name}",
+                    RandomizerOptions.OnNameEntry,
+                    16,
+                    () => "Enter name to be used for generation",
+                    charset: CharsetFlags.Dash | CharsetFlags.Dot | CharsetFlags.Letter |
+                             CharsetFlags.Number | CharsetFlags.Space);
+                
                 RandoMenu.SeedNumButton = RandoMenu.RegisterTextRandoButton(
                     () => $"Seed: {RandomizerOptions.Seed}",
                     RandomizerOptions.OnSeedEntry,
@@ -249,6 +257,10 @@ void BuildRandoMenu()
                     () => "Enter seed to be used for generation",
                     charset: CharsetFlags.Number);
 
+                RandoMenu.SpoilerLevel = RandoMenu.RegisterSubRandoButton(
+                    RandomizerOptions.GetSpoilerText,
+                    RandomizerOptions.ChangeSpoiler);
+                
                 RandoMenu.BlankSpaceOne = RandoMenu.RegisterSubRandoButton(null, null);
                 
                 RandoMenu.Accessibility = RandoMenu.RegisterSubRandoButton(
@@ -349,6 +361,7 @@ void BuildHintMenu()
             On.DialogCutscene.Play += DialogCutscene_Play;
             On.CatacombLevelInitializer.OnBeforeInitDone += CatacombLevelInitializer_OnBeforeInitDone;
             On.DialogManager.LoadDialogs_ELanguage += DialogChanger.LoadDialogs_Elanguage;
+            On.OptionScreen.OnEnable += OnOptionScreenEnable;
             // shop management
             On.UpgradeButtonData.GetPrice += RandoShopManager.GetPrice;
             On.BuyMoneyWrenchCutscene.OnBuyWrenchChoice += RandoShopManager.BuyMoneyWrench;
@@ -402,6 +415,12 @@ void BuildHintMenu()
             Console.WriteLine("Randomizer finished loading!");
         }
 
+        private void OnOptionScreenEnable(On.OptionScreen.orig_OnEnable orig, OptionScreen self)
+        {
+            RandoSave.TryLoad(Save.APSaveData);
+            orig(self);
+        }
+
         public override void Initialize()
         {
             #if DEBUG
@@ -625,6 +644,15 @@ void SaveGameSelectionScreen_OnLoadGame(On.SaveGameSelectionScreen.orig_OnLoadGa
 
         void SaveGameSelectionScreen_OnNewGame(On.SaveGameSelectionScreen.orig_OnNewGame orig, SaveGameSelectionScreen self, SaveSlotUI slot)
         {
+            Console.WriteLine("trying to load new game");
+            try
+            {
+                Environment.GetCommandLineArgs();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
             if (ArchipelagoClient.Authenticated)
                 RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
             else if (Environment.GetCommandLineArgs().Length > 0)
@@ -633,23 +661,26 @@ void SaveGameSelectionScreen_OnNewGame(On.SaveGameSelectionScreen.orig_OnNewGame
                 foreach (var arg in Environment.GetCommandLineArgs())
                 {
                     Console.WriteLine(arg);
-                    if (!arg.MaybeUri()) continue;
-                    var uri = arg.ToUri();
+                    if (!arg.Contains("archipelago")) continue;
+                    var uri = new Uri(arg);
                     ArchipelagoClient.ServerData = new ArchipelagoData();
                     var userInfo = uri.UserInfo.Split(':');
                     ArchipelagoClient.ServerData.SlotName = userInfo[0];
-                    ArchipelagoClient.ServerData.Password = userInfo[1];
+                    ArchipelagoClient.ServerData.Password = userInfo[1] == "None" ? "" : userInfo[1];
                     ArchipelagoClient.ServerData.Uri = uri.Host;
                     ArchipelagoClient.ServerData.Port = uri.Port;
-                    var result = ArchipelagoClient.Connect(uri);
-                    if (result == "success")
+                    Console.WriteLine(ArchipelagoClient.ServerData.SlotName);
+                    Console.WriteLine(ArchipelagoClient.ServerData.Password);
+                    Console.WriteLine(ArchipelagoClient.ServerData.Uri);
+                    Console.WriteLine(ArchipelagoClient.ServerData.Port);
+                    var result = ArchipelagoClient.Connect();
+                    if (ArchipelagoClient.Authenticated)
                     {
                         RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
                         return;
                     }
                     break;
                 }
-
                 orig(self, slot);
             }
             else
diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
index 36bcd76..ca21b79 100644
--- a/Archipelago/ArchipelagoClient.cs
+++ b/Archipelago/ArchipelagoClient.cs
@@ -25,6 +25,7 @@ public static class ArchipelagoClient
         public static bool Authenticated;
         public static bool HasConnected;
         private static bool attemptingConnection;
+        public static bool offline;
 
         public static bool DisplayAPMessages = true;
         public static bool FilterAPMessages = true;
diff --git a/Archipelago/ArchipelagoData.cs b/Archipelago/ArchipelagoData.cs
index 60c4904..608251b 100644
--- a/Archipelago/ArchipelagoData.cs
+++ b/Archipelago/ArchipelagoData.cs
@@ -25,6 +25,7 @@ public class ArchipelagoData
         public List<long> CheckedLocations;
         public Dictionary<long, int> ReceivedItems;
         public Dictionary<long, NetworkItem> ScoutedLocations;
+        public Dictionary<long, long> LocationData;
 
         public void StartNewSeed()
         {
@@ -99,6 +100,7 @@ private bool loadData(int slot)
                 ReceivedItems = tempServerData.ReceivedItems ?? new Dictionary<long, int>();
                 RandomizerStateManager.Instance.ScoutedLocations = 
                     ScoutedLocations = tempServerData.ScoutedLocations ?? new Dictionary<long, NetworkItem>();
+                LocationData = tempServerData.LocationData;
 
                 //Attempt to connect to the server and save the new data
                 Debug.Log("Rando save found! Attempting to connect...");
diff --git a/Utils/OptionsExporter.cs b/Utils/OptionsExporter.cs
index df7abf2..a192277 100644
--- a/Utils/OptionsExporter.cs
+++ b/Utils/OptionsExporter.cs
@@ -1,5 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using Mod.Courier.UI;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using WebSocketSharp;
 
 namespace MessengerRando.Utils
 {
@@ -7,6 +13,7 @@ public static class OptionsExporter
     {
         private delegate void OnExport(bool result);
         private static bool exporting;
+        private static string messageText = "";
 
         public static void ExportAsync(SubMenuButtonInfo exportButton)
         {
@@ -23,6 +30,47 @@ private static void Export(OnExport attempt)
 
         private static bool Export()
         {
+            try
+            {
+                var playerOptions = RandomizerOptions.GetOptions();
+                var data = new JObject
+                {
+                    ["name"] = RandomizerOptions.Name.IsNullOrEmpty() ? "The Messenger" : RandomizerOptions.Name,
+                    ["description"] = $"Generated by The Messenger Randomizer AP v{ItemRandomizerUtil.GetModVersion()}",
+                    ["game"] = "The Messenger",
+                    ["The Messenger"] = new JObject(),
+                };
+                foreach (var kvp in playerOptions)
+                {
+                    if (int.TryParse(kvp.Value, out var num))
+                        data["The Messenger"][kvp.Key] = num;
+                    else
+                        data["The Messenger"][kvp.Key] = kvp.Value;
+                }
+                Console.WriteLine(data);
+                foreach (var info in data)
+                {
+                    Console.WriteLine($"{info.Key}: {info.Value}");
+                }
+
+                var folder = Directory.GetCurrentDirectory() + "\\Archipelago";
+                if (!Directory.Exists(folder))
+                    Directory.CreateDirectory(folder);
+
+                var file = folder;
+                file += RandomizerOptions.Name.IsNullOrEmpty()
+                    ? "\\The Messenger.json"
+                    : $"\\{RandomizerOptions.Name}.json";
+                if (!File.Exists(file))
+                    File.Create(file).Dispose();
+                File.WriteAllText(file, data.ToString());
+            }
+            catch (Exception e)
+            {
+                messageText = e.ToString();
+                Console.WriteLine(e);
+                return false;
+            }
             return true;
         }
 
@@ -36,7 +84,7 @@ private static void OnExported(bool result, SubMenuButtonInfo exportButton)
                 null,
                 TextEntryButtonInfo.CharsetFlags.Space);
             
-            generatePopup.Init(result ? "Options successfully exported!" : "Options export failed");
+            generatePopup.Init(result ? "Options successfully exported!" : $"Options export failed: {messageText}");
             generatePopup.gameObject.SetActive(true);
             exporting = false;
         }
diff --git a/Utils/RandoMenu.cs b/Utils/RandoMenu.cs
index 803facf..cc47402 100644
--- a/Utils/RandoMenu.cs
+++ b/Utils/RandoMenu.cs
@@ -23,7 +23,9 @@ public class RandoMenu
         public static RandoScreen randoScreen;
 
         // customizable seed input
+        public static SubMenuButtonInfo Name;
         public static SubMenuButtonInfo SeedNumButton;
+        public static SubMenuButtonInfo SpoilerLevel;
         public static SubMenuButtonInfo BlankSpaceOne;
         // options
         public static SubMenuButtonInfo Accessibility;
diff --git a/Utils/RandoSave.cs b/Utils/RandoSave.cs
index 47448a5..0a4b8bc 100644
--- a/Utils/RandoSave.cs
+++ b/Utils/RandoSave.cs
@@ -3,6 +3,7 @@
 using Mod.Courier.Save;
 using Newtonsoft.Json;
 using UnityEngine;
+using WebSocketSharp;
 
 namespace MessengerRando.Utils
 {
@@ -36,7 +37,8 @@ private static string GetSaveData()
             var output =
                 $"{RandomizerStateManager.Instance.APSave[1]}|" +
                 $"{RandomizerStateManager.Instance.APSave[2]}|" +
-                $"{RandomizerStateManager.Instance.APSave[3]}";
+                $"{RandomizerStateManager.Instance.APSave[3]}|" +
+                $"{SeedGenerator.ArchipelagoPath}";
             return output;
         }
         
@@ -53,13 +55,14 @@ public static void TryLoad(string load)
             try
             {
                 var loadedData = load.Split(SplitConst);
-                var index = 1;
-                foreach (var dataString in loadedData)
+                for (var i = 1; i < 4; i++)
                 {
-                    var loadedAPData = JsonConvert.DeserializeObject<ArchipelagoData>(dataString);
-                    RandomizerStateManager.Instance.APSave[index] = loadedAPData;
-                    index++;
+                    var loadedAPData = JsonConvert.DeserializeObject<ArchipelagoData>(loadedData[i - 1]);
+                    RandomizerStateManager.Instance.APSave[i] = loadedAPData;
                 }
+
+                if (loadedData.Length > 3 && !loadedData[3].IsNullOrEmpty())
+                    SeedGenerator.ArchipelagoPath = loadedData[3];
             }
             catch (Exception e)
             {
diff --git a/Utils/RandomizerOptions.cs b/Utils/RandomizerOptions.cs
index aac8df3..6ae24f0 100644
--- a/Utils/RandomizerOptions.cs
+++ b/Utils/RandomizerOptions.cs
@@ -5,14 +5,40 @@ namespace MessengerRando.Utils
 {
     public static class RandomizerOptions
     {
+        // name
+        public static string Name;
+        public static bool OnNameEntry(string input)
+        {
+            Name = input;
+            return true;
+        }
+        
         // seed
         public static string Seed = "";
-
         public static bool OnSeedEntry(string input)
         {
             Seed = input;
             return true;
         }
+        
+        // spoiler
+        public static int SpoilerLevel = 3;
+        private static readonly List<string> SpoilerText = new List<string>
+        {
+            "No Spoiler",
+            "Spoiler without playthrough or paths",
+            "Spoiler with playthrough",
+            "Spoiler with playthrough and paths",
+        };
+        public static string GetSpoilerText()
+        {
+            return SpoilerText[SpoilerLevel];
+        }
+        public static void ChangeSpoiler()
+        {
+            SpoilerLevel = SpoilerLevel == 3 ? 0 : SpoilerLevel + 1;
+        }
+        
         // accessibility
         private static int accessibility;
         private static readonly List<string> AccessibilityText = new List<string>
@@ -21,12 +47,10 @@ public static bool OnSeedEntry(string input)
             "Items Accessibility",
             "Minimal Accessibility",
         };
-
         public static string GetAccessibilityText()
         {
             return AccessibilityText[accessibility];
         }
-
         public static void ChangeAccessibility()
         {
             accessibility = accessibility == 2 ? 0 : accessibility + 1;
@@ -34,7 +58,6 @@ public static void ChangeAccessibility()
         
         // logic
         private static int logic;
-
         private static readonly List<string> LogicText = new List<string>
         {
             "Normal Logic",
@@ -42,12 +65,10 @@ public static void ChangeAccessibility()
             "Challenging Logic",
             "oob Logic",
         };
-
         public static string GetLogicText()
         {
             return LogicText[logic];
         }
-
         public static void ChangeLogic()
         {
             switch (logic)
@@ -74,13 +95,11 @@ public static void ChangeLogic()
         public static bool EarlyMed;
         
         // available portals
-        private static int availablePortals = 3;
-
+        private static int availablePortals = 6;
         public static string GetAvailablePortalsText()
         {
             return $"Available Portals: {availablePortals}";
         }
-
         public static void ChangeAvailablePortals()
         {
             availablePortals = availablePortals == 6 ? 3 : availablePortals + 1;
@@ -88,7 +107,6 @@ public static void ChangeAvailablePortals()
         
         // portal shuffle
         private static int portalShuffle;
-
         private static readonly List<string> PortalShuffleText = new List<string>
         {
             "No Portal Shuffle",
@@ -96,12 +114,10 @@ public static void ChangeAvailablePortals()
             "Shuffle Portals with Shops and Checkpoints",
             "Shuffle Portals Anywhere",
         };
-        
         public static string GetPortalShuffleText()
         {
             return PortalShuffleText[portalShuffle];
         }
-
         public static void ChangePortalShuffle()
         {
             portalShuffle = portalShuffle == 3 ? 0 : portalShuffle + 1;
@@ -115,12 +131,10 @@ public static void ChangePortalShuffle()
         
         // needed notes
         private static int notes = 6;
-
         public static string GetNotesText()
         {
             return $"Notes Needed for Music Box: {notes}";
         }
-
         public static void ChangeNotes()
         {
             notes = notes == 6 ? 1 : notes + 1;
@@ -128,7 +142,6 @@ public static void ChangeNotes()
         
         // total seals
         public static int TotalSeals = 85;
-
         public static bool OnTotalSealsEntry(string input)
         {
             TotalSeals = Math.Min(int.Parse(input), 85);
@@ -137,7 +150,6 @@ public static bool OnTotalSealsEntry(string input)
         
         // required seals
         public static int RequiredSeals = 100;
-
         public static bool OnRequiredSealsEntry(string input)
         {
             RequiredSeals = Math.Min(int.Parse(input), 100);
@@ -146,13 +158,30 @@ public static bool OnRequiredSealsEntry(string input)
         
         // shop price modifier
         public static int ShopPriceMod = 100;
-
         public static bool OnShopPriceModEntry(string input)
         {
             ShopPriceMod = Math.Min(int.Parse(input), 400);
             return true;
         }
-        
-        
+
+        public static Dictionary<string, string> GetOptions()
+        {
+            return new Dictionary<string, string>
+            {
+                {"accessibility", accessibility.ToString()},
+                {"logic_level", logic.ToString()},
+                {"shuffle_shards", Shards ? "true" : "false"},
+                {"limited_movement", LimMovement ? "true" : "false"},
+                {"early_meditation", EarlyMed ? "true" : "false"},
+                {"available_portals", availablePortals.ToString()},
+                {"shuffle_portals", portalShuffle.ToString()},
+                {"goal", Goal ? "1" : "0"},
+                {"music_box", MusicBox ? "true" : "false"},
+                {"notes_needed", notes.ToString()},
+                {"total_seals", TotalSeals.ToString()},
+                {"percent_seals_required", RequiredSeals.ToString()},
+                {"shop_price", ShopPriceMod.ToString()},
+            };
+        }
     }
 }
\ No newline at end of file
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index df678bd..5e4c6c5 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using Archipelago.MultiClient.Net.Models;
 using Archipelago.MultiClient.Net.Packets;
@@ -7,6 +9,8 @@
 using MessengerRando.GameOverrideManagers;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
+using WebSocketSharp;
+
 // ReSharper disable StringLiteralTypo
 // ReSharper disable CommentTypo
 
@@ -317,6 +321,32 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
             }
         }
 
+        public static void StartOfflineSeed()
+        {
+            var filePath = Directory.GetCurrentDirectory() + "\\Archipelago\\output";
+            DateTime latestTime = new DateTime();
+            string gameFile = "";
+            foreach (var file in Directory.GetFiles(filePath))
+            {
+                if (File.GetCreationTime(file) > latestTime && file.EndsWith("aptm"))
+                {
+                    latestTime = File.GetCreationTime(file);
+                    gameFile = file;
+                }
+            }
+
+            if (gameFile.IsNullOrEmpty())
+            {
+                Console.WriteLine("unable to find file");
+                return;
+            }
+
+            var gameData = (JObject)File.ReadAllText(gameFile);
+            ArchipelagoClient.ServerData = new ArchipelagoData();
+            ArchipelagoClient.ServerData.SlotData = gameData["slot_data"].ToObject<Dictionary<string, object>>();
+            ArchipelagoClient.ServerData.LocationData = gameData["loc_data"].ToObject<Dictionary<long, long>>();
+            ArchipelagoClient.HasConnected = ArchipelagoClient.offline = true;
+        }
         public static int ReceivedItemsCount()
         {
             return ArchipelagoClient.ServerData.ReceivedItems.Sum(item => item.Value);
diff --git a/Utils/SeedGenerator.cs b/Utils/SeedGenerator.cs
index 0bfc043..ae5e32d 100644
--- a/Utils/SeedGenerator.cs
+++ b/Utils/SeedGenerator.cs
@@ -1,11 +1,18 @@
 using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
 using System.Threading;
+using MessengerRando.Archipelago;
+using Microsoft.Win32;
 using Mod.Courier.UI;
+using WebSocketSharp;
 
 namespace MessengerRando.Utils
 {
     public static class SeedGenerator
     {
+        public static string ArchipelagoPath = "";
         private delegate void OnGenerateAttempt(bool result);
         private static bool generating;
 
@@ -24,7 +31,58 @@ private static void Generate(OnGenerateAttempt attempt)
 
         private static bool Generate()
         {
-            return true;
+            // find archipelago install path
+            if (ArchipelagoPath.IsNullOrEmpty())
+            {
+                var key = Registry.LocalMachine.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall");
+                var path = "";
+                foreach (var subkeyName in key.GetSubKeyNames())
+                {
+                    var subkey = key.OpenSubKey(subkeyName);
+                    var displayName = subkey.GetValue("DisplayName");
+                    if (displayName != null && displayName.ToString().Contains("Archipelago "))
+                    {
+                        Console.WriteLine(displayName);
+                        path = subkey.GetValue("InstallLocation").ToString();
+                        break;
+                    }
+                }
+                if (path.IsNullOrEmpty()) return false;
+                ArchipelagoPath = path;
+            }
+
+            var outDirectory = Directory.GetCurrentDirectory() + "\\Archipelago";
+            if (!Directory.Exists(outDirectory) || !File.Exists(outDirectory + "\\The Messenger.json"))
+                return false;
+            
+            var archipelago = new Process();
+            
+            archipelago.StartInfo.FileName = $"{ArchipelagoPath}\\ArchipelagoGenerate.exe";
+
+            var args =
+                "--multi 1 " +
+                $"--spoiler {RandomizerOptions.SpoilerLevel} " +
+                $"--player_files_path \"{outDirectory}\" " +
+                $"--outputpath \"{outDirectory}\\output\"";
+            if (!RandomizerOptions.Seed.IsNullOrEmpty())
+                args += $" --seed {RandomizerOptions.Seed}";
+            archipelago.StartInfo.Arguments = args;
+            
+            Console.WriteLine("attempting to generate...");
+            Console.WriteLine(archipelago.StartInfo.FileName);
+            Console.WriteLine(archipelago.StartInfo.Arguments);
+            
+            archipelago.Start();
+            archipelago.WaitForExit();
+            
+            Console.WriteLine(archipelago.ExitCode);
+            if (archipelago.ExitCode == 0)
+            {
+                RandomizerStateManager.StartOfflineSeed();
+                return true;
+            }
+
+            return false;
         }
 
         private static void OnGenerated(bool result, SubMenuButtonInfo generateButton)
@@ -37,7 +95,7 @@ private static void OnGenerated(bool result, SubMenuButtonInfo generateButton)
                 null,
                 TextEntryButtonInfo.CharsetFlags.Space);
             
-            generatePopup.Init(result ? "Seed successfully generated!" : "Seed generation failed");
+            generatePopup.Init(result ? "Seed successfully generated!" : "Seed generation failed.");
             generatePopup.gameObject.SetActive(true);
             generating = false;
         }

From 69844e04bab52dcaee9f79ebd03aa0916309b85c Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Tue, 30 Jan 2024 13:14:51 -0600
Subject: [PATCH 29/63] preliminary work on initializing offline seeds

---
 APRandomizerMain.cs                     | 12 +++++----
 Archipelago/ArchipelagoClient.cs        |  5 ++++
 Archipelago/ArchipelagoData.cs          |  2 +-
 Archipelago/ItemsAndLocationsHandler.cs |  6 +++++
 Utils/RandomizerStateManager.cs         | 36 ++++++++++++++++++-------
 Utils/SeedGenerator.cs                  |  1 -
 6 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index d00d040..8a68452 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -78,7 +78,7 @@ void BuildArchipelagoMenu()
                     | CharsetFlags.Number | CharsetFlags.Space);
                 ArchipelagoMenu.ArchipelagoHostButton.IsEnabled = () =>
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
-                    !ArchipelagoClient.Authenticated;
+                    (!ArchipelagoClient.Authenticated || !ArchipelagoClient.offline);
                 
                 //Add Archipelago port button
                 ArchipelagoMenu.ArchipelagoPortButton = ArchipelagoMenu.RegisterTextRandoButton(
@@ -89,7 +89,7 @@ void BuildArchipelagoMenu()
                     () => ArchipelagoClient.ServerData?.Port.ToString(),
                     CharsetFlags.Number);
                 ArchipelagoMenu.ArchipelagoPortButton.IsEnabled =
-                    () => !ArchipelagoClient.Authenticated &&
+                    () => (!ArchipelagoClient.Authenticated || !ArchipelagoClient.offline) &&
                           (Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE ||
                            (Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
                             ArchipelagoClient.HasConnected));
@@ -104,7 +104,7 @@ void BuildArchipelagoMenu()
                     | CharsetFlags.Number | CharsetFlags.Space);
                 ArchipelagoMenu.ArchipelagoNameButton.IsEnabled = () =>
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
-                    !ArchipelagoClient.Authenticated;
+                    (!ArchipelagoClient.Authenticated || !ArchipelagoClient.offline);
                 
                 //Add archipelago password button
                 ArchipelagoMenu.ArchipelagoPassButton = ArchipelagoMenu.RegisterTextRandoButton(
@@ -115,7 +115,7 @@ void BuildArchipelagoMenu()
                     () => ArchipelagoClient.ServerData?.Password);
                 ArchipelagoMenu.ArchipelagoPassButton.IsEnabled = () =>
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
-                    !ArchipelagoClient.Authenticated;
+                    (!ArchipelagoClient.Authenticated || !ArchipelagoClient.offline);
                 
                 //Add Archipelago connection button
                 ArchipelagoMenu.ArchipelagoConnectButton = ArchipelagoMenu.RegisterSubRandoButton(
@@ -123,7 +123,7 @@ void BuildArchipelagoMenu()
                     OnSelectArchipelagoConnect);
                 ArchipelagoMenu.ArchipelagoConnectButton.IsEnabled = () =>
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
-                    !ArchipelagoClient.Authenticated;
+                    (!ArchipelagoClient.Authenticated || !ArchipelagoClient.offline);
 
                 // only visible while actually in the game
                 //Add current seed number button
@@ -655,6 +655,8 @@ void SaveGameSelectionScreen_OnNewGame(On.SaveGameSelectionScreen.orig_OnNewGame
             }
             if (ArchipelagoClient.Authenticated)
                 RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
+            else if (ArchipelagoClient.offline)
+                RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
             else if (Environment.GetCommandLineArgs().Length > 0)
             {
                 Console.WriteLine("loading new game save... found command line args");
diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
index ca21b79..723c7be 100644
--- a/Archipelago/ArchipelagoClient.cs
+++ b/Archipelago/ArchipelagoClient.cs
@@ -414,6 +414,7 @@ public static void UpdateArchipelagoState()
             }
             if (!Authenticated)
             {
+                if (offline) return;
                 Console.WriteLine("Attempting to reconnect to Archipelago Server...");
                 ThreadPool.QueueUserWorkItem(_ => ConnectAsync());
                 return;
@@ -497,6 +498,10 @@ public static string UpdateStatusText()
                     text += $"\nHint points available: {Session.RoomState.HintPoints}\nHint point cost: {hintCost}";
                 }
             }
+            else if (offline)
+            {
+                text = "";
+            }
             else if (HasConnected)
             {
                 text = "Disconnected from Archipelago server.";
diff --git a/Archipelago/ArchipelagoData.cs b/Archipelago/ArchipelagoData.cs
index 608251b..33002be 100644
--- a/Archipelago/ArchipelagoData.cs
+++ b/Archipelago/ArchipelagoData.cs
@@ -25,7 +25,7 @@ public class ArchipelagoData
         public List<long> CheckedLocations;
         public Dictionary<long, int> ReceivedItems;
         public Dictionary<long, NetworkItem> ScoutedLocations;
-        public Dictionary<long, long> LocationData;
+        public Dictionary<long, Dictionary<long, string>> LocationData;
 
         public void StartNewSeed()
         {
diff --git a/Archipelago/ItemsAndLocationsHandler.cs b/Archipelago/ItemsAndLocationsHandler.cs
index d29407a..bbd22ca 100644
--- a/Archipelago/ItemsAndLocationsHandler.cs
+++ b/Archipelago/ItemsAndLocationsHandler.cs
@@ -443,6 +443,12 @@ public static void SendLocationCheck(long locationID)
                 ThreadPool.QueueUserWorkItem(o =>
                     ArchipelagoClient.Session.Locations.CompleteLocationChecksAsync(null,
                         ArchipelagoClient.ServerData.CheckedLocations.ToArray()));
+            else if (ArchipelagoClient.offline)
+            {
+                var itemToUnlock = ArchipelagoClient.ServerData.LocationData[locationID];
+                Unlock(itemToUnlock.Keys.First());
+                DialogChanger.CreateDialogBox($"Found {itemToUnlock.Values.First()}!");
+            }
             Manager<SaveManager>.Instance.SaveGame();
         }
 
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 5e4c6c5..3cd030a 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
 using System.Linq;
 using Archipelago.MultiClient.Net.Models;
 using Archipelago.MultiClient.Net.Packets;
@@ -59,7 +58,7 @@ public static void InitializeSeed()
             var slotData = ArchipelagoClient.ServerData.SlotData;
             SeenHints = new List<NetworkItem>();
 
-            if (Instance.ScoutedLocations == null || Instance.ScoutedLocations.Count < 1)
+            if ((Instance.ScoutedLocations == null || Instance.ScoutedLocations.Count < 1) && ArchipelagoClient.Authenticated)
             {
                 var index = ItemsAndLocationsHandler.BaseOffset;
                 var scoutIDs = new List<long>();
@@ -168,7 +167,9 @@ public bool IsLocationRandomized(EItems vanillaLocationItem, out long locationID
                     ItemsAndLocationsHandler.LocationFromEItem(vanillaLocationItem);
                 if (locationID == 0) return false;
                 Console.WriteLine($"Checking if {vanillaLocationItem}, id: {locationID} is randomized.");
-                return ArchipelagoClient.Session.Locations.AllLocations.Contains(locationID);
+                return ArchipelagoClient.offline
+                    ? ArchipelagoClient.ServerData.LocationData.ContainsKey(locationID)
+                    : ArchipelagoClient.Session.Locations.AllLocations.Contains(locationID);
             }
             catch (Exception e)
             {
@@ -190,8 +191,9 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
             var saveManager = Manager<SaveManager>.Instance;
             saveManager.SelectSaveGameSlot(slot);
             saveManager.NewGame();
-            saveManager.GetCurrentSaveGameSlot().SlotName =
-                ArchipelagoClient.Session.Players.GetPlayerAlias(ArchipelagoClient.Session.ConnectionInfo.Slot);
+            saveManager.GetCurrentSaveGameSlot().SlotName = ArchipelagoClient.offline
+                ? RandomizerOptions.Name.IsNullOrEmpty() ? "The Messenger" : RandomizerOptions.Name
+                : ArchipelagoClient.Session.Players.GetPlayerAlias(ArchipelagoClient.Session.ConnectionInfo.Slot);
             // add everything to the various managers that we need for our save slot, following the order in SaveGameSlot.UpdateSaveGameData()
             var progManager = Manager<ProgressionManager>.Instance;
             progManager.lastSaveTime = Time.time;
@@ -341,11 +343,25 @@ public static void StartOfflineSeed()
                 return;
             }
 
-            var gameData = (JObject)File.ReadAllText(gameFile);
-            ArchipelagoClient.ServerData = new ArchipelagoData();
-            ArchipelagoClient.ServerData.SlotData = gameData["slot_data"].ToObject<Dictionary<string, object>>();
-            ArchipelagoClient.ServerData.LocationData = gameData["loc_data"].ToObject<Dictionary<long, long>>();
-            ArchipelagoClient.HasConnected = ArchipelagoClient.offline = true;
+            try
+            {
+                var fileData = File.ReadAllText(gameFile);
+                Console.WriteLine(fileData.GetType());
+                var gameData = JObject.Parse(fileData);
+                Console.WriteLine("Creating new server data");
+                ArchipelagoClient.ServerData = new ArchipelagoData();
+                Console.WriteLine("casting slot data");
+                ArchipelagoClient.ServerData.SlotData = gameData["slot_data"].ToObject<Dictionary<string, object>>();
+                Console.WriteLine("casting loc data");
+                ArchipelagoClient.ServerData.LocationData =
+                    gameData["loc_data"].ToObject<Dictionary<long, Dictionary<long, string>>>();
+                ArchipelagoClient.HasConnected = ArchipelagoClient.offline = true;
+                InitializeSeed();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
         }
         public static int ReceivedItemsCount()
         {
diff --git a/Utils/SeedGenerator.cs b/Utils/SeedGenerator.cs
index ae5e32d..b9dee8c 100644
--- a/Utils/SeedGenerator.cs
+++ b/Utils/SeedGenerator.cs
@@ -20,7 +20,6 @@ public static void GenerateAsync(SubMenuButtonInfo generateButton)
         {
             if (generating) return;
             generating = true;
-            Console.WriteLine("Attempting to generate");
             Generate(result => OnGenerated(result, generateButton));
         }
 

From adb569ec49abc8811b8c52bbf16b739ab7780d79 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Tue, 30 Jan 2024 16:59:21 -0600
Subject: [PATCH 30/63] finish offline seed handling

---
 APRandomizerMain.cs                       | 12 ++++++++++-
 Archipelago/ArchipelagoData.cs            | 11 +++++++---
 GameOverrideManagers/RandoLevelManager.cs | 19 +++++++++++------
 Utils/RandoSave.cs                        |  2 +-
 Utils/RandomizerStateManager.cs           | 26 +++++++++++++----------
 5 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 8a68452..5ac3289 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -656,7 +656,16 @@ void SaveGameSelectionScreen_OnNewGame(On.SaveGameSelectionScreen.orig_OnNewGame
             if (ArchipelagoClient.Authenticated)
                 RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
             else if (ArchipelagoClient.offline)
-                RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
+            {
+                try
+                {
+                    RandomizerStateManager.InitializeNewSecondQuest(self, slot.slotIndex);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e);
+                }
+            }
             else if (Environment.GetCommandLineArgs().Length > 0)
             {
                 Console.WriteLine("loading new game save... found command line args");
@@ -712,6 +721,7 @@ void PauseScreen_OnQuitToTitle(On.BackToTitleScreen.orig_GoBackToTitleScreen ori
             {
                 ArchipelagoClient.Disconnect();
                 ArchipelagoClient.HasConnected = false;
+                ArchipelagoClient.offline = false;
                 RandoBossManager.DefeatedBosses = new List<string>();
                 Manager<ProgressionManager>.Instance.powerSealTotal = 0;
             }
diff --git a/Archipelago/ArchipelagoData.cs b/Archipelago/ArchipelagoData.cs
index 33002be..f6648ad 100644
--- a/Archipelago/ArchipelagoData.cs
+++ b/Archipelago/ArchipelagoData.cs
@@ -35,7 +35,6 @@ public void StartNewSeed()
             DefeatedBosses = new List<string>();
             CheckedLocations = new List<long>();
             ReceivedItems = new Dictionary<long, int>();
-            //if we aren't able to create a save file fail here
         }
         
         public override string ToString()
@@ -100,10 +99,16 @@ private bool loadData(int slot)
                 ReceivedItems = tempServerData.ReceivedItems ?? new Dictionary<long, int>();
                 RandomizerStateManager.Instance.ScoutedLocations = 
                     ScoutedLocations = tempServerData.ScoutedLocations ?? new Dictionary<long, NetworkItem>();
-                LocationData = tempServerData.LocationData;
+                LocationData = tempServerData.LocationData ?? new Dictionary<long, Dictionary<long, string>>();
 
                 //Attempt to connect to the server and save the new data
-                Debug.Log("Rando save found! Attempting to connect...");
+                Console.WriteLine("Rando save found!");
+                if (LocationData != null && LocationData.Count > 0)
+                {
+                    Console.WriteLine("continuing offline seed");
+                    RandomizerStateManager.InitializeSeed();
+                    return ArchipelagoClient.HasConnected = ArchipelagoClient.offline = true;
+                }
                 ArchipelagoClient.Connect();
                 if (ArchipelagoClient.ItemQueue.Count > 0 && Index > 0)
                 {
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index 5499840..86ac413 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -153,13 +153,16 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
             {
                 teleporting = false;
                 // put the region we just loaded into in AP data storage for tracking
-                if (self.lastLevelLoaded.Equals(ELevel.Level_13_TowerOfTimeHQ + "_Build"))
-                    ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
-                        ELevel.Level_13_TowerOfTimeHQ.ToString();
-                else
-                    ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
-                        self.GetCurrentLevelEnum().ToString();
-                return;
+                if (ArchipelagoClient.Authenticated)
+                {
+                    if (self.lastLevelLoaded.Equals(ELevel.Level_13_TowerOfTimeHQ + "_Build"))
+                        ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
+                            ELevel.Level_13_TowerOfTimeHQ.ToString();
+                    else
+                        ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
+                            self.GetCurrentLevelEnum().ToString();
+                    return;
+                }
             }
             
             if (Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.Level_11_B_MusicBox) &&
@@ -191,6 +194,8 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
                     oldLevel.Dimension
                     );
             }
+
+            if (!ArchipelagoClient.Authenticated) return;
             // put the region we just loaded into in AP data storage for tracking
             if (self.lastLevelLoaded.Equals(ELevel.Level_13_TowerOfTimeHQ + "_Build"))
                 ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
diff --git a/Utils/RandoSave.cs b/Utils/RandoSave.cs
index 0a4b8bc..70917fd 100644
--- a/Utils/RandoSave.cs
+++ b/Utils/RandoSave.cs
@@ -22,7 +22,7 @@ public void Update()
             RandomizerStateManager.Instance.APSave[RandomizerStateManager.Instance.CurrentFileSlot] =
                 ArchipelagoClient.ServerData;
 
-            if (ArchipelagoClient.Authenticated && RandomizerStateManager.IsSafeTeleportState())
+            if (ArchipelagoClient.Authenticated)
                 ArchipelagoClient.SyncLocations();
             APSaveData = GetSaveData();
         }
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 3cd030a..6a1b766 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -86,21 +86,15 @@ public static void InitializeSeed()
                 RandoPortalManager.StartingPortals = new List<string>();
                 foreach (var portal in startingPortals)
                 {
-                    if (portal.StartsWith("Autumn") || portal.StartsWith("Howling") || portal.StartsWith("Glacial"))
-                        RandoPortalManager.StartingPortals.Add(portal);
-                    else
-                    {
-                        var scene = $"{portal}OpeningCutscene".Replace(" ", "");
-                        Console.WriteLine(scene);
-                        RandoPortalManager.StartingPortals.Add(scene);
-                    }
+                    Console.WriteLine(portal);
+                    RandoPortalManager.StartingPortals.Add(portal);
                 }
 
                 var portalExits = ((JArray)slotData["portal_exits"]).ToObject<List<int>>();
                 RandoPortalManager.PortalMapping = new List<RandoPortalManager.Portal>();
-                for (int i = 0; i < 5; i++)
+                foreach (var portalExit in portalExits)
                 {
-                    RandoPortalManager.PortalMapping.Add(new RandoPortalManager.Portal(portalExits[i]));
+                    RandoPortalManager.PortalMapping.Add(new RandoPortalManager.Portal(portalExit));
                 }
             }
             else
@@ -301,7 +295,7 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
                                        && !portal.StartsWith("Howling")
                                        && !portal.StartsWith("Glacial")))
                 {
-                    var cutsceneName = $"{portal.Remove(' ')}OpeningCutscene";
+                    var cutsceneName = $"{portal.Replace(" ", "")}OpeningCutscene";
                     progManager.cutscenesPlayed.Add(cutsceneName);
                 }
             }
@@ -325,6 +319,8 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
 
         public static void StartOfflineSeed()
         {
+            if (ItemsAndLocationsHandler.ItemsLookup == null)
+                ItemsAndLocationsHandler.Initialize();
             var filePath = Directory.GetCurrentDirectory() + "\\Archipelago\\output";
             DateTime latestTime = new DateTime();
             string gameFile = "";
@@ -350,6 +346,14 @@ public static void StartOfflineSeed()
                 var gameData = JObject.Parse(fileData);
                 Console.WriteLine("Creating new server data");
                 ArchipelagoClient.ServerData = new ArchipelagoData();
+                ArchipelagoClient.ServerData.StartNewSeed();
+                var fileNameParts = gameFile.Split('_');
+                foreach (var part in fileNameParts)
+                {
+                    if (!double.TryParse(part, out var num)) continue;
+                    ArchipelagoClient.ServerData.SeedName = part;
+                    break;
+                }
                 Console.WriteLine("casting slot data");
                 ArchipelagoClient.ServerData.SlotData = gameData["slot_data"].ToObject<Dictionary<string, object>>();
                 Console.WriteLine("casting loc data");

From 471ed18c7ceb0d61aec513ce374e34148a3f71ca Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Tue, 30 Jan 2024 18:37:24 -0600
Subject: [PATCH 31/63] fix bugs and set default name to Ninja

---
 APRandomizerMain.cs             |  2 +-
 Archipelago/ArchipelagoData.cs  |  1 +
 Utils/OptionsExporter.cs        | 14 ++++++--------
 Utils/RandomizerOptions.cs      |  2 +-
 Utils/RandomizerStateManager.cs |  4 ++--
 Utils/SeedGenerator.cs          |  2 +-
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 5ac3289..c85d922 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -793,7 +793,7 @@ void Cutscene_Play(On.Cutscene.orig_Play orig, Cutscene self)
 #if DEBUG
             Console.WriteLine($"Playing cutscene: {eventName}");
 #endif
-            if (ArchipelagoClient.EventsICareAbout.Contains(eventName))
+            if (ArchipelagoClient.EventsICareAbout.Contains(eventName) && ArchipelagoClient.Authenticated)
             {
                 ArchipelagoClient.Session.DataStorage[Scope.Slot, "Events"] +=
                     new List<string> { eventName };
diff --git a/Archipelago/ArchipelagoData.cs b/Archipelago/ArchipelagoData.cs
index f6648ad..2c172e5 100644
--- a/Archipelago/ArchipelagoData.cs
+++ b/Archipelago/ArchipelagoData.cs
@@ -99,6 +99,7 @@ private bool loadData(int slot)
                 ReceivedItems = tempServerData.ReceivedItems ?? new Dictionary<long, int>();
                 RandomizerStateManager.Instance.ScoutedLocations = 
                     ScoutedLocations = tempServerData.ScoutedLocations ?? new Dictionary<long, NetworkItem>();
+                SlotData = tempServerData.SlotData;
                 LocationData = tempServerData.LocationData ?? new Dictionary<long, Dictionary<long, string>>();
 
                 //Attempt to connect to the server and save the new data
diff --git a/Utils/OptionsExporter.cs b/Utils/OptionsExporter.cs
index a192277..d4eed0c 100644
--- a/Utils/OptionsExporter.cs
+++ b/Utils/OptionsExporter.cs
@@ -35,7 +35,7 @@ private static bool Export()
                 var playerOptions = RandomizerOptions.GetOptions();
                 var data = new JObject
                 {
-                    ["name"] = RandomizerOptions.Name.IsNullOrEmpty() ? "The Messenger" : RandomizerOptions.Name,
+                    ["name"] = RandomizerOptions.Name,
                     ["description"] = $"Generated by The Messenger Randomizer AP v{ItemRandomizerUtil.GetModVersion()}",
                     ["game"] = "The Messenger",
                     ["The Messenger"] = new JObject(),
@@ -48,19 +48,17 @@ private static bool Export()
                         data["The Messenger"][kvp.Key] = kvp.Value;
                 }
                 Console.WriteLine(data);
-                foreach (var info in data)
-                {
-                    Console.WriteLine($"{info.Key}: {info.Value}");
-                }
 
                 var folder = Directory.GetCurrentDirectory() + "\\Archipelago";
                 if (!Directory.Exists(folder))
                     Directory.CreateDirectory(folder);
 
+                foreach (var oldFile in Directory.GetFiles(folder))
+                {
+                    File.Delete(oldFile);
+                }
                 var file = folder;
-                file += RandomizerOptions.Name.IsNullOrEmpty()
-                    ? "\\The Messenger.json"
-                    : $"\\{RandomizerOptions.Name}.json";
+                file += $"\\{RandomizerOptions.Name}.json";
                 if (!File.Exists(file))
                     File.Create(file).Dispose();
                 File.WriteAllText(file, data.ToString());
diff --git a/Utils/RandomizerOptions.cs b/Utils/RandomizerOptions.cs
index 6ae24f0..7053589 100644
--- a/Utils/RandomizerOptions.cs
+++ b/Utils/RandomizerOptions.cs
@@ -6,7 +6,7 @@ namespace MessengerRando.Utils
     public static class RandomizerOptions
     {
         // name
-        public static string Name;
+        public static string Name = "Ninja";
         public static bool OnNameEntry(string input)
         {
             Name = input;
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 6a1b766..f0b2816 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -186,7 +186,7 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
             saveManager.SelectSaveGameSlot(slot);
             saveManager.NewGame();
             saveManager.GetCurrentSaveGameSlot().SlotName = ArchipelagoClient.offline
-                ? RandomizerOptions.Name.IsNullOrEmpty() ? "The Messenger" : RandomizerOptions.Name
+                ? RandomizerOptions.Name
                 : ArchipelagoClient.Session.Players.GetPlayerAlias(ArchipelagoClient.Session.ConnectionInfo.Slot);
             // add everything to the various managers that we need for our save slot, following the order in SaveGameSlot.UpdateSaveGameData()
             var progManager = Manager<ProgressionManager>.Instance;
@@ -344,7 +344,6 @@ public static void StartOfflineSeed()
                 var fileData = File.ReadAllText(gameFile);
                 Console.WriteLine(fileData.GetType());
                 var gameData = JObject.Parse(fileData);
-                Console.WriteLine("Creating new server data");
                 ArchipelagoClient.ServerData = new ArchipelagoData();
                 ArchipelagoClient.ServerData.StartNewSeed();
                 var fileNameParts = gameFile.Split('_');
@@ -357,6 +356,7 @@ public static void StartOfflineSeed()
                 Console.WriteLine("casting slot data");
                 ArchipelagoClient.ServerData.SlotData = gameData["slot_data"].ToObject<Dictionary<string, object>>();
                 Console.WriteLine("casting loc data");
+                Console.WriteLine(gameData["loc_data"].GetType());
                 ArchipelagoClient.ServerData.LocationData =
                     gameData["loc_data"].ToObject<Dictionary<long, Dictionary<long, string>>>();
                 ArchipelagoClient.HasConnected = ArchipelagoClient.offline = true;
diff --git a/Utils/SeedGenerator.cs b/Utils/SeedGenerator.cs
index b9dee8c..e0fa755 100644
--- a/Utils/SeedGenerator.cs
+++ b/Utils/SeedGenerator.cs
@@ -51,7 +51,7 @@ private static bool Generate()
             }
 
             var outDirectory = Directory.GetCurrentDirectory() + "\\Archipelago";
-            if (!Directory.Exists(outDirectory) || !File.Exists(outDirectory + "\\The Messenger.json"))
+            if (!Directory.Exists(outDirectory) || Directory.GetFiles(outDirectory).Length <= 0)
                 return false;
             
             var archipelago = new Process();

From 981ac3336e7ab92b2efb1338fb70b850fa642681 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Tue, 30 Jan 2024 20:55:29 -0600
Subject: [PATCH 32/63] default music box on, skip yaml files for the exporter
 deletion, and attempt to handle stdin/out/err

---
 Utils/OptionsExporter.cs   | 3 ++-
 Utils/RandomizerOptions.cs | 2 +-
 Utils/SeedGenerator.cs     | 7 ++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Utils/OptionsExporter.cs b/Utils/OptionsExporter.cs
index d4eed0c..420e93a 100644
--- a/Utils/OptionsExporter.cs
+++ b/Utils/OptionsExporter.cs
@@ -55,7 +55,8 @@ private static bool Export()
 
                 foreach (var oldFile in Directory.GetFiles(folder))
                 {
-                    File.Delete(oldFile);
+                    if (oldFile.EndsWith("json"))
+                        File.Delete(oldFile);
                 }
                 var file = folder;
                 file += $"\\{RandomizerOptions.Name}.json";
diff --git a/Utils/RandomizerOptions.cs b/Utils/RandomizerOptions.cs
index 7053589..bd7750e 100644
--- a/Utils/RandomizerOptions.cs
+++ b/Utils/RandomizerOptions.cs
@@ -127,7 +127,7 @@ public static void ChangePortalShuffle()
         public static bool Goal;
         
         // music box gauntlet
-        public static bool MusicBox;
+        public static bool MusicBox = true;
         
         // needed notes
         private static int notes = 6;
diff --git a/Utils/SeedGenerator.cs b/Utils/SeedGenerator.cs
index e0fa755..4159c35 100644
--- a/Utils/SeedGenerator.cs
+++ b/Utils/SeedGenerator.cs
@@ -66,7 +66,12 @@ private static bool Generate()
             if (!RandomizerOptions.Seed.IsNullOrEmpty())
                 args += $" --seed {RandomizerOptions.Seed}";
             archipelago.StartInfo.Arguments = args;
-            
+            // archipelago.StartInfo.UseShellExecute = false;
+            // archipelago.StartInfo.RedirectStandardInput = true;
+            // archipelago.StartInfo.RedirectStandardOutput = true;
+            // archipelago.OutputDataReceived += (sender, e) => Console.WriteLine(e.Data);
+            // archipelago.StartInfo.RedirectStandardError = true;
+            // archipelago.ErrorDataReceived += (sender, e) => Console.WriteLine(e.Data);
             Console.WriteLine("attempting to generate...");
             Console.WriteLine(archipelago.StartInfo.FileName);
             Console.WriteLine(archipelago.StartInfo.Arguments);

From 11984d2529a1c59da5b46f99f5e0953cb7b56fae Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Tue, 30 Jan 2024 21:29:49 -0600
Subject: [PATCH 33/63] also don't generte if there's multiple files

---
 Utils/SeedGenerator.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Utils/SeedGenerator.cs b/Utils/SeedGenerator.cs
index 4159c35..200921b 100644
--- a/Utils/SeedGenerator.cs
+++ b/Utils/SeedGenerator.cs
@@ -51,7 +51,8 @@ private static bool Generate()
             }
 
             var outDirectory = Directory.GetCurrentDirectory() + "\\Archipelago";
-            if (!Directory.Exists(outDirectory) || Directory.GetFiles(outDirectory).Length <= 0)
+            if (!Directory.Exists(outDirectory) || Directory.GetFiles(outDirectory).Length <= 0 ||
+                Directory.GetFiles(outDirectory).Length > 1)
                 return false;
             
             var archipelago = new Process();

From 945559f9205f6e72f567cce261476e7428799c3a Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Wed, 31 Jan 2024 12:28:24 -0600
Subject: [PATCH 34/63] fix a searing crags coordinate and the queue bs again

---
 Archipelago/ArchipelagoData.cs             | 13 ++++++-------
 GameOverrideManagers/RandoPortalManager.cs |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Archipelago/ArchipelagoData.cs b/Archipelago/ArchipelagoData.cs
index 2c172e5..1b7fa12 100644
--- a/Archipelago/ArchipelagoData.cs
+++ b/Archipelago/ArchipelagoData.cs
@@ -57,6 +57,7 @@ private bool loadData(int slot)
                 return false;
             try
             {
+                var i = 0;
                 if (ArchipelagoClient.Authenticated)
                 {
                     //we're already connected to an archipelago server so check if the file is valid
@@ -75,9 +76,9 @@ private bool loadData(int slot)
                         ThreadPool.QueueUserWorkItem(o =>
                             ArchipelagoClient.Session.Locations.CompleteLocationChecksAsync(null,
                                 CheckedLocations.ToArray()));
-                        if (ArchipelagoClient.ItemQueue.Count <= 0 || Index <= 0) return true;
-                        for (var i = 0; i < Index; i++)
+                        while (ArchipelagoClient.ItemQueue.Count > 0 && i < Index)
                         {
+                            i += 1;
                             ArchipelagoClient.ItemQueue.Dequeue();
                         }
                         return true;
@@ -111,12 +112,10 @@ private bool loadData(int slot)
                     return ArchipelagoClient.HasConnected = ArchipelagoClient.offline = true;
                 }
                 ArchipelagoClient.Connect();
-                if (ArchipelagoClient.ItemQueue.Count > 0 && Index > 0)
+                while (ArchipelagoClient.ItemQueue.Count > 0 && i < Index)
                 {
-                    for (var i = 0; i < Index; i++)
-                    {
-                        ArchipelagoClient.ItemQueue.Dequeue();
-                    }
+                    i += 1;
+                    ArchipelagoClient.ItemQueue.Dequeue();
                 }
                 return ArchipelagoClient.HasConnected = true;
             }
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index fcc1050..6e0997a 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -173,7 +173,7 @@ public Portal(int portalWarp)
                     new List<LevelConstants.RandoLevel>
                     {
                         new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(109.5f, 63)),
-                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(296.5f, 190.5f), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_08_SearingCrags, new Vector3(296.5f, 189f), EBits.BITS_8),
                     }
                 },
                 new List<List<LevelConstants.RandoLevel>>

From e652f29a73ae55ac91af2192e2f199f741601fcb Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Wed, 31 Jan 2024 12:55:53 -0600
Subject: [PATCH 35/63] clear out portal and entrance info on quitting to title

---
 APRandomizerMain.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index c85d922..073bd22 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -10,6 +10,7 @@
 using MessengerRando.Overrides;
 using MessengerRando.RO;
 using MessengerRando.Utils;
+using MessengerRando.Utils.Constants;
 using Mod.Courier;
 using Mod.Courier.Module;
 using MonoMod.Cil;
@@ -723,6 +724,10 @@ void PauseScreen_OnQuitToTitle(On.BackToTitleScreen.orig_GoBackToTitleScreen ori
                 ArchipelagoClient.HasConnected = false;
                 ArchipelagoClient.offline = false;
                 RandoBossManager.DefeatedBosses = new List<string>();
+                RandoPortalManager.StartingPortals = new List<string>();
+                RandoPortalManager.PortalMapping = new List<RandoPortalManager.Portal>();
+                RandoLevelManager.RandoLevelMapping =
+                    new Dictionary<LevelConstants.RandoLevel, LevelConstants.RandoLevel>();
                 Manager<ProgressionManager>.Instance.powerSealTotal = 0;
             }
             randoStateManager = new RandomizerStateManager();

From 2690418ade03861c757125498a1bd54f05de8242 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sat, 3 Feb 2024 23:09:06 -0600
Subject: [PATCH 36/63] prevent hard crashing on non linux clicking the
 generate button

---
 Utils/SeedGenerator.cs | 24 ++++++++++++++++--------
 courier.toml           |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Utils/SeedGenerator.cs b/Utils/SeedGenerator.cs
index 200921b..a82045b 100644
--- a/Utils/SeedGenerator.cs
+++ b/Utils/SeedGenerator.cs
@@ -33,19 +33,27 @@ private static bool Generate()
             // find archipelago install path
             if (ArchipelagoPath.IsNullOrEmpty())
             {
-                var key = Registry.LocalMachine.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall");
                 var path = "";
-                foreach (var subkeyName in key.GetSubKeyNames())
+                try
                 {
-                    var subkey = key.OpenSubKey(subkeyName);
-                    var displayName = subkey.GetValue("DisplayName");
-                    if (displayName != null && displayName.ToString().Contains("Archipelago "))
+                    var key = Registry.LocalMachine.OpenSubKey(
+                        "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall");
+                    foreach (var subkeyName in key.GetSubKeyNames())
                     {
-                        Console.WriteLine(displayName);
-                        path = subkey.GetValue("InstallLocation").ToString();
-                        break;
+                        var subkey = key.OpenSubKey(subkeyName);
+                        var displayName = subkey.GetValue("DisplayName");
+                        if (displayName != null && displayName.ToString().Contains("Archipelago "))
+                        {
+                            Console.WriteLine(displayName);
+                            path = subkey.GetValue("InstallLocation").ToString();
+                            break;
+                        }
                     }
                 }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e);
+                }
                 if (path.IsNullOrEmpty()) return false;
                 ArchipelagoPath = path;
             }
diff --git a/courier.toml b/courier.toml
index b3f5f60..a317660 100644
--- a/courier.toml
+++ b/courier.toml
@@ -1,5 +1,5 @@
 name = "TheMessengerRandomizerAP"
-version = "0.12.3"
+version = "0.13.0-alpha-5"
 dependencies = [
   { name = "Courier", version = "0.7.0" }
 ]

From 4530296d545da7a8c2ff9998448a9a487a0e93fa Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 4 Feb 2024 15:38:46 -0600
Subject: [PATCH 37/63] implement transition rando

---
 APRandomizerMain.cs                       |  6 ++-
 Archipelago/ArchipelagoClient.cs          |  5 --
 Archipelago/ItemsAndLocationsHandler.cs   |  3 +-
 GameOverrideManagers/RandoLevelManager.cs | 54 +++++++++++-----------
 Utils/Constants/LevelConstants.cs         | 56 +++++++++++++++++++++--
 Utils/RandoMenu.cs                        |  1 +
 Utils/RandomizerOptions.cs                | 18 ++++++++
 Utils/RandomizerStateManager.cs           | 31 +++++++++----
 8 files changed, 125 insertions(+), 49 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 073bd22..91998c5 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -291,6 +291,10 @@ void BuildRandoMenu()
                     RandomizerOptions.GetPortalShuffleText,
                     RandomizerOptions.ChangePortalShuffle);
 
+                RandoMenu.ShuffleTransitions = RandoMenu.RegisterSubRandoButton(
+                    RandomizerOptions.GetTransitionText,
+                    RandomizerOptions.ChangeTransitionShuffle);
+                
                 RandoMenu.Goal = RandoMenu.RegisterSubRandoButton(
                     () => RandomizerOptions.Goal ? "Power Seal Hunt" : "Open Music Box",
                     () => RandomizerOptions.Goal = !RandomizerOptions.Goal);
@@ -727,7 +731,7 @@ void PauseScreen_OnQuitToTitle(On.BackToTitleScreen.orig_GoBackToTitleScreen ori
                 RandoPortalManager.StartingPortals = new List<string>();
                 RandoPortalManager.PortalMapping = new List<RandoPortalManager.Portal>();
                 RandoLevelManager.RandoLevelMapping =
-                    new Dictionary<LevelConstants.RandoLevel, LevelConstants.RandoLevel>();
+                    new Dictionary<string, LevelConstants.RandoLevel>();
                 Manager<ProgressionManager>.Instance.powerSealTotal = 0;
             }
             randoStateManager = new RandomizerStateManager();
diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
index 723c7be..623b930 100644
--- a/Archipelago/ArchipelagoClient.cs
+++ b/Archipelago/ArchipelagoClient.cs
@@ -276,11 +276,6 @@ private static void OnMessageReceived(LogMessage message)
                     case ItemSendLogMessage itemSendMessage:
                         if (itemSendMessage.IsRelatedToActivePlayer)
                         {
-                            if (!ItemsAndLocationsHandler.HasDialog(itemSendMessage.Item.Location))
-                            {
-                                Console.WriteLine($"adding {itemSendMessage.Item.ToReadableString()} to dialog queue.");
-                                DialogQueue.Enqueue(itemSendMessage.Item.ToReadableString(itemSendMessage.Receiver.Alias));
-                            }
                             messageQueue.Enqueue(itemSendMessage.ToString());
                         }
                         break;
diff --git a/Archipelago/ItemsAndLocationsHandler.cs b/Archipelago/ItemsAndLocationsHandler.cs
index bbd22ca..a422737 100644
--- a/Archipelago/ItemsAndLocationsHandler.cs
+++ b/Archipelago/ItemsAndLocationsHandler.cs
@@ -447,8 +447,9 @@ public static void SendLocationCheck(long locationID)
             {
                 var itemToUnlock = ArchipelagoClient.ServerData.LocationData[locationID];
                 Unlock(itemToUnlock.Keys.First());
-                DialogChanger.CreateDialogBox($"Found {itemToUnlock.Values.First()}!");
             }
+            if (!HasDialog(locationID))
+                DialogChanger.CreateDialogBox(RandoStateManager.ScoutedLocations[locationID].ToReadableString());
             Manager<SaveManager>.Instance.SaveGame();
         }
 
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index 86ac413..1267d7b 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -16,7 +16,7 @@ public static class RandoLevelManager
         private static ELevel currentLevel;
 
         // ReSharper disable once UnassignedField.Global
-        public static Dictionary<LevelConstants.RandoLevel, LevelConstants.RandoLevel> RandoLevelMapping;
+        public static Dictionary<string, LevelConstants.RandoLevel> RandoLevelMapping;
 
         public static void LoadLevel(On.LevelManager.orig_LoadLevel orig, LevelManager self, LevelLoadingInfo levelInfo)
         {
@@ -25,10 +25,24 @@ public static void LoadLevel(On.LevelManager.orig_LoadLevel orig, LevelManager s
             Console.WriteLine($"Loading Level: {levelInfo.levelName}");
             Console.WriteLine($"Entrance ID: {levelInfo.levelEntranceId}, Dimension: {levelInfo.dimension}");
             #endif
+            try
+            {
+                if (!teleporting)
+                {
+                    lastLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
+                    var levelName = levelInfo.levelName.Contains("_Build")
+                        ? levelInfo.levelName.Replace("_Build", "")
+                        : levelInfo.levelName;
+                    currentLevel = Manager<LevelManager>.Instance.GetLevelEnumFromLevelName(levelName);
+                }
+                Console.WriteLine(lastLevel);
+                Console.WriteLine(currentLevel);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
             orig(self, levelInfo);
-            if (teleporting) return;
-            lastLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
-            currentLevel = Manager<LevelManager>.Instance.GetLevelEnumFromLevelName(levelInfo.levelName);
         }
 
         static bool WithinRange(float pos1, float pos2)
@@ -46,10 +60,14 @@ private static LevelConstants.RandoLevel FindEntrance()
                 var playerPos = Manager<PlayerManager>.Instance.Player.transform.position;
                 Console.WriteLine(lastLevel);
                 Console.WriteLine(currentLevel);
+                
+                if (RandoLevelMapping == null) return new LevelConstants.RandoLevel(ELevel.NONE, new Vector3());
+                
                 if (!LevelConstants.TransitionToEntranceName.TryGetValue(
                         new LevelConstants.Transition(lastLevel, currentLevel), out var entrance))
                     return new LevelConstants.RandoLevel(ELevel.NONE, new Vector3());
                 Console.WriteLine(entrance);
+                
                 LevelConstants.RandoLevel oldLevel = default;
                 if (LevelConstants.SpecialEntranceNames.Contains(entrance))
                 {
@@ -61,12 +79,10 @@ private static LevelConstants.RandoLevel FindEntrance()
                             if (WithinRange(playerPos.x, comparePos.x))
                             {
                                 entrance = "Howling Grotto - Right";
-                                oldLevel = LevelConstants.EntranceNameToRandoLevel[entrance];
                             }
                             else
                             {
                                 entrance = "Howling Grotto - Bottom";
-                                oldLevel = LevelConstants.EntranceNameToRandoLevel[entrance];
                             }
 
                             break;
@@ -75,12 +91,10 @@ private static LevelConstants.RandoLevel FindEntrance()
                             if (WithinRange(playerPos.x, comparePos.x))
                             {
                                 entrance = "Quillshroom Marsh - Top Left";
-                                oldLevel = LevelConstants.EntranceNameToRandoLevel[entrance];
                             }
                             else
                             {
                                 entrance = "Quillshroom Marsh - Bottom Left";
-                                oldLevel = LevelConstants.EntranceNameToRandoLevel[entrance];
                             }
 
                             break;
@@ -89,12 +103,10 @@ private static LevelConstants.RandoLevel FindEntrance()
                             if (WithinRange(playerPos.x, comparePos.x))
                             {
                                 entrance = "Quillshroom Marsh - Top Right";
-                                oldLevel = LevelConstants.EntranceNameToRandoLevel[entrance];
                             }
                             else
                             {
                                 entrance = "Quillshroom Marsh - Bottom Right";
-                                oldLevel = LevelConstants.EntranceNameToRandoLevel[entrance];
                             }
 
                             break;
@@ -103,20 +115,17 @@ private static LevelConstants.RandoLevel FindEntrance()
                             if (WithinRange(playerPos.x, comparePos.x))
                             {
                                 entrance = "Searing Crags - Left";
-                                oldLevel = LevelConstants.EntranceNameToRandoLevel[entrance];
                             }
                             else
                             {
                                 entrance = "Searing Crags - Bottom";
-                                oldLevel = LevelConstants.EntranceNameToRandoLevel[entrance];
                             }
 
                             break;
                     }
                 }
-                else LevelConstants.EntranceNameToRandoLevel.TryGetValue(entrance, out oldLevel);
-                
-                return oldLevel;
+
+                return RandoLevelMapping[entrance];
             } catch (Exception e){ Console.WriteLine(e);}
             return new LevelConstants.RandoLevel(ELevel.NONE, new Vector3());
         }
@@ -171,7 +180,7 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
                 SkipMusicBox();
                 return;
             }
-#if DEBUG
+            
             Console.WriteLine("loaded into level...");
             Console.WriteLine(self.lastLevelLoaded);
             Console.WriteLine(self.GetCurrentLevelEnum());
@@ -180,20 +189,12 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
                 // we just teleported into HQ
                 
             }
-            var oldLevel = FindEntrance();
-            if (RandoLevelMapping != null && RandoLevelMapping.TryGetValue(oldLevel, out var newLevel))
+            var newLevel = FindEntrance();
+            if (RandoLevelMapping != null && !newLevel.LevelName.Equals(ELevel.NONE))
                 TeleportInArea(
                     newLevel.LevelName,
                     newLevel.PlayerPos,
                     newLevel.Dimension);
-            else if (RandoPortalManager.PortalMapping != null && !oldLevel.Equals(ELevel.NONE))
-            {
-                TeleportInArea(
-                    oldLevel.LevelName,
-                    oldLevel.PlayerPos,
-                    oldLevel.Dimension
-                    );
-            }
 
             if (!ArchipelagoClient.Authenticated) return;
             // put the region we just loaded into in AP data storage for tracking
@@ -203,7 +204,6 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
             else
                 ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
                     self.GetCurrentLevelEnum().ToString();
-#endif
         }
         
         public static void SkipMusicBox()
diff --git a/Utils/Constants/LevelConstants.cs b/Utils/Constants/LevelConstants.cs
index 3d5a591..d3e67f2 100644
--- a/Utils/Constants/LevelConstants.cs
+++ b/Utils/Constants/LevelConstants.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 
 namespace MessengerRando.Utils.Constants
@@ -231,13 +232,13 @@ public override int GetHashCode()
                     new RandoLevel(ELevel.Level_11_B_MusicBox, new Vector3(-428, -55))
                 },
                 {
-                    "Underworld - Top Left",
+                    "Underworld - Left",
                     new RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-337.5526f, -25f), EBits.BITS_8)
                 }, // Force 8 bit
-                {
-                    "Underworld - Bottom Left",
-                    new RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-431.7626f, -57f), EBits.BITS_16)
-                }, // force 16 bit - one time and one way only - after defeating manfred - might be able to force it by calling ManfredBossOutroCutscene?
+                // {
+                //     "Underworld - Bottom Left",
+                //     new RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-431.7626f, -57f), EBits.BITS_16)
+                // }, // force 16 bit - one time and one way only - after defeating manfred - might be able to force it by calling ManfredBossOutroCutscene?
                 {
                     "Corrupted Future - Portal",
                     new RandoLevel(ELevel.Level_14_CorruptedFuture, new Vector3(-19971.98f, -20011f))
@@ -441,6 +442,11 @@ public override int GetHashCode()
                 },
             };
 
+        public static Transition TransitionFromName(string name)
+        {
+            return TransitionToEntranceName.FirstOrDefault(x => x.Value == name).Key;
+        }
+
         /// <summary>
         /// I'm doing the magic by determining where the player teleported from as that's definitely the easiest way to
         /// do this. These areas connect to each other twice so I need to use the player pos to determine which one
@@ -451,5 +457,45 @@ public override int GetHashCode()
             "Howling Grotto - Right", "Quillshroom Marsh - Left",
             "Quillshroom Marsh - Right", "Searing Crags - Left"
         };
+
+        public static readonly List<string> TransitionNames = new List<string>
+        {
+            "Ninja Village - Right",
+            "Autumn Hills - Left",
+            "Autumn Hills - Right",
+            "Autumn Hills - Bottom",
+            "Forlorn Temple - Left",
+            "Forlorn Temple - Bottom",
+            "Forlorn Temple - Right",
+            "Catacombs - Top Left",
+            "Catacombs - Right",
+            "Catacombs - Bottom",
+            "Catacombs - Bottom Left",
+            "Dark Cave - Right",
+            "Dark Cave - Left",
+            "Riviere Turquoise - Right",
+            "Howling Grotto - Left",
+            "Howling Grotto - Right",
+            "Howling Grotto - Top",
+            "Howling Grotto - Bottom",
+            "Sunken Shrine - Left",
+            "Bamboo Creek - Top Left",
+            "Bamboo Creek - Bottom Left",
+            "Bamboo Creek - Right",
+            "Quillshroom Marsh - Top Left",
+            "Quillshroom Marsh - Bottom Left",
+            "Quillshroom Marsh - Top Right",
+            "Quillshroom Marsh - Bottom Right",
+            "Searing Crags - Left",
+            "Searing Crags - Bottom",
+            "Searing Crags - Right",
+            "Searing Crags - Top",
+            "Glacial Peak - Bottom",
+            "Glacial Peak - Top",
+            "Tower HQ",
+            "Tower of Time - Left",
+            "Cloud Ruins - Left",
+            "Underworld - Left",
+        };
     }
 }
\ No newline at end of file
diff --git a/Utils/RandoMenu.cs b/Utils/RandoMenu.cs
index cc47402..7e08557 100644
--- a/Utils/RandoMenu.cs
+++ b/Utils/RandoMenu.cs
@@ -35,6 +35,7 @@ public class RandoMenu
         public static SubMenuButtonInfo EarlyMed;
         public static SubMenuButtonInfo AvailablePortals;
         public static SubMenuButtonInfo ShufflePortals;
+        public static SubMenuButtonInfo ShuffleTransitions;
         public static SubMenuButtonInfo Goal;
         public static SubMenuButtonInfo MusicBox;
         public static SubMenuButtonInfo NotesNeeded;
diff --git a/Utils/RandomizerOptions.cs b/Utils/RandomizerOptions.cs
index bd7750e..3f95d48 100644
--- a/Utils/RandomizerOptions.cs
+++ b/Utils/RandomizerOptions.cs
@@ -123,6 +123,23 @@ public static void ChangePortalShuffle()
             portalShuffle = portalShuffle == 3 ? 0 : portalShuffle + 1;
         }
         
+        // transition shuffle
+        private static int transitionShuffle;
+        private static readonly List<string> TransitionShuffleText = new List<string>
+        {
+            "No Transition Shuffle",
+            "Couple Shuffled Transitions",
+            "De-Coupled Shuffled Transitions",
+        };
+        public static string GetTransitionText()
+        {
+            return TransitionShuffleText[transitionShuffle];
+        }
+        public static void ChangeTransitionShuffle()
+        {
+            transitionShuffle = transitionShuffle == 2 ? 0 : transitionShuffle + 1;
+        }
+        
         // goal
         public static bool Goal;
         
@@ -175,6 +192,7 @@ public static Dictionary<string, string> GetOptions()
                 {"early_meditation", EarlyMed ? "true" : "false"},
                 {"available_portals", availablePortals.ToString()},
                 {"shuffle_portals", portalShuffle.ToString()},
+                {"shuffle_transitions", transitionShuffle.ToString()},
                 {"goal", Goal ? "1" : "0"},
                 {"music_box", MusicBox ? "true" : "false"},
                 {"notes_needed", notes.ToString()},
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index f0b2816..db6438a 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -6,6 +6,7 @@
 using Archipelago.MultiClient.Net.Packets;
 using MessengerRando.Archipelago;
 using MessengerRando.GameOverrideManagers;
+using MessengerRando.Utils.Constants;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
 using WebSocketSharp;
@@ -60,16 +61,9 @@ public static void InitializeSeed()
 
             if ((Instance.ScoutedLocations == null || Instance.ScoutedLocations.Count < 1) && ArchipelagoClient.Authenticated)
             {
-                var index = ItemsAndLocationsHandler.BaseOffset;
-                var scoutIDs = new List<long>();
-                foreach (var unused in DialogChanger.ItemDialogID)
-                {
-                    scoutIDs.Add(index);
-                    index++;
-                }
                 ArchipelagoClient.Session.Locations.ScoutLocationsAsync(
                     SetupScoutedLocations,
-                    scoutIDs.ToArray()
+                    ArchipelagoClient.Session.Locations.AllLocations.ToArray()
                 );
             }
 
@@ -96,6 +90,24 @@ public static void InitializeSeed()
                 {
                     RandoPortalManager.PortalMapping.Add(new RandoPortalManager.Portal(portalExit));
                 }
+
+                if (slotData.TryGetValue("transitions", out var transitions))
+                {
+                    RandoLevelManager.RandoLevelMapping =
+                        new Dictionary<string, LevelConstants.RandoLevel>();
+                    var transitionPairs = ((JArray)transitions).ToObject<List<List<int>>>();
+                    foreach (var pairing in transitionPairs)
+                    {
+                        Console.WriteLine(pairing[0]);
+                        Console.WriteLine(pairing[1]);
+                        var orig = LevelConstants.TransitionNames[pairing[0]];
+                        Console.WriteLine(orig);
+                        var replacement =
+                            LevelConstants.EntranceNameToRandoLevel[LevelConstants.TransitionNames[pairing[1]]];
+                        Console.WriteLine(replacement.LevelName);
+                        RandoLevelManager.RandoLevelMapping[orig] = replacement;
+                    }
+                }
             }
             else
             {
@@ -114,11 +126,10 @@ public static void InitializeSeed()
         private static void SetupScoutedLocations(LocationInfoPacket scoutedLocationInfo)
         {
             Instance.ScoutedLocations = new Dictionary<long, NetworkItem>();
+            Console.WriteLine("scouting done");
             foreach (var networkItem in scoutedLocationInfo.Locations)
             {
-                // janky workaround due to scouted locations all having a player of 1 for some reason?
                 var item = networkItem;
-                item.Player = ArchipelagoClient.Session.ConnectionInfo.Slot;
                 Instance.ScoutedLocations.Add(item.Location, item);
             }
 

From b7c16300fa9823b43c88e8c9b9de1f592e2825c3 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 4 Feb 2024 22:26:53 -0600
Subject: [PATCH 38/63] finish implementing ER and add elemental skylands to
 the portal pool

---
 APRandomizerMain.cs                        |  1 +
 GameOverrideManagers/RandoLevelManager.cs  | 84 +++++++++-------------
 GameOverrideManagers/RandoPortalManager.cs | 27 ++++++-
 Utils/Constants/LevelConstants.cs          | 26 ++++---
 Utils/RandomizerStateManager.cs            |  4 --
 5 files changed, 78 insertions(+), 64 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 91998c5..98da355 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -389,6 +389,7 @@ void BuildHintMenu()
             // level teleporting etc management
             On.Level.ChangeRoom += RandoRoomManager.Level_ChangeRoom;
             On.LevelManager.EndLevelLoading += RandoLevelManager.EndLevelLoading;
+            On.ElementalSkylandsLevelInitializer.OnBeforeInitDone += RandoLevelManager.ElementalSkylandsInit;
             // On.PortalOpeningCutscene.OnOpenPortalEvent += RandoPortalManager.OpenPortalEvent;
             On.TotHQ.LeaveToLevel += RandoPortalManager.LeaveHQ;
             //These functions let us override and manage power seals ourselves with 'fake' items
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index 1267d7b..9f06f38 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -62,13 +62,22 @@ private static LevelConstants.RandoLevel FindEntrance()
                 Console.WriteLine(currentLevel);
                 
                 if (RandoLevelMapping == null) return new LevelConstants.RandoLevel(ELevel.NONE, new Vector3());
-                
-                if (!LevelConstants.TransitionToEntranceName.TryGetValue(
-                        new LevelConstants.Transition(lastLevel, currentLevel), out var entrance))
+
+                string entrance;
+                if (currentLevel.Equals(ELevel.Level_14_CorruptedFuture))
+                {
+                    entrance = "Corrupted Future";
+                }
+                else if (RandoPortalManager.EnteredTower)
+                {
+                    entrance = "Tower of Time - Left";
+                    RandoPortalManager.EnteredTower = false;
+                }
+                else if (!LevelConstants.TransitionToEntranceName.TryGetValue(
+                        new LevelConstants.Transition(lastLevel, currentLevel), out entrance))
                     return new LevelConstants.RandoLevel(ELevel.NONE, new Vector3());
                 Console.WriteLine(entrance);
                 
-                LevelConstants.RandoLevel oldLevel = default;
                 if (LevelConstants.SpecialEntranceNames.Contains(entrance))
                 {
                     Vector3 comparePos;
@@ -76,50 +85,30 @@ private static LevelConstants.RandoLevel FindEntrance()
                     {
                         case "Howling Grotto - Right":
                             comparePos = LevelConstants.EntranceNameToRandoLevel["Howling Grotto - Right"].PlayerPos;
-                            if (WithinRange(playerPos.x, comparePos.x))
-                            {
-                                entrance = "Howling Grotto - Right";
-                            }
-                            else
-                            {
-                                entrance = "Howling Grotto - Bottom";
-                            }
+                            entrance = WithinRange(playerPos.x, comparePos.x)
+                                ? "Howling Grotto - Right"
+                                : "Howling Grotto - Bottom";
 
                             break;
                         case "Quillshroom Marsh - Left":
                             comparePos = LevelConstants.EntranceNameToRandoLevel["Quillshroom Marsh - Top Left"].PlayerPos;
-                            if (WithinRange(playerPos.x, comparePos.x))
-                            {
-                                entrance = "Quillshroom Marsh - Top Left";
-                            }
-                            else
-                            {
-                                entrance = "Quillshroom Marsh - Bottom Left";
-                            }
+                            entrance = WithinRange(playerPos.x, comparePos.x)
+                                ? "Quillshroom Marsh - Top Left"
+                                : "Quillshroom Marsh - Bottom Left";
 
                             break;
                         case "Quillshroom Marsh - Right":
                             comparePos = LevelConstants.EntranceNameToRandoLevel["Quillshroom Marsh - Top Right"].PlayerPos;
-                            if (WithinRange(playerPos.x, comparePos.x))
-                            {
-                                entrance = "Quillshroom Marsh - Top Right";
-                            }
-                            else
-                            {
-                                entrance = "Quillshroom Marsh - Bottom Right";
-                            }
+                            entrance = WithinRange(playerPos.x, comparePos.x)
+                                ? "Quillshroom Marsh - Top Right"
+                                : "Quillshroom Marsh - Bottom Right";
 
                             break;
                         case "Searing Crags - Left":
                             comparePos = LevelConstants.EntranceNameToRandoLevel["Searing Crags - Left"].PlayerPos;
-                            if (WithinRange(playerPos.x, comparePos.x))
-                            {
-                                entrance = "Searing Crags - Left";
-                            }
-                            else
-                            {
-                                entrance = "Searing Crags - Bottom";
-                            }
+                            entrance = WithinRange(playerPos.x, comparePos.x)
+                                ? "Searing Crags - Left"
+                                : "Searing Crags - Bottom";
 
                             break;
                     }
@@ -170,8 +159,8 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
                     else
                         ArchipelagoClient.Session.DataStorage[Scope.Slot, "CurrentRegion"] =
                             self.GetCurrentLevelEnum().ToString();
-                    return;
                 }
+                return;
             }
             
             if (Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.Level_11_B_MusicBox) &&
@@ -208,14 +197,6 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
         
         public static void SkipMusicBox()
         {
-            #if DEBUG
-            Console.WriteLine($"attempting to skip music box. already teleporting : {teleporting}");
-            #endif
-            if (teleporting)
-            {
-                teleporting = false;
-                return;
-            }
             Manager<AudioManager>.Instance.StopMusic();
             var playerPosition = RandomizerStateManager.Instance.SkipMusicBox
                 ? new Vector2(125, 40)
@@ -226,11 +207,6 @@ public static void SkipMusicBox()
 
         public static void TeleportInArea(ELevel area, Vector2 position, EBits dimension = EBits.NONE)
         {
-            if (teleporting)
-            {
-                teleporting = false;
-                return;
-            }
             #if DEBUG
             Console.WriteLine($"Attempting to teleport to {area}, ({position.x}, {position.y}), {dimension}");
             #endif
@@ -243,5 +219,13 @@ public static void TeleportInArea(ELevel area, Vector2 position, EBits dimension
             teleporting = true;
             Manager<LevelManager>.Instance.LoadLevel(levelLoadingInfo);
         }
+
+        public static void ElementalSkylandsInit(On.ElementalSkylandsLevelInitializer.orig_OnBeforeInitDone orig,
+            ElementalSkylandsLevelInitializer self)
+        {
+            // self.startOnManfred = false;
+            self.startOnManfred = !RandoPortalManager.LeftHQPortal && teleporting;
+            orig(self);
+        }
     }
 }
\ No newline at end of file
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 6e0997a..61b9ecb 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -44,6 +44,7 @@ public Portal(int portalWarp)
         }
 
         public static bool LeftHQPortal;
+        public static bool EnteredTower;
         public static List<string> StartingPortals;
         public static List<Portal> PortalMapping;
 
@@ -273,6 +274,26 @@ public Portal(int portalWarp)
                     }
                 },
                 new List<List<LevelConstants.RandoLevel>>
+                {
+                    new List<LevelConstants.RandoLevel>(),
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(-35, 359)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(87.5f, 407)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(864.5f, 381)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(966.3f, 409.4f)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(1763.5f, 381)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(1909, 411)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(2755.5f, 376), EBits.BITS_8),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(2926.5f, 406)),
+                        new LevelConstants.RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(-22.5f, 417)),
+                    },
+                    new List<LevelConstants.RandoLevel>
+                    {
+                        new LevelConstants.RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(-22.5f, 417)),
+                    }
+                },
+                new List<List<LevelConstants.RandoLevel>>
                 {
                     new List<LevelConstants.RandoLevel>
                     {
@@ -347,6 +368,10 @@ public static void OpenPortalEvent(On.PortalOpeningCutscene.orig_OnOpenPortalEve
         private static LevelConstants.RandoLevel GetPortalExit(string enteredPortal)
         {
             Console.WriteLine($"getting portal. entered {enteredPortal}");
+            if (enteredPortal.Equals("Tower of Time - Left"))
+            {
+                EnteredTower = true;
+            }
             var portalExit = PortalMapping[Portals.IndexOf(enteredPortal)];
             Console.WriteLine($"{portalExit.Region}, {portalExit.PortalType}, {portalExit.Index}");
             return AreaCheckpoints[portalExit.Region][portalExit.PortalType][portalExit.Index];
@@ -354,7 +379,6 @@ private static LevelConstants.RandoLevel GetPortalExit(string enteredPortal)
 
         public static void Teleport()
         {
-            LeftHQPortal = false;
             var currentLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
             if (LevelConstants.TransitionToEntranceName.TryGetValue(
                     new LevelConstants.Transition(ELevel.Level_13_TowerOfTimeHQ,
@@ -367,6 +391,7 @@ public static void Teleport()
             {
                 Console.WriteLine($"unable to find portal for {currentLevel}");
             }
+            LeftHQPortal = false;
         }
 
         public static void LeaveHQ(On.TotHQ.orig_LeaveToLevel orig, TotHQ self, bool playLevelMusic, bool loadingNewLevel)
diff --git a/Utils/Constants/LevelConstants.cs b/Utils/Constants/LevelConstants.cs
index d3e67f2..3015a9e 100644
--- a/Utils/Constants/LevelConstants.cs
+++ b/Utils/Constants/LevelConstants.cs
@@ -215,17 +215,21 @@ public override int GetHashCode()
                     "Glacial Peak - Top",
                     new RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(176.04f, -13.71676f))
                 },
+                {
+                    "Elemental Skylands - Air Shmup",
+                    new RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(-37.4f, 359.5f), EBits.BITS_16)
+                }, // 16 - This will probably be really difficult since it uses a different controller
                 // {
-                //     "Elemental Skylands - Left",
-                //     new RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(-424.9693f, 366.5677f), EBits.BITS_16)
-                // }, // 16 - This will probably be really difficult since it uses a different controller
+                //     "Elemental Skylands - Air Shmup",
+                //     new RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(-35, 359), EBits.BITS_16)
+                // },
                 {
                     "Tower of Time - Left",
                     new RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(-18f, -11f), EBits.BITS_8)
                 }, // 8
                 {
                     "Cloud Ruins - Left",
-                    new RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-486f, -57f))
+                    new RandoLevel(ELevel.Level_11_A_CloudRuins, new Vector3(-486f, -57f), EBits.BITS_16)
                 },
                 {
                     "Music Box - Left",
@@ -240,8 +244,8 @@ public override int GetHashCode()
                 //     new RandoLevel(ELevel.Level_12_UnderWorld, new Vector3(-431.7626f, -57f), EBits.BITS_16)
                 // }, // force 16 bit - one time and one way only - after defeating manfred - might be able to force it by calling ManfredBossOutroCutscene?
                 {
-                    "Corrupted Future - Portal",
-                    new RandoLevel(ELevel.Level_14_CorruptedFuture, new Vector3(-19971.98f, -20011f))
+                    "Corrupted Future",
+                    new RandoLevel(ELevel.Level_14_CorruptedFuture, new Vector3(-19971.98f, -20011f), EBits.BITS_16)
                 }, // 16
                 {
                     "Ruxxtin Surfin'",
@@ -374,7 +378,7 @@ public override int GetHashCode()
                 },
                 {
                     new Transition(ELevel.Level_08_SearingCrags, ELevel.Level_12_UnderWorld),
-                    "Underworld - Top Left"
+                    "Underworld - Left"
                 },
                 {
                     new Transition(ELevel.Level_11_A_CloudRuins, ELevel.Level_12_UnderWorld),
@@ -386,7 +390,7 @@ public override int GetHashCode()
                 }, // not sure if I can make these transitions require seashell
                 {
                     new Transition(ELevel.Level_09_A_GlacialPeak, ELevel.Level_09_B_ElementalSkylands),
-                    "Elemental Skylands - Left"
+                    "Elemental Skylands - Air Shmup"
                 },
                 {
                     new Transition(ELevel.Level_13_TowerOfTimeHQ, ELevel.Level_11_B_MusicBox),
@@ -422,7 +426,7 @@ public override int GetHashCode()
                 },
                 {
                     new Transition(ELevel.Level_13_TowerOfTimeHQ, ELevel.Level_14_CorruptedFuture),
-                    "Corrupted Future - Portal"
+                    "Corrupted Future"
                 },
                 {
                     new Transition(ELevel.Level_01_NinjaVillage, ELevel.Level_15_Surf),
@@ -492,8 +496,12 @@ public static Transition TransitionFromName(string name)
             "Searing Crags - Top",
             "Glacial Peak - Bottom",
             "Glacial Peak - Top",
+            "Glacial Peak - Left",
+            "Elemental Skylands - Air Shmup",
+            "Elemental Skylands - Right",
             "Tower HQ",
             "Tower of Time - Left",
+            "Corrupted Future",
             "Cloud Ruins - Left",
             "Underworld - Left",
         };
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index db6438a..c835e97 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -98,13 +98,9 @@ public static void InitializeSeed()
                     var transitionPairs = ((JArray)transitions).ToObject<List<List<int>>>();
                     foreach (var pairing in transitionPairs)
                     {
-                        Console.WriteLine(pairing[0]);
-                        Console.WriteLine(pairing[1]);
                         var orig = LevelConstants.TransitionNames[pairing[0]];
-                        Console.WriteLine(orig);
                         var replacement =
                             LevelConstants.EntranceNameToRandoLevel[LevelConstants.TransitionNames[pairing[1]]];
-                        Console.WriteLine(replacement.LevelName);
                         RandoLevelManager.RandoLevelMapping[orig] = replacement;
                     }
                 }

From b134ed029d3403d5c1939154019d765ab8bb1830 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 4 Feb 2024 22:36:18 -0600
Subject: [PATCH 39/63] fix some dialog weirdness

---
 Archipelago/ArchipelagoClient.cs        | 2 ++
 Archipelago/ItemsAndLocationsHandler.cs | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
index 623b930..e845950 100644
--- a/Archipelago/ArchipelagoClient.cs
+++ b/Archipelago/ArchipelagoClient.cs
@@ -368,6 +368,8 @@ private static void OnItemReceived(ReceivedItemsHelper helper)
 
             ServerData.Index++;
             ItemQueue.Enqueue(itemToUnlock.Item);
+            if (itemToUnlock.Player != Session.ConnectionInfo.Slot)
+                DialogQueue.Enqueue(itemToUnlock.ToReadableString());
         }
 
         private static void SessionErrorReceived(Exception e, string message)
diff --git a/Archipelago/ItemsAndLocationsHandler.cs b/Archipelago/ItemsAndLocationsHandler.cs
index a422737..74aa9a8 100644
--- a/Archipelago/ItemsAndLocationsHandler.cs
+++ b/Archipelago/ItemsAndLocationsHandler.cs
@@ -449,7 +449,11 @@ public static void SendLocationCheck(long locationID)
                 Unlock(itemToUnlock.Keys.First());
             }
             if (!HasDialog(locationID))
-                DialogChanger.CreateDialogBox(RandoStateManager.ScoutedLocations[locationID].ToReadableString());
+                if (RandomizerStateManager.IsSafeTeleportState())
+                    DialogChanger.CreateDialogBox(RandoStateManager.ScoutedLocations[locationID].ToReadableString());
+                else
+                    ArchipelagoClient.DialogQueue.Enqueue(RandoStateManager.ScoutedLocations[locationID]
+                        .ToReadableString());
             Manager<SaveManager>.Instance.SaveGame();
         }
 

From 522046a6cf28f1c418c1a6caa15700f685030eaf Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 4 Feb 2024 22:46:17 -0600
Subject: [PATCH 40/63] don't have any portals open initially to force reading

---
 APRandomizerMain.cs                       | 15 +++++++++++++++
 GameOverrideManagers/RandoLevelManager.cs |  2 ++
 Utils/RandomizerStateManager.cs           | 11 -----------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 98da355..f5ce6a5 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -803,6 +803,21 @@ void Cutscene_Play(On.Cutscene.orig_Play orig, Cutscene self)
 #if DEBUG
             Console.WriteLine($"Playing cutscene: {eventName}");
 #endif
+            if (eventName == "PortalOpeningCutscene")
+            {
+                if (RandoPortalManager.StartingPortals != null)
+                {
+                    var progManager = Manager<ProgressionManager>.Instance;
+                    foreach (var portal in RandoPortalManager.StartingPortals.Where(
+                                 portal => !portal.StartsWith("Autumn")
+                                           && !portal.StartsWith("Howling")
+                                           && !portal.StartsWith("Glacial")))
+                    {
+                        var cutsceneName = $"{portal.Replace(" ", "")}OpeningCutscene";
+                        progManager.cutscenesPlayed.Add(cutsceneName);
+                    }
+                }
+            }
             if (ArchipelagoClient.EventsICareAbout.Contains(eventName) && ArchipelagoClient.Authenticated)
             {
                 ArchipelagoClient.Session.DataStorage[Scope.Slot, "Events"] +=
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index 9f06f38..1c405ab 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -1,6 +1,7 @@
 using System;
 using MessengerRando.Utils;
 using System.Collections.Generic;
+using System.Linq;
 using Archipelago.MultiClient.Net.Enums;
 using MessengerRando.Archipelago;
 using MessengerRando.Utils.Constants;
@@ -141,6 +142,7 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
             //         return;
             //     }
             // }
+
             if (self.GetCurrentLevelEnum().Equals(ELevel.Level_05_A_HowlingGrotto))
             {
                 var progManager = Manager<ProgressionManager>.Instance;
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index c835e97..eb2047c 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -295,17 +295,6 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
             };
             progManager.cutscenesPlayed.AddRange(skipCutscenes);
 
-            if (RandoPortalManager.StartingPortals != null)
-            {
-                foreach (var portal in RandoPortalManager.StartingPortals.Where(
-                             portal => !portal.StartsWith("Autumn")
-                                       && !portal.StartsWith("Howling")
-                                       && !portal.StartsWith("Glacial")))
-                {
-                    var cutsceneName = $"{portal.Replace(" ", "")}OpeningCutscene";
-                    progManager.cutscenesPlayed.Add(cutsceneName);
-                }
-            }
             progManager.actionSequenceDone.AddRange(new []{
                 "AwardGrimplouSequence(Clone)",
                 "AwardGlidouSequence(Clone)",

From 705ebbf8132536e33930c0d2323c336d6658fa2a Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Mon, 5 Feb 2024 12:40:52 -0600
Subject: [PATCH 41/63] do some cleanup on all teleporting and fix some
 positions

---
 APRandomizerMain.cs                       | 27 +++++++----------------
 GameOverrideManagers/RandoLevelManager.cs | 13 ++++++++++-
 Utils/Constants/LevelConstants.cs         |  6 ++---
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index f5ce6a5..0fe4a12 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -885,33 +885,25 @@ public static void OnToggleWindmillShuriken()
 
         void OnSelectTeleportToHq()
         {
-
-            //Properly close out of the mod options and get the game state back together
-            Manager<PauseManager>.Instance.Resume();
-            Manager<UIManager>.Instance.GetView<OptionScreen>().Close(false);                
-            Console.WriteLine("Teleporting to HQ!");
+            Console.WriteLine("Teleporting to HQ!");       
+#if DEBUG
+            var position = Manager<PlayerManager>.Instance.Player.transform.position;
+            Console.WriteLine($"{position.x} {position.y} {position.z}");
+#endif
             ArchipelagoMenu.archipelagoScreen.Close(false);
 
-            //Fade the music out because musicception is annoying
-            Manager<AudioManager>.Instance.FadeMusicVolume(1f, 0f, true);
-
+            RandoLevelManager.CleanupBeforeTeleport();
             //Load the HQ
             Manager<TowerOfTimeHQManager>.Instance.TeleportInToTHQ(true, ELevelEntranceID.ENTRANCE_A, null);
         }
 
         void OnSelectTeleportToNinjaVillage()
         {
-            Console.WriteLine("Attempting to teleport to Ninja Village.");
-            
-            // Properly close out of the mod options and get the game state back together
-            Manager<PauseManager>.Instance.Resume();
-            Manager<UIManager>.Instance.GetView<OptionScreen>().Close(false);
+            Console.WriteLine("Teleporting to Ninja Village.");
             ArchipelagoMenu.archipelagoScreen.Close(false);
             EBits dimension = Manager<DimensionManager>.Instance.currentDimension;
 
-            //Fade the music out because musicception is annoying
-            Manager<AudioManager>.Instance.FadeMusicVolume(1f, 0f, true);
-
+            RandoLevelManager.CleanupBeforeTeleport();
             //Load to Ninja Village
             Manager<ProgressionManager>.Instance.checkpointSaveInfo.loadedLevelPlayerPosition = new Vector2(-153.3f, -56.5f);
             LevelLoadingInfo levelLoadingInfo = new LevelLoadingInfo("Level_01_NinjaVillage_Build", false, true, LoadSceneMode.Single, ELevelEntranceID.NONE, dimension);
@@ -1101,9 +1093,6 @@ private void SaveManager_DoActualSave(On.SaveManager.orig_DoActualSaving orig, S
             {
                 if (RandoPortalManager.LeftHQPortal)
                 {
-                    Manager<UIManager>.Instance.CloseAllScreensOfType<TransitionScreen>(false);
-                    Manager<UIManager>.Instance.CloseAllScreensOfType<SavingScreen>(false);
-                    Manager<UIManager>.Instance.CloseAllScreensOfType<LoadingAnimation>(false);
                     RandoPortalManager.Teleport();
                     return;
                 }
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index 1c405ab..43abe96 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -212,7 +212,7 @@ public static void TeleportInArea(ELevel area, Vector2 position, EBits dimension
             #if DEBUG
             Console.WriteLine($"Attempting to teleport to {area}, ({position.x}, {position.y}), {dimension}");
             #endif
-            Manager<AudioManager>.Instance.StopMusic();
+            CleanupBeforeTeleport();
             Manager<ProgressionManager>.Instance.checkpointSaveInfo.loadedLevelPlayerPosition = position;
             if (dimension.Equals(EBits.NONE)) dimension = Manager<DimensionManager>.Instance.currentDimension;
             LevelLoadingInfo levelLoadingInfo = new LevelLoadingInfo(area + "_Build",
@@ -229,5 +229,16 @@ public static void ElementalSkylandsInit(On.ElementalSkylandsLevelInitializer.or
             self.startOnManfred = !RandoPortalManager.LeftHQPortal && teleporting;
             orig(self);
         }
+
+        public static void CleanupBeforeTeleport()
+        {
+            Manager<AudioManager>.Instance.StopMusic();
+            Manager<PauseManager>.Instance.Resume();
+            Manager<UIManager>.Instance.CloseAllScreensOfType<OptionScreen>(false);
+            Manager<UIManager>.Instance.CloseAllScreensOfType<CinematicBordersScreen>(false);
+            Manager<UIManager>.Instance.CloseAllScreensOfType<TransitionScreen>(false);
+            Manager<UIManager>.Instance.CloseAllScreensOfType<SavingScreen>(false);
+            Manager<UIManager>.Instance.CloseAllScreensOfType<LoadingAnimation>(false);
+        }
     }
 }
\ No newline at end of file
diff --git a/Utils/Constants/LevelConstants.cs b/Utils/Constants/LevelConstants.cs
index 3015a9e..19bd058 100644
--- a/Utils/Constants/LevelConstants.cs
+++ b/Utils/Constants/LevelConstants.cs
@@ -107,7 +107,7 @@ public override int GetHashCode()
                 },
                 {
                     "Forlorn Temple - Bottom",
-                    new RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(36.87273f, -20.98116f), EBits.BITS_16)
+                    new RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(30, -20), EBits.BITS_16)
                 }, // Must be 16
                 {
                     "Forlorn Temple - Right",
@@ -208,7 +208,7 @@ public override int GetHashCode()
                 },
                 {
                     "Glacial Peak - Bottom",
-                    new RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(194.9839f, -517.7611f))
+                    new RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(202, -519))
                 },
                 // { "Glacial Peak - Left", new RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(), ELevelEntranceID.NONE) }, // This is one way to ES so no actual entrance here
                 {
@@ -245,7 +245,7 @@ public override int GetHashCode()
                 // }, // force 16 bit - one time and one way only - after defeating manfred - might be able to force it by calling ManfredBossOutroCutscene?
                 {
                     "Corrupted Future",
-                    new RandoLevel(ELevel.Level_14_CorruptedFuture, new Vector3(-19971.98f, -20011f), EBits.BITS_16)
+                    new RandoLevel(ELevel.Level_14_CorruptedFuture, new Vector3(-100, -9.5f), EBits.BITS_16)
                 }, // 16
                 {
                     "Ruxxtin Surfin'",

From 872eb4971af76bc068b8605755e4d9238db74d2a Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Mon, 5 Feb 2024 12:42:08 -0600
Subject: [PATCH 42/63] alpha version bump

---
 courier.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/courier.toml b/courier.toml
index a317660..16a23a7 100644
--- a/courier.toml
+++ b/courier.toml
@@ -1,5 +1,5 @@
 name = "TheMessengerRandomizerAP"
-version = "0.13.0-alpha-5"
+version = "0.13.0-alpha-6"
 dependencies = [
   { name = "Courier", version = "0.7.0" }
 ]

From d0430618c049d876457846b1c7fb32727bc0a504 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Mon, 5 Feb 2024 13:39:52 -0600
Subject: [PATCH 43/63] fix some howling grotto weirdness

---
 APRandomizerMain.cs                       | 12 ++++++++++++
 GameOverrideManagers/RandoLevelManager.cs | 11 +++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 0fe4a12..786fc32 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -1101,6 +1101,18 @@ private void SaveManager_DoActualSave(On.SaveManager.orig_DoActualSaving orig, S
             {
                 Console.WriteLine(e);
             }
+
+            if (RandoLevelManager.RandoLevelMapping != null &&
+                Manager<ProgressionManager>.Instance.levelsDiscovered.Contains(ELevel.Level_05_A_HowlingGrotto))
+            {
+                if (!RandoLevelManager.WithinRange(Manager<PlayerManager>.Instance.Player.transform.position.x,
+                        LevelConstants.EntranceNameToRandoLevel["Howling Grotto - Bottom"].PlayerPos.x))
+                {
+                    var progManager = Manager<ProgressionManager>.Instance;
+                    progManager.levelsDiscovered.Remove(ELevel.Level_05_A_HowlingGrotto);
+                    progManager.allTimeDiscoveredLevels.Remove(ELevel.Level_05_A_HowlingGrotto);
+                }
+            }
                 
             // The game calls the save method after the ending cutscene before rolling credits
             if (ArchipelagoClient.Authenticated
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index 43abe96..5b31455 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -46,7 +46,7 @@ public static void LoadLevel(On.LevelManager.orig_LoadLevel orig, LevelManager s
             orig(self, levelInfo);
         }
 
-        static bool WithinRange(float pos1, float pos2)
+        public static bool WithinRange(float pos1, float pos2)
         {
             var comparison = pos2 - pos1;
             if (comparison < 0) comparison *= -1;
@@ -114,7 +114,10 @@ private static LevelConstants.RandoLevel FindEntrance()
                             break;
                     }
                 }
-
+                if (entrance.Equals("Howling Grotto - Bottom"))
+                {
+                    Manager<ProgressionManager>.Instance.levelsDiscovered.Add(ELevel.Level_05_B_SunkenShrine);
+                }
                 return RandoLevelMapping[entrance];
             } catch (Exception e){ Console.WriteLine(e);}
             return new LevelConstants.RandoLevel(ELevel.NONE, new Vector3());
@@ -146,8 +149,8 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
             if (self.GetCurrentLevelEnum().Equals(ELevel.Level_05_A_HowlingGrotto))
             {
                 var progManager = Manager<ProgressionManager>.Instance;
-                progManager.levelsDiscovered.Remove(ELevel.Level_05_B_SunkenShrine);
-                progManager.allTimeDiscoveredLevels.Remove(ELevel.Level_05_B_SunkenShrine);
+                // progManager.levelsDiscovered.Remove(ELevel.Level_05_B_SunkenShrine);
+                // progManager.allTimeDiscoveredLevels.Remove(ELevel.Level_05_B_SunkenShrine);
             }
             if (teleporting)
             {

From 5d0cd33bbd158900b9a2d3f08c14f4ab52ad13d9 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Mon, 5 Feb 2024 15:36:56 -0600
Subject: [PATCH 44/63] fix more broken things - teleports, music, and lost
 woods

---
 APRandomizerMain.cs                       | 19 +++++----
 Archipelago/ArchipelagoClient.cs          |  1 -
 GameOverrideManagers/LostWoodsManager.cs  | 47 +++++++++++++++++++++++
 GameOverrideManagers/RandoLevelManager.cs | 14 +++++--
 GameOverrideManagers/RandoMusicManager.cs |  5 +--
 MessengerRando.csproj                     |  1 +
 Utils/Constants/LevelConstants.cs         |  8 ++--
 7 files changed, 73 insertions(+), 22 deletions(-)
 create mode 100644 GameOverrideManagers/LostWoodsManager.cs

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 786fc32..a4a0b03 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -367,6 +367,7 @@ void BuildHintMenu()
             On.CatacombLevelInitializer.OnBeforeInitDone += CatacombLevelInitializer_OnBeforeInitDone;
             On.DialogManager.LoadDialogs_ELanguage += DialogChanger.LoadDialogs_Elanguage;
             On.OptionScreen.OnEnable += OnOptionScreenEnable;
+            On.LostWoods.SetAsSolved += LostWoodsManager.OnSetAsSolved;
             // shop management
             On.UpgradeButtonData.GetPrice += RandoShopManager.GetPrice;
             On.BuyMoneyWrenchCutscene.OnBuyWrenchChoice += RandoShopManager.BuyMoneyWrench;
@@ -377,8 +378,8 @@ void BuildHintMenu()
             On.SousSol.UnlockFigurine += RandoShopManager.UnlockFigurine;
             On.Shop.Init += RandoShopManager.ShopInit;
             On.JukeboxTrack.IsUnlocked += (orig, self) => true;
-            On.AudioManager.PlayMusic += RandoMusicManager.OnPlayMusic;
             On.UpgradeButtonData.IsStoryUnlocked += RandoShopManager.IsStoryUnlocked;
+            On.AudioManager.PlayMusic += RandoMusicManager.OnPlayMusic;
             // boss management
             On.ProgressionManager.HasDefeatedBoss +=
                 (orig, self, bossName) => RandoBossManager.HasBossDefeated(bossName);
@@ -1102,16 +1103,14 @@ private void SaveManager_DoActualSave(On.SaveManager.orig_DoActualSaving orig, S
                 Console.WriteLine(e);
             }
 
-            if (RandoLevelManager.RandoLevelMapping != null &&
-                Manager<ProgressionManager>.Instance.levelsDiscovered.Contains(ELevel.Level_05_A_HowlingGrotto))
+            if (LostWoodsManager.NeedsUnsolved)
             {
-                if (!RandoLevelManager.WithinRange(Manager<PlayerManager>.Instance.Player.transform.position.x,
-                        LevelConstants.EntranceNameToRandoLevel["Howling Grotto - Bottom"].PlayerPos.x))
-                {
-                    var progManager = Manager<ProgressionManager>.Instance;
-                    progManager.levelsDiscovered.Remove(ELevel.Level_05_A_HowlingGrotto);
-                    progManager.allTimeDiscoveredLevels.Remove(ELevel.Level_05_A_HowlingGrotto);
-                }
+                LostWoodsManager.UnsolveLostWoods();
+            }
+            else if (LostWoodsManager.NeedsSolved)
+            {
+                // just keep trying to solve it until it eventually works lmao
+                LostWoodsManager.SolveLostWoods();
             }
                 
             // The game calls the save method after the ending cutscene before rolling credits
diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
index e845950..da5e17c 100644
--- a/Archipelago/ArchipelagoClient.cs
+++ b/Archipelago/ArchipelagoClient.cs
@@ -416,7 +416,6 @@ public static void UpdateArchipelagoState()
                 ThreadPool.QueueUserWorkItem(_ => ConnectAsync());
                 return;
             }
-            Debug.Log("checking if we need to re-sync");
             
             if (ServerData.Index == Session.Items.AllItemsReceived.Count)
                 return;
diff --git a/GameOverrideManagers/LostWoodsManager.cs b/GameOverrideManagers/LostWoodsManager.cs
new file mode 100644
index 0000000..0feef12
--- /dev/null
+++ b/GameOverrideManagers/LostWoodsManager.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Reflection;
+using Object = UnityEngine.Object;
+
+namespace MessengerRando.GameOverrideManagers
+{
+    public static class LostWoodsManager
+    {
+        public static bool ShouldBeSolved;
+        public static bool NeedsSolved;
+        private static bool tempSolve;
+        public static bool NeedsUnsolved;
+
+        public static void OnSetAsSolved(On.LostWoods.orig_SetAsSolved orig, LostWoods self)
+        {
+            // if (ShouldBeSolved || tempSolve)
+            orig(self);
+        }
+        public static void SolveLostWoods()
+        {
+            tempSolve = true;
+            NeedsUnsolved = !ShouldBeSolved;
+            try
+            {
+                LostWoods.Instance.SetAsSolved();
+                tempSolve = NeedsSolved = false;
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                NeedsSolved = ShouldBeSolved;
+                tempSolve = false;
+            }
+        }
+
+        public static void UnsolveLostWoods()
+        {
+            var lostWoodsSolved =
+                typeof(LostWoods).GetField("solved", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (lostWoodsSolved != null)
+            {
+                lostWoodsSolved.SetValue(Object.FindObjectsOfType<LostWoods>(), true);
+                NeedsUnsolved = false;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index 5b31455..c74545f 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -114,10 +114,6 @@ private static LevelConstants.RandoLevel FindEntrance()
                             break;
                     }
                 }
-                if (entrance.Equals("Howling Grotto - Bottom"))
-                {
-                    Manager<ProgressionManager>.Instance.levelsDiscovered.Add(ELevel.Level_05_B_SunkenShrine);
-                }
                 return RandoLevelMapping[entrance];
             } catch (Exception e){ Console.WriteLine(e);}
             return new LevelConstants.RandoLevel(ELevel.NONE, new Vector3());
@@ -184,6 +180,16 @@ public static void EndLevelLoading(On.LevelManager.orig_EndLevelLoading orig, Le
                 
             }
             var newLevel = FindEntrance();
+            switch (newLevel.LevelName)
+            {
+                // case ELevel.Level_05_A_HowlingGrotto:
+                //     LostWoodsManager.SolveLostWoods();
+                //     break;
+                case ELevel.Level_05_B_SunkenShrine:
+                    LostWoodsManager.ShouldBeSolved = true;
+                    LostWoodsManager.SolveLostWoods();
+                    break;
+            }
             if (RandoLevelMapping != null && !newLevel.LevelName.Equals(ELevel.NONE))
                 TeleportInArea(
                     newLevel.LevelName,
diff --git a/GameOverrideManagers/RandoMusicManager.cs b/GameOverrideManagers/RandoMusicManager.cs
index eb5e96b..df7ad34 100644
--- a/GameOverrideManagers/RandoMusicManager.cs
+++ b/GameOverrideManagers/RandoMusicManager.cs
@@ -44,12 +44,11 @@ public static MusicAudioObject OnPlayMusic(
         {
             if (audioObjectDefinition == null)
                 return null;
-            Debug.Log("playing music");
+            // Debug.Log("playing music");
             // Debug.Log(audioObjectDefinition.GetInstanceID());
             // Debug.Log(audioObjectDefinition.GetInstanceID());
-            var cantShuffleLevels = new List<ELevel> { ELevel.NONE, ELevel.Level_05_B_SunkenShrine };
             if (!audioObjectDefinition.IsMusic() || !shuffleMusic ||
-                cantShuffleLevels.Contains(Manager<LevelManager>.Instance.GetCurrentLevelEnum()) ||
+                !Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.Level_13_TowerOfTimeHQ) ||
                 audioObjectDefinition.IsSFX())
                 return orig(self, audioObjectDefinition, loop, fadeInDuration, playbackTime, customAudioObject);
             var newAudio = Manager<AudioManager>.Instance.GetRandomLevelTrack();
diff --git a/MessengerRando.csproj b/MessengerRando.csproj
index 1fb3f90..8611bed 100644
--- a/MessengerRando.csproj
+++ b/MessengerRando.csproj
@@ -95,6 +95,7 @@
     <Compile Include="Archipelago\DeathLinkInterface.cs" />
     <Compile Include="Archipelago\ItemsAndLocationsHandler.cs" />
     <Compile Include="Exceptions\RandomizerException.cs" />
+    <Compile Include="GameOverrideManagers\LostWoodsManager.cs" />
     <Compile Include="GameOverrideManagers\RandoBossManager.cs" />
     <Compile Include="GameOverrideManagers\RandoMusicManager.cs" />
     <Compile Include="GameOverrideManagers\RandoPortalManager.cs" />
diff --git a/Utils/Constants/LevelConstants.cs b/Utils/Constants/LevelConstants.cs
index 19bd058..8418f12 100644
--- a/Utils/Constants/LevelConstants.cs
+++ b/Utils/Constants/LevelConstants.cs
@@ -115,15 +115,15 @@ public override int GetHashCode()
                 },
                 {
                     "Catacombs - Top Left",
-                    new RandoLevel(ELevel.Level_04_Catacombs, new Vector3())
+                    new RandoLevel(ELevel.Level_04_Catacombs, new Vector3(48.5f, -11))
                 },
                 {
                     "Catacombs - Right",
-                    new RandoLevel(ELevel.Level_04_Catacombs, new Vector3(-177.0621f, -11f))
+                    new RandoLevel(ELevel.Level_04_Catacombs, new Vector3(809.5f, -74.5f))
                 },
                 {
                     "Catacombs - Bottom",
-                    new RandoLevel(ELevel.Level_04_Catacombs, new Vector3(511.0319f, -123f), EBits.BITS_16)
+                    new RandoLevel(ELevel.Level_04_Catacombs, new Vector3(511, -123), EBits.BITS_16)
                 }, // Must be 16
                 {
                     "Catacombs - Bottom Left",
@@ -164,7 +164,7 @@ public override int GetHashCode()
                 }, // This needs to be forced to 16 bit
                 {
                     "Bamboo Creek - Top Left",
-                    new RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(-50.09212f, 45f))
+                    new RandoLevel(ELevel.Level_06_A_BambooCreek, new Vector3(-50.09212f, 45f), EBits.BITS_16)
                 },
                 {
                     "Bamboo Creek - Bottom Left",

From 0f2773b4230d59ba3b8bae1a08e2f0cdf5f61e8d Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Mon, 5 Feb 2024 18:11:32 -0600
Subject: [PATCH 45/63] simulate scouts for offline seeds

---
 APRandomizerMain.cs                     |  4 ++++
 Archipelago/ArchipelagoData.cs          |  5 ++---
 Archipelago/ItemsAndLocationsHandler.cs |  3 +--
 Utils/RandomizerStateManager.cs         | 12 ++++++------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index a4a0b03..888dc19 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -631,6 +631,10 @@ void SaveGameSelectionScreen_OnLoadGame(On.SaveGameSelectionScreen.orig_OnLoadGa
                         Console.WriteLine(e);
                     }
                 }
+                else if (ArchipelagoClient.offline)
+                {
+                    Manager<DialogManager>.Instance.LoadDialogs(Manager<LocalizationManager>.Instance.CurrentLanguage);
+                }
             }
             catch (Exception e)
             {
diff --git a/Archipelago/ArchipelagoData.cs b/Archipelago/ArchipelagoData.cs
index 1b7fa12..aea0337 100644
--- a/Archipelago/ArchipelagoData.cs
+++ b/Archipelago/ArchipelagoData.cs
@@ -25,7 +25,6 @@ public class ArchipelagoData
         public List<long> CheckedLocations;
         public Dictionary<long, int> ReceivedItems;
         public Dictionary<long, NetworkItem> ScoutedLocations;
-        public Dictionary<long, Dictionary<long, string>> LocationData;
 
         public void StartNewSeed()
         {
@@ -44,6 +43,7 @@ public override string ToString()
 
         public static bool LoadData(int slot)
         {
+            if (ArchipelagoClient.offline) return false;
             Console.WriteLine($"Loading Archipelago data for slot {slot}");
             if (ArchipelagoClient.ServerData == null) ArchipelagoClient.ServerData = new ArchipelagoData();
             return ArchipelagoClient.ServerData.loadData(slot);
@@ -101,11 +101,10 @@ private bool loadData(int slot)
                 RandomizerStateManager.Instance.ScoutedLocations = 
                     ScoutedLocations = tempServerData.ScoutedLocations ?? new Dictionary<long, NetworkItem>();
                 SlotData = tempServerData.SlotData;
-                LocationData = tempServerData.LocationData ?? new Dictionary<long, Dictionary<long, string>>();
 
                 //Attempt to connect to the server and save the new data
                 Console.WriteLine("Rando save found!");
-                if (LocationData != null && LocationData.Count > 0)
+                if (Uri == "offline")
                 {
                     Console.WriteLine("continuing offline seed");
                     RandomizerStateManager.InitializeSeed();
diff --git a/Archipelago/ItemsAndLocationsHandler.cs b/Archipelago/ItemsAndLocationsHandler.cs
index 74aa9a8..5d1fe13 100644
--- a/Archipelago/ItemsAndLocationsHandler.cs
+++ b/Archipelago/ItemsAndLocationsHandler.cs
@@ -445,8 +445,7 @@ public static void SendLocationCheck(long locationID)
                         ArchipelagoClient.ServerData.CheckedLocations.ToArray()));
             else if (ArchipelagoClient.offline)
             {
-                var itemToUnlock = ArchipelagoClient.ServerData.LocationData[locationID];
-                Unlock(itemToUnlock.Keys.First());
+                Unlock(RandoStateManager.ScoutedLocations[locationID].Item);
             }
             if (!HasDialog(locationID))
                 if (RandomizerStateManager.IsSafeTeleportState())
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index eb2047c..d8f4765 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -168,9 +168,7 @@ public bool IsLocationRandomized(EItems vanillaLocationItem, out long locationID
                     ItemsAndLocationsHandler.LocationFromEItem(vanillaLocationItem);
                 if (locationID == 0) return false;
                 Console.WriteLine($"Checking if {vanillaLocationItem}, id: {locationID} is randomized.");
-                return ArchipelagoClient.offline
-                    ? ArchipelagoClient.ServerData.LocationData.ContainsKey(locationID)
-                    : ArchipelagoClient.Session.Locations.AllLocations.Contains(locationID);
+                return ArchipelagoClient.ServerData.ScoutedLocations.ContainsKey(locationID);
             }
             catch (Exception e)
             {
@@ -349,12 +347,14 @@ public static void StartOfflineSeed()
                     ArchipelagoClient.ServerData.SeedName = part;
                     break;
                 }
+
+                ArchipelagoClient.ServerData.Uri = "offline";
+                ArchipelagoClient.ServerData.SlotName = gameData["name"].ToObject<string>();
                 Console.WriteLine("casting slot data");
                 ArchipelagoClient.ServerData.SlotData = gameData["slot_data"].ToObject<Dictionary<string, object>>();
                 Console.WriteLine("casting loc data");
-                Console.WriteLine(gameData["loc_data"].GetType());
-                ArchipelagoClient.ServerData.LocationData =
-                    gameData["loc_data"].ToObject<Dictionary<long, Dictionary<long, string>>>();
+                Instance.ScoutedLocations = ArchipelagoClient.ServerData.ScoutedLocations =
+                    gameData["loc_data"].ToObject<Dictionary<long, NetworkItem>>();
                 ArchipelagoClient.HasConnected = ArchipelagoClient.offline = true;
                 InitializeSeed();
             }

From 74c79ee9997b9c7333bdcb12a18b539b34dba1e1 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Mon, 5 Feb 2024 18:42:34 -0600
Subject: [PATCH 46/63] have to do a bit of jank to convert NetworkItems

---
 GameOverrideManagers/RandoPortalManager.cs |  1 +
 Utils/RandomizerStateManager.cs            | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 61b9ecb..e6d09ea 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -379,6 +379,7 @@ private static LevelConstants.RandoLevel GetPortalExit(string enteredPortal)
 
         public static void Teleport()
         {
+            Console.WriteLine("trying to teleport to portal exit");
             var currentLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
             if (LevelConstants.TransitionToEntranceName.TryGetValue(
                     new LevelConstants.Transition(ELevel.Level_13_TowerOfTimeHQ,
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index d8f4765..2851486 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -7,6 +7,7 @@
 using MessengerRando.Archipelago;
 using MessengerRando.GameOverrideManagers;
 using MessengerRando.Utils.Constants;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
 using WebSocketSharp;
@@ -353,8 +354,13 @@ public static void StartOfflineSeed()
                 Console.WriteLine("casting slot data");
                 ArchipelagoClient.ServerData.SlotData = gameData["slot_data"].ToObject<Dictionary<string, object>>();
                 Console.WriteLine("casting loc data");
-                Instance.ScoutedLocations = ArchipelagoClient.ServerData.ScoutedLocations =
-                    gameData["loc_data"].ToObject<Dictionary<long, NetworkItem>>();
+                Instance.ScoutedLocations =
+                    ArchipelagoClient.ServerData.ScoutedLocations = new Dictionary<long, NetworkItem>();
+                var locData = gameData["loc_data"].ToObject<Dictionary<long, string>>();
+                foreach (var kvp in locData)
+                {
+                    Instance.ScoutedLocations.Add(kvp.Key, JsonConvert.DeserializeObject<NetworkItem>(kvp.Value));
+                }
                 ArchipelagoClient.HasConnected = ArchipelagoClient.offline = true;
                 InitializeSeed();
             }

From d8b1c55cd4edf81c047898f12a49307b48ddc024 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Mon, 5 Feb 2024 19:53:41 -0600
Subject: [PATCH 47/63] change a whole bunch of things for offline seeds so
 they hopefully work better

---
 APRandomizerMain.cs                           |  2 ++
 Archipelago/ArchipelagoData.cs                |  2 ++
 Archipelago/ItemsAndLocationsHandler.cs       | 36 ++++++++++++++-----
 GameOverrideManagers/RandoMusicManager.cs     |  4 +--
 GameOverrideManagers/RandoPortalManager.cs    |  2 +-
 GameOverrideManagers/RandoTimeShardManager.cs |  2 --
 Utils/DialogChanger.cs                        |  7 ++--
 Utils/RandomizerStateManager.cs               | 14 +++-----
 Utils/SeedGenerator.cs                        | 21 +++++++++++
 9 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 888dc19..1afbd5d 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -633,6 +633,8 @@ void SaveGameSelectionScreen_OnLoadGame(On.SaveGameSelectionScreen.orig_OnLoadGa
                 }
                 else if (ArchipelagoClient.offline)
                 {
+                    if (ItemsAndLocationsHandler.ItemsLookup == null)
+                        ItemsAndLocationsHandler.Initialize();
                     Manager<DialogManager>.Instance.LoadDialogs(Manager<LocalizationManager>.Instance.CurrentLanguage);
                 }
             }
diff --git a/Archipelago/ArchipelagoData.cs b/Archipelago/ArchipelagoData.cs
index aea0337..b34680c 100644
--- a/Archipelago/ArchipelagoData.cs
+++ b/Archipelago/ArchipelagoData.cs
@@ -25,6 +25,7 @@ public class ArchipelagoData
         public List<long> CheckedLocations;
         public Dictionary<long, int> ReceivedItems;
         public Dictionary<long, NetworkItem> ScoutedLocations;
+        public Dictionary<long, Dictionary<string, List<long>>> LocationData;
 
         public void StartNewSeed()
         {
@@ -101,6 +102,7 @@ private bool loadData(int slot)
                 RandomizerStateManager.Instance.ScoutedLocations = 
                     ScoutedLocations = tempServerData.ScoutedLocations ?? new Dictionary<long, NetworkItem>();
                 SlotData = tempServerData.SlotData;
+                LocationData = tempServerData.LocationData;
 
                 //Attempt to connect to the server and save the new data
                 Console.WriteLine("Rando save found!");
diff --git a/Archipelago/ItemsAndLocationsHandler.cs b/Archipelago/ItemsAndLocationsHandler.cs
index 5d1fe13..37edb02 100644
--- a/Archipelago/ItemsAndLocationsHandler.cs
+++ b/Archipelago/ItemsAndLocationsHandler.cs
@@ -289,6 +289,8 @@ public static long ItemFromEItem(EItems item)
 
         public static long LocationFromEItem(EItems location)
         {
+            if (EItemsLocationsLookup == null)
+                Initialize();
             return !EItemsLocationsLookup.ContainsKey(location) ? 0 : EItemsLocationsLookup[location];
         }
 
@@ -419,7 +421,15 @@ public static void Unlock(long itemToUnlock, int quantity = APQuantity)
         public static void SendLocationCheck(LocationRO checkedLocation)
         {
             LocationsLookup.TryGetValue(checkedLocation, out var locationID);
-            SendLocationCheck(locationID);
+            if (ArchipelagoClient.ServerData.CheckedLocations.Contains(locationID)) return;
+            try
+            {
+                SendLocationCheck(locationID);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
         }
 
         public static void SendLocationCheck(long locationID)
@@ -440,19 +450,29 @@ public static void SendLocationCheck(long locationID)
             
             Console.WriteLine("Sending location checks");
             if (ArchipelagoClient.Authenticated)
+            {
                 ThreadPool.QueueUserWorkItem(o =>
                     ArchipelagoClient.Session.Locations.CompleteLocationChecksAsync(null,
                         ArchipelagoClient.ServerData.CheckedLocations.ToArray()));
+                if (!HasDialog(locationID))
+                    if (RandomizerStateManager.IsSafeTeleportState())
+                        DialogChanger.CreateDialogBox(RandoStateManager.ScoutedLocations[locationID].ToReadableString());
+                    else
+                        ArchipelagoClient.DialogQueue.Enqueue(RandoStateManager.ScoutedLocations[locationID]
+                            .ToReadableString());
+            }
             else if (ArchipelagoClient.offline)
             {
-                Unlock(RandoStateManager.ScoutedLocations[locationID].Item);
+                Unlock(ArchipelagoClient.ServerData.LocationData[locationID].Keys.First()[0]);
+                if (!HasDialog(locationID))
+                {
+                    var dialog = SeedGenerator.GetOfflineDialog(locationID);
+                    if (RandomizerStateManager.IsSafeTeleportState())
+                        DialogChanger.CreateDialogBox(dialog);
+                    else
+                        ArchipelagoClient.DialogQueue.Enqueue(dialog);
+                }
             }
-            if (!HasDialog(locationID))
-                if (RandomizerStateManager.IsSafeTeleportState())
-                    DialogChanger.CreateDialogBox(RandoStateManager.ScoutedLocations[locationID].ToReadableString());
-                else
-                    ArchipelagoClient.DialogQueue.Enqueue(RandoStateManager.ScoutedLocations[locationID]
-                        .ToReadableString());
             Manager<SaveManager>.Instance.SaveGame();
         }
 
diff --git a/GameOverrideManagers/RandoMusicManager.cs b/GameOverrideManagers/RandoMusicManager.cs
index df7ad34..edf2461 100644
--- a/GameOverrideManagers/RandoMusicManager.cs
+++ b/GameOverrideManagers/RandoMusicManager.cs
@@ -48,12 +48,12 @@ public static MusicAudioObject OnPlayMusic(
             // Debug.Log(audioObjectDefinition.GetInstanceID());
             // Debug.Log(audioObjectDefinition.GetInstanceID());
             if (!audioObjectDefinition.IsMusic() || !shuffleMusic ||
-                !Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.Level_13_TowerOfTimeHQ) ||
-                audioObjectDefinition.IsSFX())
+                !Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.Level_13_TowerOfTimeHQ))
                 return orig(self, audioObjectDefinition, loop, fadeInDuration, playbackTime, customAudioObject);
             var newAudio = Manager<AudioManager>.Instance.GetRandomLevelTrack();
             var dimension = random.Next(0, 2);
             audioObjectDefinition = dimension == 0 ? newAudio.track_8 : newAudio.track_16;
+            Manager<AudioManager>.Instance.StopMusic();
             return orig(self, audioObjectDefinition, loop, fadeInDuration, playbackTime, customAudioObject);
         }
     }
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index e6d09ea..c3750cd 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -398,7 +398,7 @@ public static void Teleport()
         public static void LeaveHQ(On.TotHQ.orig_LeaveToLevel orig, TotHQ self, bool playLevelMusic, bool loadingNewLevel)
         {
             Console.WriteLine($"leaving hq.. should be teleporting: {PortalMapping != null}");
-            LeftHQPortal = PortalMapping != null;
+            LeftHQPortal = PortalMapping != null && PortalMapping.Count > 0;
             orig(self, playLevelMusic, loadingNewLevel);
         }
     }
diff --git a/GameOverrideManagers/RandoTimeShardManager.cs b/GameOverrideManagers/RandoTimeShardManager.cs
index 723e014..bdb4e95 100644
--- a/GameOverrideManagers/RandoTimeShardManager.cs
+++ b/GameOverrideManagers/RandoTimeShardManager.cs
@@ -100,8 +100,6 @@ ItemsAndLocationsHandler.LocationsLookup[new LocationRO("Money Farm Room Mega Sh
                      ArchipelagoClient.ServerData.CheckedLocations.Contains(
                          ItemsAndLocationsHandler.LocationsLookup[new LocationRO("Quick Restock Mega Shard 1")]))
                 location = new LocationRO("Quick Restock Mega Shard 2");
-            if (ArchipelagoClient.ServerData.CheckedLocations.Contains(
-                    ItemsAndLocationsHandler.LocationsLookup[location])) return;
             ItemsAndLocationsHandler.SendLocationCheck(location);
         }
 
diff --git a/Utils/DialogChanger.cs b/Utils/DialogChanger.cs
index e89222e..034b467 100644
--- a/Utils/DialogChanger.cs
+++ b/Utils/DialogChanger.cs
@@ -87,13 +87,14 @@ public static void LoadDialogs_Elanguage(On.DialogManager.orig_LoadDialogs_ELang
                         LocCopy[replaceableKey][0].forcedPortraitOrientation = 0;
                         LocCopy[replaceableKey][0].position = EDialogPosition.CENTER;
                         LocCopy[replaceableKey][0].skippable = true;
-                        if (RandomizerStateManager.Instance.ScoutedLocations != null &&
+                        if ((RandomizerStateManager.Instance.ScoutedLocations != null || ArchipelagoClient.offline) &&
                             RandomizerStateManager.Instance.IsLocationRandomized(
                                 ItemDialogID.First(x => x.Value.Equals(replaceableKey)).Key,
                                 out var locationID))
                         {
-                            LocCopy[replaceableKey][0].text =
-                                RandomizerStateManager.Instance.ScoutedLocations[locationID].ToReadableString();
+                            LocCopy[replaceableKey][0].text = ArchipelagoClient.offline
+                                ? SeedGenerator.GetOfflineDialog(locationID)
+                                : RandomizerStateManager.Instance.ScoutedLocations[locationID].ToReadableString();
                         }
 
                         //This will remove all additional dialog that comes after the initial reward text
diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 2851486..709c0c3 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -169,7 +169,8 @@ public bool IsLocationRandomized(EItems vanillaLocationItem, out long locationID
                     ItemsAndLocationsHandler.LocationFromEItem(vanillaLocationItem);
                 if (locationID == 0) return false;
                 Console.WriteLine($"Checking if {vanillaLocationItem}, id: {locationID} is randomized.");
-                return ArchipelagoClient.ServerData.ScoutedLocations.ContainsKey(locationID);
+                return ArchipelagoClient.ServerData.ScoutedLocations.ContainsKey(locationID) ||
+                       ArchipelagoClient.ServerData.LocationData.ContainsKey(locationID);
             }
             catch (Exception e)
             {
@@ -337,7 +338,6 @@ public static void StartOfflineSeed()
             try
             {
                 var fileData = File.ReadAllText(gameFile);
-                Console.WriteLine(fileData.GetType());
                 var gameData = JObject.Parse(fileData);
                 ArchipelagoClient.ServerData = new ArchipelagoData();
                 ArchipelagoClient.ServerData.StartNewSeed();
@@ -354,13 +354,9 @@ public static void StartOfflineSeed()
                 Console.WriteLine("casting slot data");
                 ArchipelagoClient.ServerData.SlotData = gameData["slot_data"].ToObject<Dictionary<string, object>>();
                 Console.WriteLine("casting loc data");
-                Instance.ScoutedLocations =
-                    ArchipelagoClient.ServerData.ScoutedLocations = new Dictionary<long, NetworkItem>();
-                var locData = gameData["loc_data"].ToObject<Dictionary<long, string>>();
-                foreach (var kvp in locData)
-                {
-                    Instance.ScoutedLocations.Add(kvp.Key, JsonConvert.DeserializeObject<NetworkItem>(kvp.Value));
-                }
+                ArchipelagoClient.ServerData.ScoutedLocations = new Dictionary<long, NetworkItem>();
+                ArchipelagoClient.ServerData.LocationData =
+                    gameData["loc_data"].ToObject<Dictionary<long, Dictionary<string, List<long>>>>();
                 ArchipelagoClient.HasConnected = ArchipelagoClient.offline = true;
                 InitializeSeed();
             }
diff --git a/Utils/SeedGenerator.cs b/Utils/SeedGenerator.cs
index a82045b..1848db3 100644
--- a/Utils/SeedGenerator.cs
+++ b/Utils/SeedGenerator.cs
@@ -112,5 +112,26 @@ private static void OnGenerated(bool result, SubMenuButtonInfo generateButton)
             generatePopup.gameObject.SetActive(true);
             generating = false;
         }
+
+        public static string GetOfflineDialog(long locId)
+        {
+            var color = UserConfig.FillerColor;
+            var itemInfo = ArchipelagoClient.ServerData.LocationData[locId];
+            var itemName = itemInfo.Keys.First();
+            switch (itemInfo[itemName][1])
+            {
+                case 1:
+                    color = UserConfig.AdvancementColor;
+                    break;
+                case 2:
+                    color = UserConfig.UsefulColor;
+                    break;
+                case 4:
+                    color = UserConfig.TrapColor;
+                    break;
+            }
+
+            return $"Found <color=#{color}>{itemName}</color>";
+        }
     }
 }
\ No newline at end of file

From 6289f812c30fc6268d1a5e3bcc74118d933e00b7 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Tue, 6 Feb 2024 11:59:34 -0600
Subject: [PATCH 48/63] fix syntax for getting the item id

---
 Archipelago/ItemsAndLocationsHandler.cs | 2 +-
 Utils/SeedGenerator.cs                  | 6 +++---
 courier.toml                            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Archipelago/ItemsAndLocationsHandler.cs b/Archipelago/ItemsAndLocationsHandler.cs
index 37edb02..f3962f9 100644
--- a/Archipelago/ItemsAndLocationsHandler.cs
+++ b/Archipelago/ItemsAndLocationsHandler.cs
@@ -463,7 +463,7 @@ public static void SendLocationCheck(long locationID)
             }
             else if (ArchipelagoClient.offline)
             {
-                Unlock(ArchipelagoClient.ServerData.LocationData[locationID].Keys.First()[0]);
+                Unlock(ArchipelagoClient.ServerData.LocationData[locationID].First().Value[0]);
                 if (!HasDialog(locationID))
                 {
                     var dialog = SeedGenerator.GetOfflineDialog(locationID);
diff --git a/Utils/SeedGenerator.cs b/Utils/SeedGenerator.cs
index 1848db3..ad5ff14 100644
--- a/Utils/SeedGenerator.cs
+++ b/Utils/SeedGenerator.cs
@@ -116,9 +116,9 @@ private static void OnGenerated(bool result, SubMenuButtonInfo generateButton)
         public static string GetOfflineDialog(long locId)
         {
             var color = UserConfig.FillerColor;
-            var itemInfo = ArchipelagoClient.ServerData.LocationData[locId];
-            var itemName = itemInfo.Keys.First();
-            switch (itemInfo[itemName][1])
+            var itemInfo = ArchipelagoClient.ServerData.LocationData[locId].First();
+            var itemName = itemInfo.Key;
+            switch (itemInfo.Value[1])
             {
                 case 1:
                     color = UserConfig.AdvancementColor;
diff --git a/courier.toml b/courier.toml
index 16a23a7..74c9e70 100644
--- a/courier.toml
+++ b/courier.toml
@@ -1,5 +1,5 @@
 name = "TheMessengerRandomizerAP"
-version = "0.13.0-alpha-6"
+version = "0.13.0-alpha-7"
 dependencies = [
   { name = "Courier", version = "0.7.0" }
 ]

From f19fb68d2f5a3a3a89965e7d54924b36a17a9aaa Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Tue, 6 Feb 2024 19:47:06 -0600
Subject: [PATCH 49/63] fix NRE when trying to update state while offline,
 properly murder manfred, and move the load level hook out of the debug block

---
 APRandomizerMain.cs                        | 8 ++++----
 GameOverrideManagers/RandoLevelManager.cs  | 5 ++---
 GameOverrideManagers/RandoPortalManager.cs | 3 ++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 1afbd5d..e90d37f 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -389,6 +389,7 @@ void BuildHintMenu()
                 (orig, self, bossName) => RandoBossManager.SetBossAsDefeated(bossName);
             // level teleporting etc management
             On.Level.ChangeRoom += RandoRoomManager.Level_ChangeRoom;
+            On.LevelManager.LoadLevel += RandoLevelManager.LoadLevel;
             On.LevelManager.EndLevelLoading += RandoLevelManager.EndLevelLoading;
             On.ElementalSkylandsLevelInitializer.OnBeforeInitDone += RandoLevelManager.ElementalSkylandsInit;
             // On.PortalOpeningCutscene.OnOpenPortalEvent += RandoPortalManager.OpenPortalEvent;
@@ -416,7 +417,6 @@ void BuildHintMenu()
             On.UIManager.ShowView += UIManager_ShowView;
             On.MusicBox.SetNotesState += MusicBox_SetNotesState;
             On.PowerSeal.OnEnterRoom += PowerSeal_OnEnterRoom;
-            On.LevelManager.LoadLevel += RandoLevelManager.LoadLevel;
             #endif
 
             Console.WriteLine("Randomizer finished loading!");
@@ -1044,10 +1044,10 @@ private void OnSceneLoadedRando(Scene scene, LoadSceneMode mode)
         private void PlayerController_OnUpdate(PlayerController controller)
         {
             if (!ArchipelagoClient.HasConnected || randoStateManager.CurrentFileSlot == 0) return;
-            ArchipelagoClient.DeathLinkHandler.Player = controller;
-            if (RandomizerStateManager.IsSafeTeleportState() && !Manager<PauseManager>.Instance.IsPaused)
+            if (ArchipelagoClient.Authenticated && ArchipelagoClient.DeathLinkHandler.Player == null)
+                ArchipelagoClient.DeathLinkHandler.Player = controller;
+            if (RandomizerStateManager.IsSafeTeleportState() && !Manager<PauseManager>.Instance.IsPaused && ArchipelagoClient.Authenticated)
                 ArchipelagoClient.DeathLinkHandler.KillPlayer();
-            // ItemsAndLocationsHandler.UnlockItems();
             //This updates every {updateTime} seconds
             updateTimer += Time.deltaTime;
             if (!(updateTimer >= updateTime)) return;
diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index c74545f..b7ee112 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -1,7 +1,6 @@
 using System;
 using MessengerRando.Utils;
 using System.Collections.Generic;
-using System.Linq;
 using Archipelago.MultiClient.Net.Enums;
 using MessengerRando.Archipelago;
 using MessengerRando.Utils.Constants;
@@ -13,6 +12,7 @@ namespace MessengerRando.GameOverrideManagers
     public static class RandoLevelManager
     {
         private static bool teleporting;
+        public static bool KillManfred;
         private static ELevel lastLevel;
         private static ELevel currentLevel;
 
@@ -234,8 +234,7 @@ public static void TeleportInArea(ELevel area, Vector2 position, EBits dimension
         public static void ElementalSkylandsInit(On.ElementalSkylandsLevelInitializer.orig_OnBeforeInitDone orig,
             ElementalSkylandsLevelInitializer self)
         {
-            // self.startOnManfred = false;
-            self.startOnManfred = !RandoPortalManager.LeftHQPortal && teleporting;
+            self.startOnManfred = !KillManfred && teleporting;
             orig(self);
         }
 
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index c3750cd..3b077c9 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -379,13 +379,14 @@ private static LevelConstants.RandoLevel GetPortalExit(string enteredPortal)
 
         public static void Teleport()
         {
-            Console.WriteLine("trying to teleport to portal exit");
             var currentLevel = Manager<LevelManager>.Instance.GetCurrentLevelEnum();
             if (LevelConstants.TransitionToEntranceName.TryGetValue(
                     new LevelConstants.Transition(ELevel.Level_13_TowerOfTimeHQ,
                         currentLevel), out var portal))
             {
                 var newLevel = GetPortalExit(portal);
+                if (newLevel.LevelName.Equals(ELevel.Level_09_B_ElementalSkylands))
+                    RandoLevelManager.KillManfred = true;
                 RandoLevelManager.TeleportInArea(newLevel.LevelName, newLevel.PlayerPos, newLevel.Dimension);
             }
             else

From ce6775b7b95560cf648c6df7a096a3a6fa49ac62 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Tue, 6 Feb 2024 19:51:08 -0600
Subject: [PATCH 50/63] if in an invalid state add items to the queue

---
 Archipelago/ItemsAndLocationsHandler.cs | 7 ++++++-
 courier.toml                            | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Archipelago/ItemsAndLocationsHandler.cs b/Archipelago/ItemsAndLocationsHandler.cs
index f3962f9..a99a7c4 100644
--- a/Archipelago/ItemsAndLocationsHandler.cs
+++ b/Archipelago/ItemsAndLocationsHandler.cs
@@ -463,7 +463,12 @@ public static void SendLocationCheck(long locationID)
             }
             else if (ArchipelagoClient.offline)
             {
-                Unlock(ArchipelagoClient.ServerData.LocationData[locationID].First().Value[0]);
+                var itemToUnlock = ArchipelagoClient.ServerData.LocationData[locationID].First().Value[0];
+                if (RandomizerStateManager.IsSafeTeleportState())
+                    Unlock(itemToUnlock);
+                else
+                    ArchipelagoClient.ItemQueue.Enqueue(itemToUnlock);
+                
                 if (!HasDialog(locationID))
                 {
                     var dialog = SeedGenerator.GetOfflineDialog(locationID);
diff --git a/courier.toml b/courier.toml
index 74c9e70..736d2c9 100644
--- a/courier.toml
+++ b/courier.toml
@@ -1,5 +1,5 @@
 name = "TheMessengerRandomizerAP"
-version = "0.13.0-alpha-7"
+version = "0.13.0-alpha-8"
 dependencies = [
   { name = "Courier", version = "0.7.0" }
 ]

From 8bb3866a3bb03932ce0be441fb04f6aa2c22daec Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Tue, 6 Feb 2024 20:12:50 -0600
Subject: [PATCH 51/63] fix name grabbing for offline seeds

---
 Utils/RandomizerStateManager.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Utils/RandomizerStateManager.cs b/Utils/RandomizerStateManager.cs
index 709c0c3..24f6901 100644
--- a/Utils/RandomizerStateManager.cs
+++ b/Utils/RandomizerStateManager.cs
@@ -192,9 +192,7 @@ public static void InitializeNewSecondQuest(SaveGameSelectionScreen saveScreen,
             var saveManager = Manager<SaveManager>.Instance;
             saveManager.SelectSaveGameSlot(slot);
             saveManager.NewGame();
-            saveManager.GetCurrentSaveGameSlot().SlotName = ArchipelagoClient.offline
-                ? RandomizerOptions.Name
-                : ArchipelagoClient.Session.Players.GetPlayerAlias(ArchipelagoClient.Session.ConnectionInfo.Slot);
+            saveManager.GetCurrentSaveGameSlot().SlotName = ArchipelagoClient.ServerData.SlotName;
             // add everything to the various managers that we need for our save slot, following the order in SaveGameSlot.UpdateSaveGameData()
             var progManager = Manager<ProgressionManager>.Instance;
             progManager.lastSaveTime = Time.time;

From 702986c5acc7ba7a43c5e7af5e5504debb86697f Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Fri, 9 Feb 2024 22:57:10 -0600
Subject: [PATCH 52/63] fix the note reading cutscene soft locking for offline
 seeds and entering tower of time causing teleport looping

---
 APRandomizerMain.cs                        |  5 +----
 GameOverrideManagers/RandoPortalManager.cs | 23 ++++++++++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index e90d37f..ce04c33 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -1018,10 +1018,7 @@ bool OnSelectMessageTimer(string answer)
         /// <returns></returns>
         private EItems GetRandoItemByItem(EItems item)
         {
-            if (!randoStateManager.IsLocationRandomized(item, out var ruxxAmuletLocation)) return item;
-            Console.WriteLine($"IL Wackiness -- Checking for Item '{item}' | Rando item to return '{randoStateManager.ScoutedLocations[ruxxAmuletLocation].Item}'");
-
-            return EItems.POTION;
+            return !randoStateManager.IsLocationRandomized(item, out var ruxxAmuletLocation) ? item : EItems.POTION;
         }
 
         private string GetCurrentSeedNum()
diff --git a/GameOverrideManagers/RandoPortalManager.cs b/GameOverrideManagers/RandoPortalManager.cs
index 3b077c9..607d615 100644
--- a/GameOverrideManagers/RandoPortalManager.cs
+++ b/GameOverrideManagers/RandoPortalManager.cs
@@ -371,6 +371,7 @@ private static LevelConstants.RandoLevel GetPortalExit(string enteredPortal)
             if (enteredPortal.Equals("Tower of Time - Left"))
             {
                 EnteredTower = true;
+                return new LevelConstants.RandoLevel(ELevel.NONE, new Vector3());
             }
             var portalExit = PortalMapping[Portals.IndexOf(enteredPortal)];
             Console.WriteLine($"{portalExit.Region}, {portalExit.PortalType}, {portalExit.Index}");
@@ -384,10 +385,24 @@ public static void Teleport()
                     new LevelConstants.Transition(ELevel.Level_13_TowerOfTimeHQ,
                         currentLevel), out var portal))
             {
-                var newLevel = GetPortalExit(portal);
-                if (newLevel.LevelName.Equals(ELevel.Level_09_B_ElementalSkylands))
-                    RandoLevelManager.KillManfred = true;
-                RandoLevelManager.TeleportInArea(newLevel.LevelName, newLevel.PlayerPos, newLevel.Dimension);
+                try
+                {
+                    var newLevel = GetPortalExit(portal);
+                    switch (newLevel.LevelName)
+                    {
+                        case ELevel.Level_09_B_ElementalSkylands:
+                            RandoLevelManager.KillManfred = true;
+                            break;
+                        case ELevel.NONE:
+                            LeftHQPortal = false;
+                            return;
+                    }
+                    RandoLevelManager.TeleportInArea(newLevel.LevelName, newLevel.PlayerPos, newLevel.Dimension);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e);
+                }
             }
             else
             {

From dc72470ff448786f9cd5a40e566185a693a61f2c Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Fri, 9 Feb 2024 23:09:13 -0600
Subject: [PATCH 53/63] set emerald golem outro scene as completed when he's
 defeated to prevent soft locks

---
 GameOverrideManagers/RandoBossManager.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/GameOverrideManagers/RandoBossManager.cs b/GameOverrideManagers/RandoBossManager.cs
index d44b601..bb65600 100644
--- a/GameOverrideManagers/RandoBossManager.cs
+++ b/GameOverrideManagers/RandoBossManager.cs
@@ -166,6 +166,10 @@ public static void SetBossAsDefeated(string bossName)
                 {
                     var bossLoc = new LocationRO(bossName);
                     ItemsAndLocationsHandler.SendLocationCheck(bossLoc);
+                    if (bossName.Equals("EmeraldGolem"))
+                    {
+                        Manager<ProgressionManager>.Instance.cutscenesPlayed.Add("EmeraldGolemOutroCutscene");
+                    }
                 }
             }
             DefeatedBosses.Add(bossName);

From 4815c026255e1cdf6631fd32d04867d397934257 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Fri, 9 Feb 2024 23:10:18 -0600
Subject: [PATCH 54/63] bump alpha version

---
 courier.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/courier.toml b/courier.toml
index 736d2c9..f7a9ed9 100644
--- a/courier.toml
+++ b/courier.toml
@@ -1,5 +1,5 @@
 name = "TheMessengerRandomizerAP"
-version = "0.13.0-alpha-8"
+version = "0.13.0-alpha-9"
 dependencies = [
   { name = "Courier", version = "0.7.0" }
 ]

From fa5530b5c7cd808955446f9f49ae3e3e84dd084e Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 11 Feb 2024 15:08:29 -0600
Subject: [PATCH 55/63] disable port option for offline seeds

---
 APRandomizerMain.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index ce04c33..fd31c40 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -90,10 +90,8 @@ void BuildArchipelagoMenu()
                     () => ArchipelagoClient.ServerData?.Port.ToString(),
                     CharsetFlags.Number);
                 ArchipelagoMenu.ArchipelagoPortButton.IsEnabled =
-                    () => (!ArchipelagoClient.Authenticated || !ArchipelagoClient.offline) &&
-                          (Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE ||
-                           (Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE &&
-                            ArchipelagoClient.HasConnected));
+                    () => ArchipelagoClient.HasConnected && !ArchipelagoClient.Authenticated && !ArchipelagoClient.offline &&
+                          Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE;
                 
                 //Add archipelago name button
                 ArchipelagoMenu.ArchipelagoNameButton = ArchipelagoMenu.RegisterTextRandoButton(

From 93e91bf72bae664c24d5d478b5b33c7642c5d986 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 11 Feb 2024 15:09:09 -0600
Subject: [PATCH 56/63] fix forlorn right warp, and add glacial left

---
 Utils/Constants/LevelConstants.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Utils/Constants/LevelConstants.cs b/Utils/Constants/LevelConstants.cs
index 8418f12..9be9164 100644
--- a/Utils/Constants/LevelConstants.cs
+++ b/Utils/Constants/LevelConstants.cs
@@ -111,7 +111,7 @@ public override int GetHashCode()
                 }, // Must be 16
                 {
                     "Forlorn Temple - Right",
-                    new RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(454.4301f, -11f))
+                    new RandoLevel(ELevel.Level_03_ForlornTemple, new Vector3(454.4301f, -11f), EBits.BITS_16)
                 },
                 {
                     "Catacombs - Top Left",
@@ -210,7 +210,9 @@ public override int GetHashCode()
                     "Glacial Peak - Bottom",
                     new RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(202, -519))
                 },
-                // { "Glacial Peak - Left", new RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(), ELevelEntranceID.NONE) }, // This is one way to ES so no actual entrance here
+                {
+                    "Glacial Peak - Left", new RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(180, -307))
+                },
                 {
                     "Glacial Peak - Top",
                     new RandoLevel(ELevel.Level_09_A_GlacialPeak, new Vector3(176.04f, -13.71676f))
@@ -218,11 +220,7 @@ public override int GetHashCode()
                 {
                     "Elemental Skylands - Air Shmup",
                     new RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(-37.4f, 359.5f), EBits.BITS_16)
-                }, // 16 - This will probably be really difficult since it uses a different controller
-                // {
-                //     "Elemental Skylands - Air Shmup",
-                //     new RandoLevel(ELevel.Level_09_B_ElementalSkylands, new Vector3(-35, 359), EBits.BITS_16)
-                // },
+                },
                 {
                     "Tower of Time - Left",
                     new RandoLevel(ELevel.Level_10_A_TowerOfTime, new Vector3(-18f, -11f), EBits.BITS_8)
@@ -368,6 +366,10 @@ public override int GetHashCode()
                     new Transition(ELevel.Level_08_SearingCrags, ELevel.Level_09_A_GlacialPeak),
                     "Glacial Peak - Bottom"
                 },
+                {
+                    new Transition(ELevel.Level_09_B_ElementalSkylands, ELevel.Level_09_A_GlacialPeak),
+                    "Glacial Peak - Left"
+                },
                 {
                     new Transition(ELevel.Level_11_A_CloudRuins, ELevel.Level_09_A_GlacialPeak),
                     "Glacial Peak - Top"

From 1a9b1bfe810e2f719218d5b2d93949aeecb11225 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 11 Feb 2024 15:09:30 -0600
Subject: [PATCH 57/63] fix first shmup section being skipped for non ER seeds

---
 GameOverrideManagers/RandoLevelManager.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/GameOverrideManagers/RandoLevelManager.cs b/GameOverrideManagers/RandoLevelManager.cs
index b7ee112..14ff2d4 100644
--- a/GameOverrideManagers/RandoLevelManager.cs
+++ b/GameOverrideManagers/RandoLevelManager.cs
@@ -234,7 +234,12 @@ public static void TeleportInArea(ELevel area, Vector2 position, EBits dimension
         public static void ElementalSkylandsInit(On.ElementalSkylandsLevelInitializer.orig_OnBeforeInitDone orig,
             ElementalSkylandsLevelInitializer self)
         {
-            self.startOnManfred = !KillManfred && teleporting;
+            if (RandoPortalManager.PortalMapping != null && RandoLevelMapping != null)
+                self.startOnManfred = !KillManfred && teleporting;
+            else if (RandoPortalManager.PortalMapping != null)
+                self.startOnManfred = !KillManfred;
+            else if (RandoLevelMapping != null)
+                self.startOnManfred = teleporting;
             orig(self);
         }
 

From 4dd5c11454816519691a3c1d1f7bba273eb2daa1 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 11 Feb 2024 15:09:49 -0600
Subject: [PATCH 58/63] bump alpha version

---
 courier.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/courier.toml b/courier.toml
index f7a9ed9..a41fc19 100644
--- a/courier.toml
+++ b/courier.toml
@@ -1,5 +1,5 @@
 name = "TheMessengerRandomizerAP"
-version = "0.13.0-alpha-9"
+version = "0.13.0-alpha-10"
 dependencies = [
   { name = "Courier", version = "0.7.0" }
 ]

From d3da493180fee698faaf1a054dd3ea8e25808edf Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Sun, 11 Feb 2024 15:17:48 -0600
Subject: [PATCH 59/63] put the seed button above the AP info in case of
 needing to enter the new port

---
 APRandomizerMain.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index fd31c40..34174bc 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -67,6 +67,14 @@ void BuildArchipelagoMenu()
                         null);
                 ArchipelagoMenu.VersionButton.IsEnabled = () => true;
                 
+                // only visible while actually in the game
+                //Add current seed number button
+                ArchipelagoMenu.SeedNumButton = ArchipelagoMenu.RegisterSubRandoButton(
+                    () => "Current seed number: " + GetCurrentSeedNum(),
+                    null);
+                ArchipelagoMenu.SeedNumButton.IsEnabled = () =>
+                    ArchipelagoClient.HasConnected && Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE;
+
                 // these should only be visible from the main menu
                 //Add Archipelago host button
                 ArchipelagoMenu.ArchipelagoHostButton = ArchipelagoMenu.RegisterTextRandoButton(
@@ -124,14 +132,6 @@ void BuildArchipelagoMenu()
                     Manager<LevelManager>.Instance.GetCurrentLevelEnum() == ELevel.NONE &&
                     (!ArchipelagoClient.Authenticated || !ArchipelagoClient.offline);
 
-                // only visible while actually in the game
-                //Add current seed number button
-                ArchipelagoMenu.SeedNumButton = ArchipelagoMenu.RegisterSubRandoButton(
-                    () => "Current seed number: " + GetCurrentSeedNum(),
-                    null);
-                ArchipelagoMenu.SeedNumButton.IsEnabled = () =>
-                    ArchipelagoClient.HasConnected && randoStateManager.CurrentFileSlot != 0;
-
                 //Add windmill shuriken toggle button
                 ArchipelagoMenu.WindmillShurikenToggleButton = ArchipelagoMenu.RegisterSubRandoButton(
                     () => Manager<ProgressionManager>.Instance.useWindmillShuriken

From 05db75bf57dea1cdae967b6650654ed393d2aa4c Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Wed, 14 Feb 2024 18:01:12 -0600
Subject: [PATCH 60/63] fix some more dialog issues and zip the output as a
 build action

---
 Archipelago/ArchipelagoData.cs                | 25 +++++++++----------
 MessengerRando.csproj                         | 22 ++++++++++------
 Utils/DialogChanger.cs                        | 22 +++++++++++++---
 ...cationInfo.cs => NetworkItemExtensions.cs} | 12 ++++++---
 release.bat                                   |  5 ----
 5 files changed, 53 insertions(+), 33 deletions(-)
 rename Utils/{LocationInfo.cs => NetworkItemExtensions.cs} (78%)
 delete mode 100644 release.bat

diff --git a/Archipelago/ArchipelagoData.cs b/Archipelago/ArchipelagoData.cs
index b34680c..a97756d 100644
--- a/Archipelago/ArchipelagoData.cs
+++ b/Archipelago/ArchipelagoData.cs
@@ -79,8 +79,13 @@ private bool loadData(int slot)
                                 CheckedLocations.ToArray()));
                         while (ArchipelagoClient.ItemQueue.Count > 0 && i < Index)
                         {
-                            i += 1;
+                            if (!ArchipelagoClient.Session.Items.AllItemsReceived[i].Player
+                                    .Equals(ArchipelagoClient.Session.ConnectionInfo.Slot))
+                            {
+                                ArchipelagoClient.DialogQueue.Dequeue();
+                            }
                             ArchipelagoClient.ItemQueue.Dequeue();
+                            i += 1;
                         }
                         return true;
                     }
@@ -115,8 +120,13 @@ private bool loadData(int slot)
                 ArchipelagoClient.Connect();
                 while (ArchipelagoClient.ItemQueue.Count > 0 && i < Index)
                 {
-                    i += 1;
+                    if (!ArchipelagoClient.Session.Items.AllItemsReceived[i].Player
+                            .Equals(ArchipelagoClient.Session.ConnectionInfo.Slot))
+                    {
+                        ArchipelagoClient.DialogQueue.Dequeue();
+                    }
                     ArchipelagoClient.ItemQueue.Dequeue();
+                    i += 1;
                 }
                 return ArchipelagoClient.HasConnected = true;
             }
@@ -126,16 +136,5 @@ private bool loadData(int slot)
                 return false; 
             }
         }
-
-        public static void ClearData()
-        {
-            for (int slot = 0; slot <= 3; slot++)
-            {
-                var filePath = Application.persistentDataPath + "ArchipelagoSlot{slot}.map";
-                if (File.Exists(filePath)) { File.Delete(filePath); }
-                var nextPath = Application.persistentDataPath + $"/ArchipelagoSlot{slot}.map";
-                if (File.Exists(nextPath)) { File.Delete(nextPath); }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/MessengerRando.csproj b/MessengerRando.csproj
index 8611bed..c29273f 100644
--- a/MessengerRando.csproj
+++ b/MessengerRando.csproj
@@ -2,8 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <TargetFramework>net35</TargetFramework>
     <ProjectGuid>{6271B317-0737-489F-8319-67F0AC291D20}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -12,9 +11,9 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <Version>0.13.0-alpha-10</Version>
   </PropertyGroup>
+  
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -26,14 +25,19 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\TheMessengerRandomizerAP\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>bin\Release\net35\TheMessengerRandomizerAP\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+
+  <Target Name="ZipMod" AfterTargets="PostBuildEvent" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <ZipDirectory SourceDirectory="bin\Release\net35\"
+                  DestinationFile="bin\Release\TheMessengerRandomizerAP-$(Version).zip"
+                  Overwrite="true"/>
+  </Target>
+  
   <ItemGroup>
     <Reference Include="Archipelago.MultiClient.Net, Version=5.0.6.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\Archipelago.MultiClient.Net.5.0.6\lib\net35\Archipelago.MultiClient.Net.dll</HintPath>
@@ -89,6 +93,7 @@
       <HintPath>packages\Archipelago.MultiClient.Net.5.0.6\lib\net35\websocket-sharp.dll</HintPath>
     </Reference>
   </ItemGroup>
+  
   <ItemGroup>
     <Compile Include="Archipelago\ArchipelagoClient.cs" />
     <Compile Include="Archipelago\ArchipelagoData.cs" />
@@ -117,7 +122,7 @@
     <Compile Include="Utils\RandoMenu.cs" />
     <Compile Include="Utils\RandomizerOptions.cs" />
     <Compile Include="Utils\RandoSave.cs" />
-    <Compile Include="Utils\LocationInfo.cs" />
+    <Compile Include="Utils\NetworkItemExtensions.cs" />
     <Compile Include="Utils\DialogChanger.cs" />
     <Compile Include="Utils\RandomizerConstants.cs" />
     <Compile Include="Utils\RandomizerStateManager.cs" />
@@ -130,6 +135,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
diff --git a/Utils/DialogChanger.cs b/Utils/DialogChanger.cs
index 034b467..b468c71 100644
--- a/Utils/DialogChanger.cs
+++ b/Utils/DialogChanger.cs
@@ -92,9 +92,25 @@ public static void LoadDialogs_Elanguage(On.DialogManager.orig_LoadDialogs_ELang
                                 ItemDialogID.First(x => x.Value.Equals(replaceableKey)).Key,
                                 out var locationID))
                         {
-                            LocCopy[replaceableKey][0].text = ArchipelagoClient.offline
-                                ? SeedGenerator.GetOfflineDialog(locationID)
-                                : RandomizerStateManager.Instance.ScoutedLocations[locationID].ToReadableString();
+                            if (ArchipelagoClient.offline)
+                            {
+                                LocCopy[replaceableKey][0].text = SeedGenerator.GetOfflineDialog(locationID);
+                            }
+                            else
+                            {
+                                var netItem = RandomizerStateManager.Instance.ScoutedLocations[locationID];
+                                var otherPlayer = netItem.Player;
+                                if (otherPlayer.Equals(ArchipelagoClient.Session.ConnectionInfo.Slot))
+                                {
+                                    LocCopy[replaceableKey][0].text = netItem.ToReadableString();
+                                }
+                                else
+                                {
+                                    var otherPlayerName = ArchipelagoClient.Session.Players.GetPlayerAlias(otherPlayer);
+                                    netItem.Player = ArchipelagoClient.Session.ConnectionInfo.Slot;
+                                    LocCopy[replaceableKey][0].text = netItem.ToReadableString(otherPlayerName);
+                                }
+                            }
                         }
 
                         //This will remove all additional dialog that comes after the initial reward text
diff --git a/Utils/LocationInfo.cs b/Utils/NetworkItemExtensions.cs
similarity index 78%
rename from Utils/LocationInfo.cs
rename to Utils/NetworkItemExtensions.cs
index 125d137..35f2462 100644
--- a/Utils/LocationInfo.cs
+++ b/Utils/NetworkItemExtensions.cs
@@ -12,15 +12,19 @@ public static string ToReadableString(this NetworkItem item, string otherPlayer
             string text;
             var ownPlayer = ArchipelagoClient.Session.ConnectionInfo.Slot;
             if (item.Player.Equals(ownPlayer))
+            {
                 text = item.Location.Equals(-1) ? $"Cheated {item.Colorize()}" : $"Found {item.Colorize()}";
+                
+                text += otherPlayer.IsNullOrEmpty()
+                    ? "!"
+                    : $" for <color=#{UserConfig.OtherPlayerColor}>{otherPlayer}</color>";
+            }
             else
             {
-                text = $"Received {item.Colorize()}!";
+                text = $"Received {item.Colorize()} from <color=#{UserConfig.OtherPlayerColor}>" +
+                       $"{ArchipelagoClient.Session.Players.GetPlayerAlias(item.Player)}!";
                 return text;
             }
-            text += otherPlayer.IsNullOrEmpty() || otherPlayer.Equals(ArchipelagoClient.Session.Players.GetPlayerAlias(ownPlayer))
-                ? "!"
-                : $" for <color=#{UserConfig.OtherPlayerColor}>{otherPlayer}</color>";
             return text;
         }
 
diff --git a/release.bat b/release.bat
deleted file mode 100644
index e706b75..0000000
--- a/release.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-ECHO off
-set /p version="Enter version for this release: "
-cd bin\Release
-7z a -tzip TheMessengerRandomizerAP.zip TheMessengerRandomizerAP
-ren TheMessengerRandomizerAP.zip TheMessengerRandomizerAP-%version%.zip
\ No newline at end of file

From 69264b6132aad883bbef78327e530c20ab6fe831 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Wed, 14 Feb 2024 21:31:09 -0600
Subject: [PATCH 61/63] bump version

---
 Archipelago/ArchipelagoClient.cs | 2 +-
 MessengerRando.csproj            | 2 +-
 courier.toml                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
index da5e17c..97f266c 100644
--- a/Archipelago/ArchipelagoClient.cs
+++ b/Archipelago/ArchipelagoClient.cs
@@ -18,7 +18,7 @@ namespace MessengerRando.Archipelago
 {
     public static class ArchipelagoClient
     {
-        private const string ApVersion = "0.4.2";
+        private const string ApVersion = "0.4.3";
         public static ArchipelagoData ServerData = new ArchipelagoData();
 
         private delegate void OnConnectAttempt(string result);
diff --git a/MessengerRando.csproj b/MessengerRando.csproj
index c29273f..ac51f60 100644
--- a/MessengerRando.csproj
+++ b/MessengerRando.csproj
@@ -11,7 +11,7 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
-    <Version>0.13.0-alpha-10</Version>
+    <Version>0.13.0</Version>
   </PropertyGroup>
   
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/courier.toml b/courier.toml
index a41fc19..d8307ca 100644
--- a/courier.toml
+++ b/courier.toml
@@ -1,5 +1,5 @@
 name = "TheMessengerRandomizerAP"
-version = "0.13.0-alpha-10"
+version = "0.13.0"
 dependencies = [
   { name = "Courier", version = "0.7.0" }
 ]

From 674fb2aaa70f02fed85cfed54f56e078ac09a619 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Thu, 15 Feb 2024 20:39:02 -0600
Subject: [PATCH 62/63] fix port button not showing up and improve generation
 failure message

---
 APRandomizerMain.cs    | 14 +++++++++++---
 Utils/SeedGenerator.cs |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/APRandomizerMain.cs b/APRandomizerMain.cs
index 34174bc..de519d7 100644
--- a/APRandomizerMain.cs
+++ b/APRandomizerMain.cs
@@ -97,9 +97,7 @@ void BuildArchipelagoMenu()
                     () => "Enter the port for the Archipelago session",
                     () => ArchipelagoClient.ServerData?.Port.ToString(),
                     CharsetFlags.Number);
-                ArchipelagoMenu.ArchipelagoPortButton.IsEnabled =
-                    () => ArchipelagoClient.HasConnected && !ArchipelagoClient.Authenticated && !ArchipelagoClient.offline &&
-                          Manager<LevelManager>.Instance.GetCurrentLevelEnum() != ELevel.NONE;
+                ArchipelagoMenu.ArchipelagoPortButton.IsEnabled = ArchipelagoPortEnabled;
                 
                 //Add archipelago name button
                 ArchipelagoMenu.ArchipelagoNameButton = ArchipelagoMenu.RegisterTextRandoButton(
@@ -933,6 +931,16 @@ bool OnSelectArchipelagoPort(string answer)
             return true;
         }
 
+        bool ArchipelagoPortEnabled()
+        {
+            if (Manager<LevelManager>.Instance.GetCurrentLevelEnum().Equals(ELevel.NONE))
+            {
+                return !ArchipelagoClient.HasConnected;
+            }
+
+            return ArchipelagoClient.HasConnected && !ArchipelagoClient.Authenticated && !ArchipelagoClient.offline;
+        }
+
         bool OnSelectArchipelagoName(string answer)
         {
             if (answer == null) return true;
diff --git a/Utils/SeedGenerator.cs b/Utils/SeedGenerator.cs
index ad5ff14..3fe0de4 100644
--- a/Utils/SeedGenerator.cs
+++ b/Utils/SeedGenerator.cs
@@ -108,7 +108,7 @@ private static void OnGenerated(bool result, SubMenuButtonInfo generateButton)
                 null,
                 TextEntryButtonInfo.CharsetFlags.Space);
             
-            generatePopup.Init(result ? "Seed successfully generated!" : "Seed generation failed.");
+            generatePopup.Init(result ? "Seed successfully generated!" : "Seed generation failed. Ensure you've output a settings file.");
             generatePopup.gameObject.SetActive(true);
             generating = false;
         }

From c99d7c6e4825dedef4e93c8585cfa045e8498da7 Mon Sep 17 00:00:00 2001
From: alwaysintreble <mmmcheese158@gmail.com>
Date: Thu, 15 Feb 2024 20:39:25 -0600
Subject: [PATCH 63/63] bump version

---
 MessengerRando.csproj | 2 +-
 courier.toml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MessengerRando.csproj b/MessengerRando.csproj
index ac51f60..bbd45b5 100644
--- a/MessengerRando.csproj
+++ b/MessengerRando.csproj
@@ -11,7 +11,7 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
-    <Version>0.13.0</Version>
+    <Version>0.13.1</Version>
   </PropertyGroup>
   
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/courier.toml b/courier.toml
index d8307ca..65efd35 100644
--- a/courier.toml
+++ b/courier.toml
@@ -1,5 +1,5 @@
 name = "TheMessengerRandomizerAP"
-version = "0.13.0"
+version = "0.13.1"
 dependencies = [
   { name = "Courier", version = "0.7.0" }
 ]