diff --git a/GenerateQuestFile/Program.cs b/GenerateQuestFile/Program.cs index 7ac6633..bf4c54b 100644 --- a/GenerateQuestFile/Program.cs +++ b/GenerateQuestFile/Program.cs @@ -107,7 +107,7 @@ namespace GenerateQuestFile if (!quest.Value.conditions.AvailableForStart.Any(x => x._parent == "Quest" && x._props.target.ToString() == questRequirement.PreceedingQuest)) { - LoggingHelpers.LogSuccess($"{quest.Value.QuestName} needs a prereq of quest {QuestHelper.GetQuestNameById(questRequirement.PreceedingQuest)}, adding."); + LoggingHelpers.LogSuccess($"{quest.Value.QuestName} needs a prereq of quest {questRequirement.GetQuestName()}, adding."); quest.Value.conditions.AvailableForStart.Add(new AvailableFor { _parent = "Quest", @@ -126,7 +126,7 @@ namespace GenerateQuestFile { if (questRequirement != null) { - LoggingHelpers.LogInfo($"{quest.Value.QuestName} already has prereq of quest {QuestHelper.GetQuestNameById(questRequirement.PreceedingQuest)}, skipping."); + LoggingHelpers.LogInfo($"{quest.Value.QuestName} already has prereq of quest {questRequirement.GetQuestName()}, skipping."); } } } diff --git a/QuestValidator.Common/Helpers/QuestHelper.cs b/QuestValidator.Common/Helpers/QuestHelper.cs index 53774ff..2d2e66f 100644 --- a/QuestValidator.Common/Helpers/QuestHelper.cs +++ b/QuestValidator.Common/Helpers/QuestHelper.cs @@ -335,6 +335,14 @@ namespace AssortGenerator.Common.Helpers { "5ac346cf86f7741d63233a02", new QuestRequirement{QuestStatus = 4, PreceedingQuest="5ac346a886f7744e1b083d67"}}, // Signal. Part 3, Signal. Part 2 { "5ac346e886f7741d6118b99b", new QuestRequirement{QuestStatus = 4, PreceedingQuest="5ac346cf86f7741d63233a02"}}, // Signal. Part 4, Signal. Part 3 { "5ac3475486f7741d6224abd3", new QuestRequirement{QuestStatus = 4, PreceedingQuest="5ac3460c86f7742880308185"}}, // Bad habit, Farming. Part 2 + { "5ac3477486f7741d651d6885", new QuestRequirement{QuestStatus = 4, PreceedingQuest="5ac346a886f7744e1b083d67"} }, // Scout, Signal. Part 2 + { "5ac3479086f7742880308199", new QuestRequirement{QuestStatus = 4, PreceedingQuest="5ac3467986f7741d6224abc2"} }, // Insider, Signal. Part 1 + { "5ae3267986f7742a413592fe", new QuestRequirement{QuestStatus = 4, PreceedingQuest="5ac244c486f77413e12cf945"}}, // Gunsmith. Part 7, Gunsmith. Part 6 + { "5ae3270f86f77445ba41d4dd", new QuestRequirement{QuestStatus = 4, PreceedingQuest="5ae3267986f7742a413592fe"}}, // Gunsmith. Part 8, Gunsmith. Part 7 + { "5ae3277186f7745973054106", new QuestRequirement{QuestStatus = 4, PreceedingQuest="5ae3270f86f77445ba41d4dd"}}, // Gunsmith. Part 9, Gunsmith. Part 8 + { "5ae327c886f7745c7b3f2f3f", new QuestRequirement{QuestStatus = 4, PreceedingQuest="5ae3277186f7745973054106"}}, // Gunsmith. Part 10, Gunsmith. Part 9 + { "5ae3280386f7742a41359364", new QuestRequirement{QuestStatus = 4, PreceedingQuest="5ae327c886f7745c7b3f2f3f"}}, // Gunsmith. Part 11, Gunsmith. Part 10 + { "5ae448a386f7744d3730fff0", new QuestRequirement{QuestStatus = 4, PreceedingQuest=""}}, // Only business }; private static QuestRoot _liveQuestData; diff --git a/QuestValidator.Common/Models/QuestRequirement.cs b/QuestValidator.Common/Models/QuestRequirement.cs index c1f1f0c..535a38b 100644 --- a/QuestValidator.Common/Models/QuestRequirement.cs +++ b/QuestValidator.Common/Models/QuestRequirement.cs @@ -1,4 +1,6 @@ -namespace QuestValidator.Common.Models +using AssortGenerator.Common.Helpers; + +namespace QuestValidator.Common.Models { public class QuestRequirement { @@ -7,5 +9,10 @@ /// public int QuestStatus { get; set; } public string PreceedingQuest { get; set; } + + public string GetQuestName() + { + return QuestHelper.GetQuestNameById(PreceedingQuest); + } } }