DrakiaXYZ/LootDumpProcessor
DrakiaXYZ/LootDumpProcessor
0
0
Fork 0
Code Pull Requests Activity

Cleanup of var names

Browse Source
This commit is contained in:
Dev 2024-04-22 19:09:20 +01:00
parent 7002b60e02
commit 8a541316d4
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Process/Processor/DumpProcessor/MultithreadSteppedDumpProcessor.cs
View File

@ -52,11 +52,10 @@ public class MultithreadSteppedDumpProcessor : IDumpProcessor
Runners.Add( Runners.Add(
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Debug)) if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Debug))
LoggerFactory.GetInstance().Log($"Processing static data for file {dumped.BasicInfo.FileName}", LogLevel.Debug); LoggerFactory.GetInstance().Log($"Processing static data for file {dumped.BasicInfo.FileName}", LogLevel.Debug);
var data = _jsonSerializer.Deserialize<RootData>(File.ReadAllText(dumped.BasicInfo.FileName)); var dataDump = _jsonSerializer.Deserialize<RootData>(File.ReadAllText(dumped.BasicInfo.FileName));
var mapName = data.Data.Name; var mapName = dataDump.Data.Name;
// the if statement below takes care of processing "forced" or real static data for each map, only need // 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 // 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)) if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info))
LoggerFactory.GetInstance().Log($"Doing first time process for map {mapName} of real static data", 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 // .Item1 = map name
staticContainers[mapStaticContainers.Item1] = mapStaticContainers.Item2; staticContainers[mapStaticContainers.Item1] = mapStaticContainers.Item2;
} }
@ -93,18 +92,18 @@ public class MultithreadSteppedDumpProcessor : IDumpProcessor
IncrementMapCounterDictionaryValue(mapDumpCounter, mapName); IncrementMapCounterDictionaryValue(mapDumpCounter, mapName);
} }
var containerIgnoreListExists = LootDumpProcessorContext.GetConfig().ContainerIgnoreList.TryGetValue(data.Data.Id.ToLower(), out string[]? ignoreListForMap); var containerIgnoreListExists = LootDumpProcessorContext.GetConfig().ContainerIgnoreList.TryGetValue(dataDump.Data.Id.ToLower(), out string[]? ignoreListForMap);
foreach (var dynamicStaticContainer in StaticLootProcessor.CreateDynamicStaticContainers(data)) foreach (var dynamicStaticContainer in StaticLootProcessor.CreateDynamicStaticContainers(dataDump))
{ {
lock (mapStaticContainersAggregatedLock) lock (mapStaticContainersAggregatedLock)
{ {
// Skip adding containers to aggredated data if container id is in ignore list
if (containerIgnoreListExists && ignoreListForMap.Contains(dynamicStaticContainer.Id)) if (containerIgnoreListExists && ignoreListForMap.Contains(dynamicStaticContainer.Id))
{ {
// Skip adding containers to aggregated data if container id is in ignore list
continue; continue;
} }
// Increment count by 1 // Increment times container seen in dump by 1
if (!mapAggregatedDataDict.TryAdd(dynamicStaticContainer, 1)) if (!mapAggregatedDataDict.TryAdd(dynamicStaticContainer, 1))
mapAggregatedDataDict[dynamicStaticContainer] += 1; mapAggregatedDataDict[dynamicStaticContainer] += 1;
} }
@ -126,7 +125,7 @@ public class MultithreadSteppedDumpProcessor : IDumpProcessor
td => new StaticDataPoint td => new StaticDataPoint
{ {
Template = td.Key, Template = td.Key,
Probability = GetStaticContainerProbability(kv.Key, td, mapDumpCounter) Probability = GetStaticContainerProbability(kv.Key, td, mapDumpCounter) // kv.Key = map name
} }
).ToList() ).ToList()
).ToList().ForEach(kv => staticContainers[kv.Key].StaticContainers = kv.Value); ).ToList().ForEach(kv => staticContainers[kv.Key].StaticContainers = kv.Value);

6
Process/Processor/StaticLootProcessor.cs
View File

@ -140,8 +140,8 @@ public static class StaticLootProcessor
select cii).ToList().Count); select cii).ToList().Count);
} }
static_loot_distribution[typei] = new StaticItemDistribution(); static_loot_distribution[typeId] = new StaticItemDistribution();
static_loot_distribution[typei].ItemCountDistribution = itemscounts.GroupBy(i => i) static_loot_distribution[typeId].ItemCountDistribution = itemscounts.GroupBy(i => i)
.Select(g => new ItemCountDistribution .Select(g => new ItemCountDistribution
{ {
Count = g.Key, 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, Tpl = v.Key,
RelativeProbability = v.Value RelativeProbability = v.Value