From 8a541316d42c20ace705a03e5033e8052d96564e Mon Sep 17 00:00:00 2001 From: Dev Date: Mon, 22 Apr 2024 19:09:20 +0100 Subject: [PATCH] Cleanup of var names --- .../MultithreadSteppedDumpProcessor.cs | 17 ++++++++--------- Process/Processor/StaticLootProcessor.cs | 6 +++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Process/Processor/DumpProcessor/MultithreadSteppedDumpProcessor.cs b/Process/Processor/DumpProcessor/MultithreadSteppedDumpProcessor.cs index 4dbbeba..16303ea 100644 --- a/Process/Processor/DumpProcessor/MultithreadSteppedDumpProcessor.cs +++ b/Process/Processor/DumpProcessor/MultithreadSteppedDumpProcessor.cs @@ -52,11 +52,10 @@ public class MultithreadSteppedDumpProcessor : IDumpProcessor Runners.Add( Task.Factory.StartNew(() => { - if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Debug)) LoggerFactory.GetInstance().Log($"Processing static data for file {dumped.BasicInfo.FileName}", LogLevel.Debug); - var data = _jsonSerializer.Deserialize(File.ReadAllText(dumped.BasicInfo.FileName)); - var mapName = data.Data.Name; + var dataDump = _jsonSerializer.Deserialize(File.ReadAllText(dumped.BasicInfo.FileName)); + var mapName = dataDump.Data.Name; // the if statement below takes care of processing "forced" or real static data for each map, only need // to do this once per map, we dont care about doing it again @@ -66,7 +65,7 @@ public class MultithreadSteppedDumpProcessor : IDumpProcessor { if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info)) LoggerFactory.GetInstance().Log($"Doing first time process for map {mapName} of real static data", LogLevel.Info); - var mapStaticContainers = StaticLootProcessor.CreateStaticWeaponsAndStaticForcedContainers(data); + var mapStaticContainers = StaticLootProcessor.CreateStaticWeaponsAndStaticForcedContainers(dataDump); // .Item1 = map name staticContainers[mapStaticContainers.Item1] = mapStaticContainers.Item2; } @@ -93,18 +92,18 @@ public class MultithreadSteppedDumpProcessor : IDumpProcessor IncrementMapCounterDictionaryValue(mapDumpCounter, mapName); } - var containerIgnoreListExists = LootDumpProcessorContext.GetConfig().ContainerIgnoreList.TryGetValue(data.Data.Id.ToLower(), out string[]? ignoreListForMap); - foreach (var dynamicStaticContainer in StaticLootProcessor.CreateDynamicStaticContainers(data)) + var containerIgnoreListExists = LootDumpProcessorContext.GetConfig().ContainerIgnoreList.TryGetValue(dataDump.Data.Id.ToLower(), out string[]? ignoreListForMap); + foreach (var dynamicStaticContainer in StaticLootProcessor.CreateDynamicStaticContainers(dataDump)) { lock (mapStaticContainersAggregatedLock) { - // Skip adding containers to aggredated data if container id is in ignore list if (containerIgnoreListExists && ignoreListForMap.Contains(dynamicStaticContainer.Id)) { + // Skip adding containers to aggregated data if container id is in ignore list continue; } - // Increment count by 1 + // Increment times container seen in dump by 1 if (!mapAggregatedDataDict.TryAdd(dynamicStaticContainer, 1)) mapAggregatedDataDict[dynamicStaticContainer] += 1; } @@ -126,7 +125,7 @@ public class MultithreadSteppedDumpProcessor : IDumpProcessor td => new StaticDataPoint { Template = td.Key, - Probability = GetStaticContainerProbability(kv.Key, td, mapDumpCounter) + Probability = GetStaticContainerProbability(kv.Key, td, mapDumpCounter) // kv.Key = map name } ).ToList() ).ToList().ForEach(kv => staticContainers[kv.Key].StaticContainers = kv.Value); diff --git a/Process/Processor/StaticLootProcessor.cs b/Process/Processor/StaticLootProcessor.cs index 300a03c..9b96d55 100644 --- a/Process/Processor/StaticLootProcessor.cs +++ b/Process/Processor/StaticLootProcessor.cs @@ -140,8 +140,8 @@ public static class StaticLootProcessor select cii).ToList().Count); } - static_loot_distribution[typei] = new StaticItemDistribution(); - static_loot_distribution[typei].ItemCountDistribution = itemscounts.GroupBy(i => i) + static_loot_distribution[typeId] = new StaticItemDistribution(); + static_loot_distribution[typeId].ItemCountDistribution = itemscounts.GroupBy(i => i) .Select(g => new ItemCountDistribution { Count = g.Key, @@ -161,7 +161,7 @@ public static class StaticLootProcessor } } - static_loot_distribution[typei].ItemDistribution = itemsHitCounts.Select(v => new StaticDistribution + static_loot_distribution[typeId].ItemDistribution = itemsHitCounts.Select(v => new StaticDistribution { Tpl = v.Key, RelativeProbability = v.Value