Merge pull request #5 from FFXIV-CombatReborn/sweep-improvements-2

Supermarket sweep improvements
FFXIV-CombatReborn · Oct 11, 2024 · e5cce4f · e5cce4f
2 parents 9b54584 + 7589ece
commit e5cce4f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/.idea/.idea.RebornToolbox/.idea/vcs.xml b/.idea/.idea.RebornToolbox/.idea/vcs.xml
diff --git a/RebornToolbox/Features/MBShoppingList/MBShoppingList.Config.cs b/RebornToolbox/Features/MBShoppingList/MBShoppingList.Config.cs
@@ -6,7 +6,6 @@ public class MBShoppingList_Config
 {
     public bool Enabled { get; set; } = false;
     public RegionType ShoppingRegion { get; set; } = RegionType.NorthAmerica;
-    public int MaxResults { get; set; } = 100;
     public int LifeStreamTimeout { get; set; } = 300;
     public bool UseVnavPathing { get; set; } = false;
     public bool RemoveQuantityAutomatically { get; set; } = false;

diff --git a/RebornToolbox/Features/MBShoppingList/MBShoppingList.UI.cs b/RebornToolbox/Features/MBShoppingList/MBShoppingList.UI.cs
@@ -60,12 +60,6 @@ public override void Draw()
         }
 
         ImGui.SetNextItemWidth(100);
-        int maxResults = Plugin.Configuration.ShoppingListConfig.MaxResults;
-        if (ImGui.InputInt("Max Search Results", ref maxResults))
-        {
-            Plugin.Configuration.ShoppingListConfig.MaxResults = maxResults;
-            Plugin.Configuration.SaveConfig();
-        }
 
 
         if (Plugin.Configuration.ExpertMode)

diff --git a/RebornToolbox/Features/MBShoppingList/MBShoppingList.cs b/RebornToolbox/Features/MBShoppingList/MBShoppingList.cs
@@ -75,6 +75,8 @@ private void OnItemAdded((uint, InventoryItem.ItemFlags, ulong, uint) itemDetail
             return;
 
         wantedItem.Quantity -= itemDetails.Item4;
+        if (wantedItem.Quantity < 0)
+            wantedItem.Quantity = 0;
     }
 
 

diff --git a/RebornToolbox/Features/MBShoppingList/Models/ShoppingListItem.cs b/RebornToolbox/Features/MBShoppingList/Models/ShoppingListItem.cs
@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using Dalamud.Plugin.Ipc.Exceptions;
 using ECommons;
 using ECommons.DalamudServices;
 using FFXIVClientStructs.FFXIV.Client.Game;
@@ -62,8 +63,19 @@ public long InventoryCount
         {
             if (DateTime.Now.Subtract(_inventoryLastUpdated).TotalSeconds > 1)
             {
-                _inventoryLastUpdated = DateTime.Now;
-                _inventoryCount = AllaganTools_IPCSubscriber.IsInitialized() ? AllaganTools_IPCSubscriber.ItemCountOwned(ItemId, !Plugin.Configuration.ShoppingListConfig.AllCharactersInventory, ValidInventoryTypes.Select(i => (uint)i).ToArray()) : 0;
+                try
+                {
+                    _inventoryCount = AllaganTools_IPCSubscriber.IsInitialized()
+                        ? AllaganTools_IPCSubscriber.ItemCountOwned(ItemId,
+                            !Plugin.Configuration.ShoppingListConfig.AllCharactersInventory,
+                            ValidInventoryTypes.Select(i => (uint)i).ToArray())
+                        : 0;
+                    _inventoryLastUpdated = DateTime.Now;
+                }
+                catch (Exception ex)
+                {
+                    Svc.Log.Error($"Allagan Tools IPC failed: {ex.Message}");
+                }
             }
 
             return _inventoryCount;
@@ -227,10 +239,9 @@ private async Task FetchMarketDataAsync()
             {
                 using var client = new HttpClient();
 
-                var maxResults = Plugin.Configuration.ShoppingListConfig.MaxResults;
                 var responseString = await client
                     .GetStringAsync(
-                        $"https://universalis.app/api/v2/{Plugin.Configuration.ShoppingListConfig.ShoppingRegion.ToUniversalisString()}/{ItemId}?listings={maxResults}&entries={maxResults}")
+                        $"https://universalis.app/api/v2/{Plugin.Configuration.ShoppingListConfig.ShoppingRegion.ToUniversalisString()}/{ItemId}")
                     .ConfigureAwait(false);
 
                 if (!string.IsNullOrEmpty(responseString))
-Original file line number
+Diff line change
@@ Expand Up @@
                 return;
             wantedItem.Quantity -= itemDetails.Item4;
+            if (wantedItem.Quantity < 0)
+                wantedItem.Quantity = 0;
         }
@@ Expand Down @@