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

Resolve missing static forced containers/weapons when using loot dumps from multiple versions

Browse Source 
Instead of only using the static forced containers from the first dump, merge all static forced containers so we can utilize dumps from multiple versions
This commit is contained in:
DrakiaXYZ 2024-11-04 20:41:05 -08:00
parent 0719a7bfdd
commit 90e0c2c4b9
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,18 +66,31 @@ public class MultithreadSteppedDumpProcessor : IDumpProcessor
var mapId = dataDump.Data.LocationLoot.Id.ToLower(); var mapId = dataDump.Data.LocationLoot.Id.ToLower();
// the if statement below takes care of processing "forced" or real static data for each map, only need // Because we may use multiple version dumps for map data, merge the static loot between dumps
// to do this once per map, we dont care about doing it again
lock (staticContainersLock) lock (staticContainersLock)
{ {
if (!staticContainers.ContainsKey(mapId)) if (!staticContainers.TryGetValue(mapId, out var mapStaticLoot))
{ {
if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info)) if (LoggerFactory.GetInstance().CanBeLogged(LogLevel.Info))
LoggerFactory.GetInstance().Log($"Doing first time process for map {mapId} of real static data", LogLevel.Info); LoggerFactory.GetInstance().Log($"Doing first time process for map {mapId} of real static data", LogLevel.Info);
var mapStaticContainers = StaticLootProcessor.CreateStaticWeaponsAndStaticForcedContainers(dataDump);
staticContainers[mapId] = new MapStaticLoot
{
StaticWeapons = new List<Template>(),
StaticForced = new List<StaticForced>()
};
}
else
{
// .Item1 = map name // .Item1 = map name
// .Item2 = force/weapon static arrays // .Item2 = force/weapon static arrays
staticContainers[mapStaticContainers.Item1] = mapStaticContainers.Item2; var mapStaticContainers = StaticLootProcessor.CreateStaticWeaponsAndStaticForcedContainers(dataDump);
var newStaticWeapons = mapStaticContainers.Item2.StaticWeapons.Where(x => !mapStaticLoot.StaticWeapons.Exists(y => y.Id == x.Id));
var newStaticForced = mapStaticContainers.Item2.StaticForced.Where(x => !mapStaticLoot.StaticForced.Exists(y => y.ContainerId == x.ContainerId));
mapStaticLoot.StaticWeapons.AddRange(newStaticWeapons);
mapStaticLoot.StaticForced.AddRange(newStaticForced);
} }
} }