Merge pull request #3160 from ProTriforcer/patch-1

Loadout manager window performance fixes
CombatExtended-Continued · Jun 4, 2024 · 767a72b · 767a72b
2 parents 45084f2 + c6b68e7
commit 767a72b
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/Source/CombatExtended/CombatExtended/Loadouts/Dialog_ManageLoadouts.cs b/Source/CombatExtended/CombatExtended/Loadouts/Dialog_ManageLoadouts.cs
@@ -85,13 +85,13 @@ public Dialog_ManageLoadouts(Loadout loadout)
             _allSuitableDefs = DefDatabase<ThingDef>.AllDefs.Where(td => !td.IsMenuHidden() && IsSuitableThingDef(td)).ToList();
             _allDefsGeneric = DefDatabase<LoadoutGenericDef>.AllDefs.OrderBy(g => g.label).ToList();
             _selectableItems = new List<SelectableItem>();
+            List<ThingDef> suitableMapDefs = Find.CurrentMap.listerThings.AllThings.Where((Thing thing) => !thing.PositionHeld.Fogged(thing.MapHeld) && !thing.GetInnerIfMinified().def.Minifiable).Select((Thing thing) => thing.def).Distinct().Intersect(_allSuitableDefs).ToList();
             foreach (var td in _allSuitableDefs)
             {
                 _selectableItems.Add(new SelectableItem()
                 {
                     thingDef = td,
-                    isGreyedOut = (Find.CurrentMap.listerThings.AllThings.Find(thing => thing.GetInnerIfMinified().def == td && !thing.def.Minifiable) == null)
-                    //!thing.PositionHeld.Fogged(thing.MapHeld) //check Thing is visible on map. CPU expensive!
+                    isGreyedOut = (suitableMapDefs.Find((ThingDef def) => def == td) == null)
                 });
             }
             SetSource(SourceSelection.Ranged);
@@ -1046,15 +1046,16 @@ private void initGenericVisibilityDictionary()
         {
             int tick = GenTicks.TicksAbs;
             int position = 1;
-            foreach (LoadoutGenericDef def in _sourceGeneric)
+            List<ThingDef> mapDefs = Find.CurrentMap.listerThings.AllThings.Where((Thing thing) => !thing.PositionHeld.Fogged(thing.MapHeld) && !thing.GetInnerIfMinified().def.Minifiable).Select((Thing thing) => thing.def).Distinct().ToList();
+            foreach (LoadoutGenericDef loadoutDef in _sourceGeneric)
             {
-                if (!genericVisibility.ContainsKey(def))
+                if (!genericVisibility.ContainsKey(loadoutDef))
                 {
-                    genericVisibility.Add(def, new VisibilityCache());
+                    genericVisibility.Add(loadoutDef, new VisibilityCache());
                 }
-                genericVisibility[def].ticksToRecheck = tick;
-                genericVisibility[def].check = Find.CurrentMap.listerThings.AllThings.Find(x => def.lambda(x.GetInnerIfMinified().def) && !x.def.Minifiable) == null;
-                genericVisibility[def].position = position;
+                genericVisibility[loadoutDef].ticksToRecheck = tick;
+                genericVisibility[loadoutDef].check = mapDefs.Find((ThingDef def) => loadoutDef.lambda(def)) == null;
+                genericVisibility[loadoutDef].position = position;
                 position++;
                 tick += advanceTicks;
             }