chomp/AssortVerifier
chomp/AssortVerifier
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show better errors when there are multiple live assorts at the same trader level

Browse Source
This commit is contained in:
Chomp 2021-09-11 21:31:19 +01:00
parent 2e7a4cf358
commit c07d793458
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
AssortValidator/Program.cs
View File

@ -79,7 +79,7 @@ namespace AssortValidator
} }
else else
{ {
LoggingHelpers.LogError("no missing assorts found in offline when compared to live :)"); LoggingHelpers.LogSuccess("no missing assorts found in offline when compared to live :)");
} }
} }
} }
@ -107,7 +107,7 @@ namespace AssortValidator
LoggingHelpers.LogInfo($"{trader.Key}: itemId: {assort._id} - tpId: {assort._tpl} ({itemName}) Level {assortLoyaltyLevel}"); LoggingHelpers.LogInfo($"{trader.Key}: itemId: {assort._id} - tpId: {assort._tpl} ({itemName}) Level {assortLoyaltyLevel}");
LogUnlockQuest(questAssortUnlocks, assort, assortLoyaltyLevel); LogUnlockQuest(questAssortUnlocks, assort, assortLoyaltyLevel);
var liveAssort = GetLiveAssort(correspondingLiveTrader.items, assort._tpl, correspondingLiveTrader.loyal_level_items, assortLoyaltyLevel); var liveAssort = GetLiveAssort(correspondingLiveTrader, assort._tpl, assortLoyaltyLevel);
if (liveAssort == null) if (liveAssort == null)
{ {
continue; continue;
@ -269,8 +269,11 @@ namespace AssortValidator
ValueCheckerHelper.CheckValuesMatch(assort.upd.BuyRestrictionMax.GetValueOrDefault(0), correspondingLiveAssort.upd.BuyRestrictionMax.GetValueOrDefault(0), "BuyRestrictionMax does not match"); ValueCheckerHelper.CheckValuesMatch(assort.upd.BuyRestrictionMax.GetValueOrDefault(0), correspondingLiveAssort.upd.BuyRestrictionMax.GetValueOrDefault(0), "BuyRestrictionMax does not match");
} }
private static LiveAssort.Item GetLiveAssort(List<LiveAssort.Item> liveAssorts, string templateId, Dictionary<string, int> loyaltyLevels, int expectedLoyaltyLevel) private static LiveAssort.Item GetLiveAssort(LiveAssort trader, string templateId, int expectedLoyaltyLevel)
{ {
var liveAssorts = trader.items;
var liveLoyaltyLevels = trader.loyal_level_items;
var liveAssortsWithTemplateId = liveAssorts.Where(x => x._tpl == templateId).ToList(); var liveAssortsWithTemplateId = liveAssorts.Where(x => x._tpl == templateId).ToList();
if (liveAssortsWithTemplateId.Count == 0) if (liveAssortsWithTemplateId.Count == 0)
@ -290,26 +293,33 @@ namespace AssortValidator
// More than one assort found // More than one assort found
// Gather assort ids and use them to get loyalty level records // Gather assort ids and use them to get loyalty level records
var liveAssortsIds = liveAssortsWithTemplateId.Select(x => x._id); var liveAssortsIds = liveAssortsWithTemplateId.Select(x => x._id);
var liveloyaltyLevelsForTemplateId = loyaltyLevels.Where(x => liveAssortsIds.Contains(x.Key)).ToList(); var liveLoyaltyLevelsForTemplateId = liveLoyaltyLevels.Where(x => liveAssortsIds.Contains(x.Key)).ToList();
if (liveloyaltyLevelsForTemplateId.All(x => x.Value == expectedLoyaltyLevel) && liveloyaltyLevelsForTemplateId.Count > 1) // Same loyalty level + multiple found
if (liveLoyaltyLevelsForTemplateId.All(x => x.Value == expectedLoyaltyLevel) && liveLoyaltyLevelsForTemplateId.Count > 1)
{ {
// Both have same loyalty level, cant proceed; // Both have same loyalty level, cant proceed;
LoggingHelpers.LogError($"Unable to find live assort item: {templateId} ({ItemTemplateHelper.GetTemplateById(templateId)._name}) "); LoggingHelpers.LogError($"Multiple ({liveLoyaltyLevelsForTemplateId.Count}) live assorts for this tpId found at same Level ({expectedLoyaltyLevel}) - Unable to distinguish: {templateId} ({ItemTemplateHelper.GetTemplateById(templateId)._name}) ");
LoggingHelpers.LogNewLine(); LoggingHelpers.LogNewLine();
return null; return null;
} }
IEnumerable<KeyValuePair<string, int>> loyaltyLevelItemThatMatches = liveloyaltyLevelsForTemplateId.Where(x => x.Value == expectedLoyaltyLevel); var loyaltyLevelItemThatMatches = liveLoyaltyLevelsForTemplateId.Where(x => x.Value == expectedLoyaltyLevel);
if (loyaltyLevelItemThatMatches != null && loyaltyLevelItemThatMatches.Count() > 1)
{
LoggingHelpers.LogWarning($"({loyaltyLevelItemThatMatches.Count()}) live items found, choosing first one in list");
}
if (loyaltyLevelItemThatMatches == null) if (loyaltyLevelItemThatMatches == null)
{ {
// Both have same loyalty level, cant proceed; // Both have same loyalty level, cant proceed;
LoggingHelpers.LogError($"Unable to find live assort item: {templateId} ({ItemTemplateHelper.GetTemplateById(templateId)._name})"); LoggingHelpers.LogError($"No live assort for this tpId found at same level - Unable proceed: {templateId} ({ItemTemplateHelper.GetTemplateById(templateId)._name})");
LoggingHelpers.LogNewLine(); LoggingHelpers.LogNewLine();
return null; return null;
} }
return liveAssorts.FirstOrDefault(x => x._id == loyaltyLevelItemThatMatches.FirstOrDefault().Key); return liveAssorts.Find(x => x._id == loyaltyLevelItemThatMatches.FirstOrDefault().Key);
} }
private static int GetRoundedStackCount(int stackObjectsCount) private static int GetRoundedStackCount(int stackObjectsCount)