Resolved

nexus4880 · Jan 28, 2025 · 150b330 · 150b330
1 parent 5da3fa5
commit 150b330
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 38 deletions.
diff --git a/Fuyu.Backend.BSG/Models/Profiles/InventoryInfo.cs b/Fuyu.Backend.BSG/Models/Profiles/InventoryInfo.cs
@@ -6,6 +6,7 @@
 using Fuyu.Backend.BSG.Models.Items;
 using Fuyu.Backend.BSG.Services;
 using Fuyu.Common.Hashing;
+using Fuyu.Common.IO;
 
 namespace Fuyu.Backend.BSG.Models.Profiles;
 
@@ -45,9 +46,10 @@ private void OnDeserialized(StreamingContext _)
                 {
                     item.InitializeMatrices(props.Grids, items);
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
-                    // ignored, this fails on bot gifter (and maybe others)
+                    // this fails on bot gifter (and maybe others)
+                    Terminal.WriteLine($"Failed to initialize matrices: {ex}");
                 }
             }
         }

diff --git a/Fuyu.Backend.EFTMain/Controllers/Http/ClientRagfairFindController.cs b/Fuyu.Backend.EFTMain/Controllers/Http/ClientRagfairFindController.cs
@@ -129,41 +129,7 @@ public override Task RunAsync(EftHttpContext context, RagfairFindRequest body)
 
         if (body.ConditionFrom > 0 || body.ConditionTo < 100)
         {
-            selectedOffers.RemoveAll(o =>
-            {
-                var repairable = o.RootItem.Updatable.Repairable;
-
-                if (repairable != null)
-                {
-                    var percentage = repairable.Durability / repairable.MaxDurability * 100f;
-
-                    if (percentage > body.ConditionTo || percentage < body.ConditionFrom)
-                    {
-                        return true;
-                    }
-                }
-
-                var repairKit = o.RootItem.Updatable.RepairKit;
-
-                if (repairKit != null)
-                {
-                    var properties = _itemFactoryService.GetItemProperties<RepairKitsItemProperties>(o.RootItem.TemplateId);
-
-                    if (properties == null)
-                    {
-                        return true;
-                    }
-
-                    var percentage = repairKit.Resource / properties.MaxRepairResource * 100f;
-
-                    if (percentage > body.ConditionTo || percentage < body.ConditionFrom)
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            });
+            selectedOffers.RemoveAll(o => !MeetsConditions(o, body.ConditionTo, body.ConditionFrom));
         }
 
         if (body.PriceFrom > 0)
@@ -341,4 +307,40 @@ private List<Offer> RequiredSearch(HandbookTemplates handbook, MongoId neededSea
 
         return result;
     }
+
+    private bool MeetsConditions(Offer offer, int conditionFrom, int conditionTo)
+    {
+        var repairable = offer.RootItem.Updatable.Repairable;
+
+        if (repairable != null)
+        {
+            var percentage = repairable.Durability / repairable.MaxDurability * 100f;
+
+            if (percentage > conditionTo || percentage < conditionFrom)
+            {
+                return false;
+            }
+        }
+
+        var repairKit = offer.RootItem.Updatable.RepairKit;
+
+        if (repairKit != null)
+        {
+            var properties = _itemFactoryService.GetItemProperties<RepairKitsItemProperties>(offer.RootItem.TemplateId);
+
+            if (properties == null)
+            {
+                return false;
+            }
+
+            var percentage = repairKit.Resource / properties.MaxRepairResource * 100f;
+
+            if (percentage > conditionTo || percentage < conditionFrom)
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/Fuyu.Backend.EFTMain/Controllers/ItemEvents/ApplyInventoryChangesItemEventController.cs b/Fuyu.Backend.EFTMain/Controllers/ItemEvents/ApplyInventoryChangesItemEventController.cs
@@ -71,7 +71,7 @@ private void UtilizeSameMatrix(EftProfile profile, ApplyInventoryChangesEvent re
         {
             var itemAndChildren = profile.Pmc.Inventory.GetItemAndChildren(ItemService.Instance, changedItem);
 
-            // Store sorted Location (MUST BE A VALUE1)
+            // Store sorted Location (MUST BE AN UNION.VALUE1)
             var previousLocation = changedItem.Location.Value1;
 
             // Free all items previous positions