goatzone/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

sync with upstreaom #2

Open
goatzone wants to merge 610 commits from liza/Questionable:master into master
pull from: liza/Questionable:master
merge into: goatzone:master
Conversation 0 Commits 610 Files Changed 1200 +11 -3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dc4d216fba - Show all commits

10
Questionable/Data/QuestData.cs
View File

@ -177,9 +177,17 @@ internal sealed class QuestData
foreach (var questId in uldahSideQuests) foreach (var questId in uldahSideQuests)
((QuestInfo)_quests[new QuestId(questId)]).StartingCity = 3; ((QuestInfo)_quests[new QuestId(questId)]).StartingCity = 3;
// follow-up quests to picking a GC // follow-up quests to picking a GC
AddGcFollowUpQuests(); AddGcFollowUpQuests();
// update relic quests to be in a different journal category
ushort[] zodiacStartingQuests = [1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1579];
foreach (var questId in zodiacStartingQuests)
{
var quest = ((QuestInfo)_quests[new QuestId(questId)]);
quest.JournalGenre = 82;
quest.SortKey = 0;
}
} }
private void AddPreviousQuest(QuestId questToUpdate, QuestId requiredQuestId) private void AddPreviousQuest(QuestId questToUpdate, QuestId requiredQuestId)

4
Questionable/Model/QuestInfo.cs
View File

@ -79,8 +79,8 @@ internal sealed class QuestInfo : IQuestInfo
public EQuestJoin QuestLockJoin { get; private set; } public EQuestJoin QuestLockJoin { get; private set; }
public List<ushort> PreviousInstanceContent { get; } public List<ushort> PreviousInstanceContent { get; }
public EQuestJoin PreviousInstanceContentJoin { get; } public EQuestJoin PreviousInstanceContentJoin { get; }
public uint? JournalGenre { get; } public uint? JournalGenre { get; set; }
public ushort SortKey { get; } public ushort SortKey { get; set; }
public bool IsMainScenarioQuest { get; } public bool IsMainScenarioQuest { get; }
public bool CompletesInstantly { get; } public bool CompletesInstantly { get; }
public GrandCompany GrandCompany { get; } public GrandCompany GrandCompany { get; }