Improvements

This commit is contained in:
Dev 2023-09-12 14:29:29 +01:00
parent 7d11ff3f9d
commit 505f2ea241

View File

@ -6,7 +6,6 @@ using AssortGenerator.Models.Output;
using Common; using Common;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text.Json; using System.Text.Json;
@ -175,6 +174,8 @@ namespace AssortGenerator
List<AssortUnlocks> missingQuestAssorts, List<AssortUnlocks> missingQuestAssorts,
Dictionary<string, MissingAssortPrice> missingQuestAssortPrices) Dictionary<string, MissingAssortPrice> missingQuestAssortPrices)
{ {
var questData = QuestHelper.GetFinalisedQuestData();
// iterate over each missing assort // iterate over each missing assort
foreach (var missingQuestAssort in missingQuestAssorts) foreach (var missingQuestAssort in missingQuestAssorts)
{ {
@ -235,8 +236,11 @@ namespace AssortGenerator
} }
else else
{ {
var firstItem = itemsToAdd.First();
firstItem.upd ??= new Upd();
// no value in json, set stack count to 10 // no value in json, set stack count to 10
itemsToAdd.First().upd.StackObjectsCount = 10; firstItem.upd.StackObjectsCount = 10;
} }
outputAssortFile.items.AddRange(itemsToAdd); outputAssortFile.items.AddRange(itemsToAdd);
@ -249,7 +253,8 @@ namespace AssortGenerator
} }
else else
{ {
barterItemListInner.Add(new BarterObject() { _tpl = "5449016a4bdc2d6f028b456f", count = 25000 }); // Default to 6969 roubles
barterItemListInner.Add(new BarterObject() { _tpl = "5449016a4bdc2d6f028b456f", count = 6969 });
} }
var barterItemListOuter = new List<List<BarterObject>> { barterItemListInner }; var barterItemListOuter = new List<List<BarterObject>> { barterItemListInner };
@ -260,7 +265,7 @@ namespace AssortGenerator
var associatedQuestAssort = questAssort.success.FirstOrDefault(x => x.Value == missingQuestAssort.QuestId && x.Key.StartsWith("UnknownAssortId")); var associatedQuestAssort = questAssort.success.FirstOrDefault(x => x.Value == missingQuestAssort.QuestId && x.Key.StartsWith("UnknownAssortId"));
if (associatedQuestAssort.Key != null) if (associatedQuestAssort.Key != null)
{ {
LoggingHelpers.LogWarning($"Able to replace missing quest: {missingQuestAssort.QuestId} assort with placeholder"); LoggingHelpers.LogWarning($"Able to replace missing quest: {missingQuestAssort.QuestId} {questData.FirstOrDefault(x => x.Key == missingQuestAssort.QuestId).Value.QuestName} assort with placeholder");
questAssort.success.Remove(associatedQuestAssort.Key); questAssort.success.Remove(associatedQuestAssort.Key);
questAssort.success.Add(missingQuestAssort.Items[0]._id, missingQuestAssort.QuestId); questAssort.success.Add(missingQuestAssort.Items[0]._id, missingQuestAssort.QuestId);
} }
@ -304,11 +309,6 @@ namespace AssortGenerator
continue; continue;
} }
if (matchingQuest.QuestName == "Debut")
{
var x = 2;
}
RewardStatus matchingReward = null; RewardStatus matchingReward = null;
switch (assort.Criteria) switch (assort.Criteria)
{ {
@ -402,7 +402,7 @@ namespace AssortGenerator
int unknownCount = 1; int unknownCount = 1;
foreach (var assortUnlock in assortUnlocks.Where(x => x.TraderType == trader)) foreach (var assortUnlock in assortUnlocks.Where(x => x.TraderType == trader))
{ {
if (assortUnlock.QuestId == "60e71ce009d7c801eb0c0ec6") if (assortUnlock.QuestId == "64f83bcdde58fc437700d8fa")
{ {
var x = 2; var x = 2;
} }