Merge branch 'new-menus' into archipelago

# Conflicts: # APRandomizerMain.cs # MessengerRando.csproj # Utils/SeedGenerator.cs # courier.toml
alwaysintreble · Feb 16, 2024 · bbf3b5a · bbf3b5a
2 parents e94f3f4 + c99d7c6
commit bbf3b5a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git 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/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/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;
         }

diff --git 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" }
 ]