spt/loot-dump-processor
spt/loot-dump-processor
0
0
Fork 0
mirror of https://github.com/sp-tarkov/loot-dump-processor.git synced 2025-02-13 02:10:46 -05:00
Code

Refactored loose loot processor to process single map

Browse Source
This commit is contained in:
bluextx 2025-01-11 07:41:15 +03:00
parent 8366915048
commit 1a4003595a
3 changed files with 151 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/LootDumpProcessor/Process/Processor/DumpProcessor/MultithreadSteppedDumpProcessor.cs
View File

@ -3,6 +3,7 @@ using LootDumpProcessor.Logger;
using LootDumpProcessor.Model;
using LootDumpProcessor.Model.Input;
using LootDumpProcessor.Model.Output;
using LootDumpProcessor.Model.Output.LooseLoot;
using LootDumpProcessor.Model.Output.StaticContainer;
using LootDumpProcessor.Model.Processing;
using LootDumpProcessor.Process.Processor.v2.AmmoProcessor;
@ -222,17 +223,22 @@ public class MultithreadSteppedDumpProcessor(
if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info))
LoggerFactory.GetInstance().Log("Processing loose loot distribution", LogLevel.Info);
// Loose loot distribution
var looseLootDistribution = _looseLootProcessor.CreateLooseLootDistribution(
dumpProcessData.MapCounts,
dumpProcessData.LooseLootCounts
);
// Loose loot distribution
var looseLoot = new ConcurrentDictionary<string, LooseLootRoot>();
Parallel.ForEach(dumpProcessData.MapCounts.Keys, mapId =>
{
var mapCount = dumpProcessData.MapCounts[mapId];
var looseLootCount = dumpProcessData.LooseLootCounts[mapId];
var looseLootDistribution =
_looseLootProcessor.CreateLooseLootDistribution(mapId, mapCount, looseLootCount);
looseLoot[mapId] = looseLootDistribution;
});
if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info))
LoggerFactory.GetInstance().Log("Collecting loose loot distribution information", LogLevel.Info);
var loot = dumpProcessData.MapCounts
.Select(mapCount => mapCount.Key)
.ToDictionary(mi => mi, mi => looseLootDistribution[mi]);
.ToDictionary(mi => mi, mi => looseLoot[mi]);
output.Add(OutputFileType.LooseLoot, loot);
if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info))

7
source/LootDumpProcessor/Process/Processor/v2/LooseLootProcessor/ILooseLootProcessor.cs
View File

@ -9,9 +9,10 @@ namespace LootDumpProcessor.Process.Processor.v2.LooseLootProcessor
{
PreProcessedLooseLoot PreProcessLooseLoot(List<Template> looseLoot);
Dictionary<string, LooseLootRoot> CreateLooseLootDistribution(
Dictionary<string, int> mapCounts,
Dictionary<string, IKey> looseLootCounts
LooseLootRoot CreateLooseLootDistribution(
string mapId,
int mapCount,
IKey looseLootCountKey
);
}
}

46
source/LootDumpProcessor/Process/Processor/v2/LooseLootProcessor/LooseLootProcessor.cs
View File

