Add an option for whether or not items are shown when received offline

ArchipelagoMW-HollowKnight · May 10, 2024 · d2b14ee · d2b14ee
1 parent 09d93c8
commit d2b14ee
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/Archipelago.HollowKnight/Archipelago.cs b/Archipelago.HollowKnight/Archipelago.cs
@@ -297,7 +297,8 @@ public ConnectionDetails OnSaveGlobal()
             {
                 ServerUrl = MenuSettings.ServerUrl,
                 ServerPort = MenuSettings.ServerPort,
-                SlotName = MenuSettings.SlotName
+                SlotName = MenuSettings.SlotName,
+                AlwaysShowItems = MenuSettings.AlwaysShowItems,
             };
         }
     }

diff --git a/Archipelago.HollowKnight/ConnectionDetails.cs b/Archipelago.HollowKnight/ConnectionDetails.cs
@@ -10,5 +10,7 @@ public record ConnectionDetails
 
         public string RoomSeed { get; set; }
         public long Seed { get; set; }
+
+        public bool AlwaysShowItems { get; set; }
     }
 }
diff --git a/Archipelago.HollowKnight/IC/Modules/ItemNetworkingModule.cs b/Archipelago.HollowKnight/IC/Modules/ItemNetworkingModule.cs
@@ -180,12 +180,13 @@ private async Task Synchronize()
                 NetworkItem seen = session.Items.DequeueItem();
                 Archipelago.Instance.LogDebug($"Fast-forwarding past already-obtained {session.Items.GetItemName(seen.Item)} at index {i}");
             }
+            bool silentGive = !Archipelago.Instance.MenuSettings.AlwaysShowItems;
             // receive from the server any items that are pending
-            while (ReceiveNextItem(true)) { }
+            while (ReceiveNextItem(silentGive)) { }
             // ensure any already-checked locations (co-op, restarting save) are marked cleared
             foreach (long location in session.Locations.AllLocationsChecked)
             {
-                MarkLocationAsChecked(location, true);
+                MarkLocationAsChecked(location, silentGive);
             }
             // send out any pending items that didn't get to the network from the previous session
             long[] pendingLocations = deferredLocationChecks.ToArray();

diff --git a/Archipelago.HollowKnight/MC/ArchipelagoModeMenuConstructor.cs b/Archipelago.HollowKnight/MC/ArchipelagoModeMenuConstructor.cs
@@ -153,7 +153,9 @@ private static void StartOrResumeGame(bool newGame, MenuLabel errorLabel)
             }
             else
             {
-                Archipelago.Instance.MenuSettings = Archipelago.Instance.ApSettings with { };
+                Archipelago.Instance.MenuSettings = Archipelago.Instance.ApSettings with {
+                    AlwaysShowItems = Archipelago.Instance.MenuSettings.AlwaysShowItems
+                };
             }
             try
             {
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 else
                 {
-                    Archipelago.Instance.MenuSettings = Archipelago.Instance.ApSettings with { };
+                    Archipelago.Instance.MenuSettings = Archipelago.Instance.ApSettings with {
+                        AlwaysShowItems = Archipelago.Instance.MenuSettings.AlwaysShowItems
+                    };
                 }
                 try
                 {
@@ Expand Down @@