@ -36,8 +36,8 @@ namespace LootDumpProcessor.Process.Processor.v2.LooseLootProcessor
if (!uniqueLootIds.ContainsKey(sanitizedId))
{
uniqueLootIds[sanitizedId] = template.Id;
preProcessedLoot.Counts[sanitizedId] = preProcessedLoot.Counts.ContainsKey(sanitizedId)
? preProcessedLoot.Counts[sanitizedId] + 1
preProcessedLoot.Counts[sanitizedId] = preProcessedLoot.Counts.TryGetValue(sanitizedId, out var count)
? count + 1
: 1;
}
@ -54,22 +54,18 @@ namespace LootDumpProcessor.Process.Processor.v2.LooseLootProcessor
return preProcessedLoot;
}
public Dictionary<string, LooseLootRoot> CreateLooseLootDistribution(
Dictionary<string, int> mapCounts,
Dictionary<string, IKey> looseLootCounts
public LooseLootRoot CreateLooseLootDistribution(
string mapId,
int mapCount,
IKey looseLootCountKey
)
{
var config = LootDumpProcessorContext.GetConfig();
var spawnPointTolerance = config.ProcessorConfig.SpawnPointToleranceForForced / 100;
var looseLootDistribution = new Dictionary<string, LooseLootRoot>();
foreach (var map in mapCounts)
{
var mapName = map.Key;
var mapCount = map.Value;
var looseLootDistribution = new LooseLootRoot();
var probabilities = new Dictionary<string, double>();
var looseLootCountsItem = _dataStorage.GetItem<LooseLootCounts>(looseLootCounts[mapName]);
var looseLootCountsItem = _dataStorage.GetItem<LooseLootCounts>(looseLootCountKey);
var counts = _dataStorage.GetItem<FlatKeyableDictionary<string, int>>(looseLootCountsItem.Counts);
foreach (var (itemId, count) in counts)
@ -86,16 +82,13 @@ namespace LootDumpProcessor.Process.Processor.v2.LooseLootProcessor
.Where(count => count <= highThreshold)
.ToList();
looseLootDistribution[mapName] = new LooseLootRoot
{
SpawnPointCount = new SpawnPointCount
looseLootDistribution.SpawnPointCount = new SpawnPointCount
{
Mean = np.mean(np.array(looseLootCountsItem.MapSpawnpointCount)),
Std = np.std(np.array(looseLootCountsItem.MapSpawnpointCount))
},
SpawnPointsForced = new List<SpawnPointsForced>(),
SpawnPoints = new List<SpawnPoint>()
};
looseLootDistribution.SpawnPointsForced = new List<SpawnPointsForced>();
looseLootDistribution.SpawnPoints = new List<SpawnPoint>();
var itemProperties = _dataStorage.GetItem<FlatKeyableDictionary<string, IKey>>(looseLootCountsItem.ItemProperties);
foreach (var (spawnPoint, itemListKey) in itemProperties)
@ -131,7 +124,7 @@ namespace LootDumpProcessor.Process.Processor.v2.LooseLootProcessor
if (itemDistributions.Count == 1 &&
(LootDumpProcessorContext.GetTarkovItems().IsQuestItem(itemDistributions[0].ComposedKey?.FirstItem?.Tpl) ||
LootDumpProcessorContext.GetForcedLooseItems()[mapName].Contains(itemDistributions[0].ComposedKey?.FirstItem?.Tpl)))
LootDumpProcessorContext.GetForcedLooseItems()[mapId].Contains(itemDistributions[0].ComposedKey?.FirstItem?.Tpl)))
{
var forcedSpawnPoint = new SpawnPointsForced
{
@ -139,7 +132,7 @@ namespace LootDumpProcessor.Process.Processor.v2.LooseLootProcessor
Probability = probabilities[spawnPoint],
Template = templateCopy
};
looseLootDistribution[mapName].SpawnPointsForced.Add(forcedSpawnPoint);
looseLootDistribution.SpawnPointsForced.Add(forcedSpawnPoint);
}
else if (probabilities[spawnPoint] > spawnPointTolerance)
{
@ -149,7 +142,7 @@ namespace LootDumpProcessor.Process.Processor.v2.LooseLootProcessor
Probability = probabilities[spawnPoint],
Template = templateCopy
};
looseLootDistribution[mapName].SpawnPointsForced.Add(forcedSpawnPoint);
looseLootDistribution.SpawnPointsForced.Add(forcedSpawnPoint);
_logger.LogWarning(
"Item: {ItemId} has > {Tolerance}% spawn chance in spawn point: {LocationId} but isn't in forced loot, adding to forced",
templateCopy.Id,
@ -198,16 +191,16 @@ namespace LootDumpProcessor.Process.Processor.v2.LooseLootProcessor
}
}
looseLootDistribution[mapName].SpawnPoints.Add(spawnPointEntry);
looseLootDistribution.SpawnPoints.Add(spawnPointEntry);
}
}
looseLootDistribution[mapName].SpawnPoints = looseLootDistribution[mapName].SpawnPoints
looseLootDistribution.SpawnPoints = looseLootDistribution.SpawnPoints
.OrderBy(x => x.Template.Id)
.ToList();
var configuredForcedTemplates = new HashSet<string>(LootDumpProcessorContext.GetForcedLooseItems()[mapName].Select(item => item));
var foundForcedTemplates = new HashSet<string>(looseLootDistribution[mapName].SpawnPointsForced.Select(fp => fp.Template.Items[0].Tpl));
var configuredForcedTemplates = new HashSet<string>(LootDumpProcessorContext.GetForcedLooseItems()[mapId].Select(item => item));
var foundForcedTemplates = new HashSet<string>(looseLootDistribution.SpawnPointsForced.Select(fp => fp.Template.Items[0].Tpl));
foreach (var expectedTpl in configuredForcedTemplates)
{
@ -226,12 +219,11 @@ namespace LootDumpProcessor.Process.Processor.v2.LooseLootProcessor
{
_logger.LogWarning(
"Map: {MapName} Item: {ItemTpl} not defined in forced_loose.yaml config but was flagged as forced by code",
mapName,
mapId,
foundTpl
);
}
}
}
return looseLootDistribution;
}