muffin v6.35 with old pdb
This commit is contained in:
parent
ac85599236
commit
b5d2cc6708
31 changed files with 958 additions and 958 deletions
|
|
@ -925,11 +925,11 @@ internal sealed class AetheryteData
|
|||
{
|
||||
return float.MaxValue;
|
||||
}
|
||||
if (!AirshipLandingLocations.TryGetValue(to, out var value2))
|
||||
if (!AirshipLandingLocations.TryGetValue(to, out var task))
|
||||
{
|
||||
return float.MaxValue;
|
||||
}
|
||||
return (fromPosition - value2).Length();
|
||||
return (fromPosition - task).Length();
|
||||
}
|
||||
|
||||
public bool IsCityAetheryte(EAetheryteLocation aetheryte)
|
||||
|
|
@ -938,8 +938,8 @@ internal sealed class AetheryteData
|
|||
{
|
||||
return true;
|
||||
}
|
||||
ushort value = TerritoryIds[aetheryte];
|
||||
return TownTerritoryIds.Contains(value);
|
||||
ushort toastAware = TerritoryIds[aetheryte];
|
||||
return TownTerritoryIds.Contains(toastAware);
|
||||
}
|
||||
|
||||
public bool IsAirshipLanding(EAetheryteLocation aetheryte)
|
||||
|
|
|
|||
|
|
@ -147,10 +147,10 @@ internal sealed class QuestData
|
|||
span[num2] = new AethernetQuestInfo(new AethernetId(14), "Tuliyollal");
|
||||
num2++;
|
||||
span[num2] = new AethernetQuestInfo(new AethernetId(15), "Solution Nine");
|
||||
List<AethernetQuestInfo> collection = list2;
|
||||
List<AetherCurrentQuestInfo> collection2 = new List<AetherCurrentQuestInfo>();
|
||||
quests.AddRange(collection);
|
||||
quests.AddRange(collection2);
|
||||
List<AethernetQuestInfo> currentSequence = list2;
|
||||
List<AetherCurrentQuestInfo> currentStep = new List<AetherCurrentQuestInfo>();
|
||||
quests.AddRange(currentSequence);
|
||||
quests.AddRange(currentStep);
|
||||
_quests = quests.ToDictionary((IQuestInfo x) => x.QuestId, (IQuestInfo x) => x);
|
||||
AddPreviousQuest(new QuestId(425), new QuestId(495));
|
||||
AddPreviousQuest(new QuestId(1480), new QuestId(2373));
|
||||
|
|
@ -267,7 +267,7 @@ internal sealed class QuestData
|
|||
|
||||
private void AddPreviousQuest(QuestId questToUpdate, QuestId requiredQuestId)
|
||||
{
|
||||
if (_quests.TryGetValue(questToUpdate, out IQuestInfo value) && value is QuestInfo questInfo)
|
||||
if (_quests.TryGetValue(questToUpdate, out IQuestInfo stoppableTaskExecutor) && stoppableTaskExecutor is QuestInfo questInfo)
|
||||
{
|
||||
questInfo.AddPreviousQuest(new PreviousQuestInfo(requiredQuestId, 0));
|
||||
}
|
||||
|
|
@ -275,16 +275,16 @@ internal sealed class QuestData
|
|||
|
||||
private void AddGcFollowUpQuests()
|
||||
{
|
||||
QuestId[] array = new QuestId[3]
|
||||
QuestId[] scope = new QuestId[3]
|
||||
{
|
||||
new QuestId(683),
|
||||
new QuestId(684),
|
||||
new QuestId(685)
|
||||
};
|
||||
QuestId[] array2 = array;
|
||||
foreach (QuestId questId in array2)
|
||||
QuestId[] array = scope;
|
||||
foreach (QuestId questId in array)
|
||||
{
|
||||
((QuestInfo)_quests[questId]).AddQuestLocks(EQuestJoin.AtLeastOne, array.Where((QuestId x) => x != questId).ToArray());
|
||||
((QuestInfo)_quests[questId]).AddQuestLocks(EQuestJoin.AtLeastOne, scope.Where((QuestId x) => x != questId).ToArray());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -950,8 +950,8 @@ internal sealed class QuestData
|
|||
public unsafe List<QuestId> GetLockedClassQuests()
|
||||
{
|
||||
PlayerState* ptr = PlayerState.Instance();
|
||||
EClassJob eClassJob = (EClassJob)((ptr != null) ? ptr->FirstClass : 0);
|
||||
if (eClassJob == EClassJob.Adventurer)
|
||||
EClassJob scope = (EClassJob)((ptr != null) ? ptr->FirstClass : 0);
|
||||
if (scope == EClassJob.Adventurer)
|
||||
{
|
||||
return new List<QuestId>();
|
||||
}
|
||||
|
|
@ -962,7 +962,7 @@ internal sealed class QuestData
|
|||
int num2 = 0;
|
||||
ref List<ushort> reference = ref span[num2];
|
||||
List<ushort> list2;
|
||||
if (eClassJob != EClassJob.Gladiator)
|
||||
if (scope != EClassJob.Gladiator)
|
||||
{
|
||||
int num3 = 2;
|
||||
list2 = new List<ushort>(num3);
|
||||
|
|
@ -992,7 +992,7 @@ internal sealed class QuestData
|
|||
num2++;
|
||||
ref List<ushort> reference2 = ref span[num2];
|
||||
List<ushort> list3;
|
||||
if (eClassJob != EClassJob.Pugilist)
|
||||
if (scope != EClassJob.Pugilist)
|
||||
{
|
||||
int num3 = 2;
|
||||
list3 = new List<ushort>(num3);
|
||||
|
|
@ -1022,7 +1022,7 @@ internal sealed class QuestData
|
|||
num2++;
|
||||
ref List<ushort> reference3 = ref span[num2];
|
||||
List<ushort> list4;
|
||||
if (eClassJob != EClassJob.Marauder)
|
||||
if (scope != EClassJob.Marauder)
|
||||
{
|
||||
int num3 = 2;
|
||||
list4 = new List<ushort>(num3);
|
||||
|
|
@ -1052,7 +1052,7 @@ internal sealed class QuestData
|
|||
num2++;
|
||||
ref List<ushort> reference4 = ref span[num2];
|
||||
List<ushort> list5;
|
||||
if (eClassJob != EClassJob.Lancer)
|
||||
if (scope != EClassJob.Lancer)
|
||||
{
|
||||
int num3 = 2;
|
||||
list5 = new List<ushort>(num3);
|
||||
|
|
@ -1082,7 +1082,7 @@ internal sealed class QuestData
|
|||
num2++;
|
||||
ref List<ushort> reference5 = ref span[num2];
|
||||
List<ushort> list6;
|
||||
if (eClassJob != EClassJob.Archer)
|
||||
if (scope != EClassJob.Archer)
|
||||
{
|
||||
int num3 = 2;
|
||||
list6 = new List<ushort>(num3);
|
||||
|
|
@ -1112,7 +1112,7 @@ internal sealed class QuestData
|
|||
num2++;
|
||||
ref List<ushort> reference6 = ref span[num2];
|
||||
List<ushort> list7;
|
||||
if (eClassJob != EClassJob.Conjurer)
|
||||
if (scope != EClassJob.Conjurer)
|
||||
{
|
||||
int num3 = 2;
|
||||
list7 = new List<ushort>(num3);
|
||||
|
|
@ -1142,7 +1142,7 @@ internal sealed class QuestData
|
|||
num2++;
|
||||
ref List<ushort> reference7 = ref span[num2];
|
||||
List<ushort> list8;
|
||||
if (eClassJob != EClassJob.Thaumaturge)
|
||||
if (scope != EClassJob.Thaumaturge)
|
||||
{
|
||||
int num3 = 2;
|
||||
list8 = new List<ushort>(num3);
|
||||
|
|
@ -1172,7 +1172,7 @@ internal sealed class QuestData
|
|||
num2++;
|
||||
ref List<ushort> reference8 = ref span[num2];
|
||||
List<ushort> list9;
|
||||
if (eClassJob != EClassJob.Arcanist)
|
||||
if (scope != EClassJob.Arcanist)
|
||||
{
|
||||
int num3 = 2;
|
||||
list9 = new List<ushort>(num3);
|
||||
|
|
@ -1205,13 +1205,13 @@ internal sealed class QuestData
|
|||
|
||||
public void ApplySeasonalOverride(ElementId questId, bool isSeasonal, DateTime? expiry)
|
||||
{
|
||||
if (_quests.TryGetValue(questId, out IQuestInfo value) && value is QuestInfo questInfo)
|
||||
if (_quests.TryGetValue(questId, out IQuestInfo scope) && scope is QuestInfo questInfo)
|
||||
{
|
||||
DateTime? seasonalQuestExpiry = null;
|
||||
if (expiry.HasValue)
|
||||
{
|
||||
DateTime value2 = expiry.Value;
|
||||
seasonalQuestExpiry = ((!(value2.TimeOfDay == TimeSpan.Zero)) ? new DateTime?((value2.Kind == DateTimeKind.Utc) ? value2 : value2.ToUniversalTime()) : new DateTime?(EventInfoComponent.AtDailyReset(DateOnly.FromDateTime(value2))));
|
||||
DateTime value = expiry.Value;
|
||||
seasonalQuestExpiry = ((!(value.TimeOfDay == TimeSpan.Zero)) ? new DateTime?((value.Kind == DateTimeKind.Utc) ? value : value.ToUniversalTime()) : new DateTime?(EventInfoComponent.AtDailyReset(DateOnly.FromDateTime(value))));
|
||||
}
|
||||
questInfo.IsSeasonalQuest = isSeasonal;
|
||||
questInfo.SeasonalQuestExpiry = seasonalQuestExpiry;
|
||||
|
|
@ -1232,382 +1232,382 @@ internal sealed class QuestData
|
|||
static QuestData()
|
||||
{
|
||||
Dictionary<uint, List<ushort>> dictionary = new Dictionary<uint, List<ushort>>();
|
||||
int num = 4;
|
||||
List<ushort> list = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list, num);
|
||||
Span<ushort> span = CollectionsMarshal.AsSpan(list);
|
||||
int num2 = 0;
|
||||
span[num2] = 1744;
|
||||
num2++;
|
||||
span[num2] = 1759;
|
||||
num2++;
|
||||
span[num2] = 1760;
|
||||
num2++;
|
||||
span[num2] = 2111;
|
||||
int seq = 4;
|
||||
List<ushort> list = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list, seq);
|
||||
Span<ushort> step = CollectionsMarshal.AsSpan(list);
|
||||
int createTasks = 0;
|
||||
step[createTasks] = 1744;
|
||||
createTasks++;
|
||||
step[createTasks] = 1759;
|
||||
createTasks++;
|
||||
step[createTasks] = 1760;
|
||||
createTasks++;
|
||||
step[createTasks] = 2111;
|
||||
dictionary.Add(397u, list);
|
||||
num2 = 4;
|
||||
List<ushort> list2 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list2, num2);
|
||||
span = CollectionsMarshal.AsSpan(list2);
|
||||
num = 0;
|
||||
span[num] = 1771;
|
||||
num++;
|
||||
span[num] = 1790;
|
||||
num++;
|
||||
span[num] = 1797;
|
||||
num++;
|
||||
span[num] = 1802;
|
||||
createTasks = 4;
|
||||
List<ushort> list2 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list2, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list2);
|
||||
seq = 0;
|
||||
step[seq] = 1771;
|
||||
seq++;
|
||||
step[seq] = 1790;
|
||||
seq++;
|
||||
step[seq] = 1797;
|
||||
seq++;
|
||||
step[seq] = 1802;
|
||||
dictionary.Add(398u, list2);
|
||||
num = 4;
|
||||
List<ushort> list3 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list3, num);
|
||||
span = CollectionsMarshal.AsSpan(list3);
|
||||
num2 = 0;
|
||||
span[num2] = 1936;
|
||||
num2++;
|
||||
span[num2] = 1945;
|
||||
num2++;
|
||||
span[num2] = 1963;
|
||||
num2++;
|
||||
span[num2] = 1966;
|
||||
seq = 4;
|
||||
List<ushort> list3 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list3, seq);
|
||||
step = CollectionsMarshal.AsSpan(list3);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 1936;
|
||||
createTasks++;
|
||||
step[createTasks] = 1945;
|
||||
createTasks++;
|
||||
step[createTasks] = 1963;
|
||||
createTasks++;
|
||||
step[createTasks] = 1966;
|
||||
dictionary.Add(399u, list3);
|
||||
num2 = 4;
|
||||
List<ushort> list4 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list4, num2);
|
||||
span = CollectionsMarshal.AsSpan(list4);
|
||||
num = 0;
|
||||
span[num] = 1819;
|
||||
num++;
|
||||
span[num] = 1823;
|
||||
num++;
|
||||
span[num] = 1828;
|
||||
num++;
|
||||
span[num] = 1835;
|
||||
createTasks = 4;
|
||||
List<ushort> list4 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list4, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list4);
|
||||
seq = 0;
|
||||
step[seq] = 1819;
|
||||
seq++;
|
||||
step[seq] = 1823;
|
||||
seq++;
|
||||
step[seq] = 1828;
|
||||
seq++;
|
||||
step[seq] = 1835;
|
||||
dictionary.Add(400u, list4);
|
||||
num = 4;
|
||||
List<ushort> list5 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list5, num);
|
||||
span = CollectionsMarshal.AsSpan(list5);
|
||||
num2 = 0;
|
||||
span[num2] = 1748;
|
||||
num2++;
|
||||
span[num2] = 1874;
|
||||
num2++;
|
||||
span[num2] = 1909;
|
||||
num2++;
|
||||
span[num2] = 1910;
|
||||
seq = 4;
|
||||
List<ushort> list5 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list5, seq);
|
||||
step = CollectionsMarshal.AsSpan(list5);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 1748;
|
||||
createTasks++;
|
||||
step[createTasks] = 1874;
|
||||
createTasks++;
|
||||
step[createTasks] = 1909;
|
||||
createTasks++;
|
||||
step[createTasks] = 1910;
|
||||
dictionary.Add(401u, list5);
|
||||
num2 = 4;
|
||||
List<ushort> list6 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list6, num2);
|
||||
span = CollectionsMarshal.AsSpan(list6);
|
||||
num = 0;
|
||||
span[num] = 2639;
|
||||
num++;
|
||||
span[num] = 2661;
|
||||
num++;
|
||||
span[num] = 2816;
|
||||
num++;
|
||||
span[num] = 2821;
|
||||
createTasks = 4;
|
||||
List<ushort> list6 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list6, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list6);
|
||||
seq = 0;
|
||||
step[seq] = 2639;
|
||||
seq++;
|
||||
step[seq] = 2661;
|
||||
seq++;
|
||||
step[seq] = 2816;
|
||||
seq++;
|
||||
step[seq] = 2821;
|
||||
dictionary.Add(612u, list6);
|
||||
num = 4;
|
||||
List<ushort> list7 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list7, num);
|
||||
span = CollectionsMarshal.AsSpan(list7);
|
||||
num2 = 0;
|
||||
span[num2] = 2632;
|
||||
num2++;
|
||||
span[num2] = 2673;
|
||||
num2++;
|
||||
span[num2] = 2687;
|
||||
num2++;
|
||||
span[num2] = 2693;
|
||||
seq = 4;
|
||||
List<ushort> list7 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list7, seq);
|
||||
step = CollectionsMarshal.AsSpan(list7);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 2632;
|
||||
createTasks++;
|
||||
step[createTasks] = 2673;
|
||||
createTasks++;
|
||||
step[createTasks] = 2687;
|
||||
createTasks++;
|
||||
step[createTasks] = 2693;
|
||||
dictionary.Add(613u, list7);
|
||||
num2 = 4;
|
||||
List<ushort> list8 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list8, num2);
|
||||
span = CollectionsMarshal.AsSpan(list8);
|
||||
num = 0;
|
||||
span[num] = 2724;
|
||||
num++;
|
||||
span[num] = 2728;
|
||||
num++;
|
||||
span[num] = 2730;
|
||||
num++;
|
||||
span[num] = 2733;
|
||||
createTasks = 4;
|
||||
List<ushort> list8 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list8, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list8);
|
||||
seq = 0;
|
||||
step[seq] = 2724;
|
||||
seq++;
|
||||
step[seq] = 2728;
|
||||
seq++;
|
||||
step[seq] = 2730;
|
||||
seq++;
|
||||
step[seq] = 2733;
|
||||
dictionary.Add(614u, list8);
|
||||
num = 4;
|
||||
List<ushort> list9 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list9, num);
|
||||
span = CollectionsMarshal.AsSpan(list9);
|
||||
num2 = 0;
|
||||
span[num2] = 2655;
|
||||
num2++;
|
||||
span[num2] = 2842;
|
||||
num2++;
|
||||
span[num2] = 2851;
|
||||
num2++;
|
||||
span[num2] = 2860;
|
||||
seq = 4;
|
||||
List<ushort> list9 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list9, seq);
|
||||
step = CollectionsMarshal.AsSpan(list9);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 2655;
|
||||
createTasks++;
|
||||
step[createTasks] = 2842;
|
||||
createTasks++;
|
||||
step[createTasks] = 2851;
|
||||
createTasks++;
|
||||
step[createTasks] = 2860;
|
||||
dictionary.Add(620u, list9);
|
||||
num2 = 4;
|
||||
List<ushort> list10 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list10, num2);
|
||||
span = CollectionsMarshal.AsSpan(list10);
|
||||
num = 0;
|
||||
span[num] = 2877;
|
||||
num++;
|
||||
span[num] = 2880;
|
||||
num++;
|
||||
span[num] = 2881;
|
||||
num++;
|
||||
span[num] = 2883;
|
||||
createTasks = 4;
|
||||
List<ushort> list10 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list10, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list10);
|
||||
seq = 0;
|
||||
step[seq] = 2877;
|
||||
seq++;
|
||||
step[seq] = 2880;
|
||||
seq++;
|
||||
step[seq] = 2881;
|
||||
seq++;
|
||||
step[seq] = 2883;
|
||||
dictionary.Add(621u, list10);
|
||||
num = 4;
|
||||
List<ushort> list11 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list11, num);
|
||||
span = CollectionsMarshal.AsSpan(list11);
|
||||
num2 = 0;
|
||||
span[num2] = 2760;
|
||||
num2++;
|
||||
span[num2] = 2771;
|
||||
num2++;
|
||||
span[num2] = 2782;
|
||||
num2++;
|
||||
span[num2] = 2791;
|
||||
seq = 4;
|
||||
List<ushort> list11 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list11, seq);
|
||||
step = CollectionsMarshal.AsSpan(list11);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 2760;
|
||||
createTasks++;
|
||||
step[createTasks] = 2771;
|
||||
createTasks++;
|
||||
step[createTasks] = 2782;
|
||||
createTasks++;
|
||||
step[createTasks] = 2791;
|
||||
dictionary.Add(622u, list11);
|
||||
num2 = 4;
|
||||
List<ushort> list12 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list12, num2);
|
||||
span = CollectionsMarshal.AsSpan(list12);
|
||||
num = 0;
|
||||
span[num] = 3380;
|
||||
num++;
|
||||
span[num] = 3384;
|
||||
num++;
|
||||
span[num] = 3385;
|
||||
num++;
|
||||
span[num] = 3386;
|
||||
createTasks = 4;
|
||||
List<ushort> list12 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list12, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list12);
|
||||
seq = 0;
|
||||
step[seq] = 3380;
|
||||
seq++;
|
||||
step[seq] = 3384;
|
||||
seq++;
|
||||
step[seq] = 3385;
|
||||
seq++;
|
||||
step[seq] = 3386;
|
||||
dictionary.Add(813u, list12);
|
||||
num = 4;
|
||||
List<ushort> list13 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list13, num);
|
||||
span = CollectionsMarshal.AsSpan(list13);
|
||||
num2 = 0;
|
||||
span[num2] = 3360;
|
||||
num2++;
|
||||
span[num2] = 3371;
|
||||
num2++;
|
||||
span[num2] = 3537;
|
||||
num2++;
|
||||
span[num2] = 3556;
|
||||
seq = 4;
|
||||
List<ushort> list13 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list13, seq);
|
||||
step = CollectionsMarshal.AsSpan(list13);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 3360;
|
||||
createTasks++;
|
||||
step[createTasks] = 3371;
|
||||
createTasks++;
|
||||
step[createTasks] = 3537;
|
||||
createTasks++;
|
||||
step[createTasks] = 3556;
|
||||
dictionary.Add(814u, list13);
|
||||
num2 = 4;
|
||||
List<ushort> list14 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list14, num2);
|
||||
span = CollectionsMarshal.AsSpan(list14);
|
||||
num = 0;
|
||||
span[num] = 3375;
|
||||
num++;
|
||||
span[num] = 3503;
|
||||
num++;
|
||||
span[num] = 3511;
|
||||
num++;
|
||||
span[num] = 3525;
|
||||
createTasks = 4;
|
||||
List<ushort> list14 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list14, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list14);
|
||||
seq = 0;
|
||||
step[seq] = 3375;
|
||||
seq++;
|
||||
step[seq] = 3503;
|
||||
seq++;
|
||||
step[seq] = 3511;
|
||||
seq++;
|
||||
step[seq] = 3525;
|
||||
dictionary.Add(815u, list14);
|
||||
num = 4;
|
||||
List<ushort> list15 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list15, num);
|
||||
span = CollectionsMarshal.AsSpan(list15);
|
||||
num2 = 0;
|
||||
span[num2] = 3395;
|
||||
num2++;
|
||||
span[num2] = 3398;
|
||||
num2++;
|
||||
span[num2] = 3404;
|
||||
num2++;
|
||||
span[num2] = 3427;
|
||||
seq = 4;
|
||||
List<ushort> list15 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list15, seq);
|
||||
step = CollectionsMarshal.AsSpan(list15);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 3395;
|
||||
createTasks++;
|
||||
step[createTasks] = 3398;
|
||||
createTasks++;
|
||||
step[createTasks] = 3404;
|
||||
createTasks++;
|
||||
step[createTasks] = 3427;
|
||||
dictionary.Add(816u, list15);
|
||||
num2 = 4;
|
||||
List<ushort> list16 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list16, num2);
|
||||
span = CollectionsMarshal.AsSpan(list16);
|
||||
num = 0;
|
||||
span[num] = 3444;
|
||||
num++;
|
||||
span[num] = 3467;
|
||||
num++;
|
||||
span[num] = 3478;
|
||||
num++;
|
||||
span[num] = 3656;
|
||||
createTasks = 4;
|
||||
List<ushort> list16 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list16, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list16);
|
||||
seq = 0;
|
||||
step[seq] = 3444;
|
||||
seq++;
|
||||
step[seq] = 3467;
|
||||
seq++;
|
||||
step[seq] = 3478;
|
||||
seq++;
|
||||
step[seq] = 3656;
|
||||
dictionary.Add(817u, list16);
|
||||
num = 4;
|
||||
List<ushort> list17 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list17, num);
|
||||
span = CollectionsMarshal.AsSpan(list17);
|
||||
num2 = 0;
|
||||
span[num2] = 3588;
|
||||
num2++;
|
||||
span[num2] = 3592;
|
||||
num2++;
|
||||
span[num2] = 3593;
|
||||
num2++;
|
||||
span[num2] = 3594;
|
||||
seq = 4;
|
||||
List<ushort> list17 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list17, seq);
|
||||
step = CollectionsMarshal.AsSpan(list17);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 3588;
|
||||
createTasks++;
|
||||
step[createTasks] = 3592;
|
||||
createTasks++;
|
||||
step[createTasks] = 3593;
|
||||
createTasks++;
|
||||
step[createTasks] = 3594;
|
||||
dictionary.Add(818u, list17);
|
||||
num2 = 4;
|
||||
List<ushort> list18 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list18, num2);
|
||||
span = CollectionsMarshal.AsSpan(list18);
|
||||
num = 0;
|
||||
span[num] = 4320;
|
||||
num++;
|
||||
span[num] = 4329;
|
||||
num++;
|
||||
span[num] = 4480;
|
||||
num++;
|
||||
span[num] = 4484;
|
||||
createTasks = 4;
|
||||
List<ushort> list18 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list18, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list18);
|
||||
seq = 0;
|
||||
step[seq] = 4320;
|
||||
seq++;
|
||||
step[seq] = 4329;
|
||||
seq++;
|
||||
step[seq] = 4480;
|
||||
seq++;
|
||||
step[seq] = 4484;
|
||||
dictionary.Add(956u, list18);
|
||||
num = 4;
|
||||
List<ushort> list19 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list19, num);
|
||||
span = CollectionsMarshal.AsSpan(list19);
|
||||
num2 = 0;
|
||||
span[num2] = 4203;
|
||||
num2++;
|
||||
span[num2] = 4257;
|
||||
num2++;
|
||||
span[num2] = 4259;
|
||||
num2++;
|
||||
span[num2] = 4489;
|
||||
seq = 4;
|
||||
List<ushort> list19 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list19, seq);
|
||||
step = CollectionsMarshal.AsSpan(list19);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 4203;
|
||||
createTasks++;
|
||||
step[createTasks] = 4257;
|
||||
createTasks++;
|
||||
step[createTasks] = 4259;
|
||||
createTasks++;
|
||||
step[createTasks] = 4489;
|
||||
dictionary.Add(957u, list19);
|
||||
num2 = 4;
|
||||
List<ushort> list20 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list20, num2);
|
||||
span = CollectionsMarshal.AsSpan(list20);
|
||||
num = 0;
|
||||
span[num] = 4216;
|
||||
num++;
|
||||
span[num] = 4232;
|
||||
num++;
|
||||
span[num] = 4498;
|
||||
num++;
|
||||
span[num] = 4502;
|
||||
createTasks = 4;
|
||||
List<ushort> list20 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list20, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list20);
|
||||
seq = 0;
|
||||
step[seq] = 4216;
|
||||
seq++;
|
||||
step[seq] = 4232;
|
||||
seq++;
|
||||
step[seq] = 4498;
|
||||
seq++;
|
||||
step[seq] = 4502;
|
||||
dictionary.Add(958u, list20);
|
||||
num = 4;
|
||||
List<ushort> list21 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list21, num);
|
||||
span = CollectionsMarshal.AsSpan(list21);
|
||||
num2 = 0;
|
||||
span[num2] = 4240;
|
||||
num2++;
|
||||
span[num2] = 4241;
|
||||
num2++;
|
||||
span[num2] = 4253;
|
||||
num2++;
|
||||
span[num2] = 4516;
|
||||
seq = 4;
|
||||
List<ushort> list21 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list21, seq);
|
||||
step = CollectionsMarshal.AsSpan(list21);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 4240;
|
||||
createTasks++;
|
||||
step[createTasks] = 4241;
|
||||
createTasks++;
|
||||
step[createTasks] = 4253;
|
||||
createTasks++;
|
||||
step[createTasks] = 4516;
|
||||
dictionary.Add(959u, list21);
|
||||
num2 = 4;
|
||||
List<ushort> list22 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list22, num2);
|
||||
span = CollectionsMarshal.AsSpan(list22);
|
||||
num = 0;
|
||||
span[num] = 4342;
|
||||
num++;
|
||||
span[num] = 4346;
|
||||
num++;
|
||||
span[num] = 4354;
|
||||
num++;
|
||||
span[num] = 4355;
|
||||
createTasks = 4;
|
||||
List<ushort> list22 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list22, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list22);
|
||||
seq = 0;
|
||||
step[seq] = 4342;
|
||||
seq++;
|
||||
step[seq] = 4346;
|
||||
seq++;
|
||||
step[seq] = 4354;
|
||||
seq++;
|
||||
step[seq] = 4355;
|
||||
dictionary.Add(960u, list22);
|
||||
num = 4;
|
||||
List<ushort> list23 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list23, num);
|
||||
span = CollectionsMarshal.AsSpan(list23);
|
||||
num2 = 0;
|
||||
span[num2] = 4288;
|
||||
num2++;
|
||||
span[num2] = 4313;
|
||||
num2++;
|
||||
span[num2] = 4507;
|
||||
num2++;
|
||||
span[num2] = 4511;
|
||||
seq = 4;
|
||||
List<ushort> list23 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list23, seq);
|
||||
step = CollectionsMarshal.AsSpan(list23);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 4288;
|
||||
createTasks++;
|
||||
step[createTasks] = 4313;
|
||||
createTasks++;
|
||||
step[createTasks] = 4507;
|
||||
createTasks++;
|
||||
step[createTasks] = 4511;
|
||||
dictionary.Add(961u, list23);
|
||||
num2 = 4;
|
||||
List<ushort> list24 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list24, num2);
|
||||
span = CollectionsMarshal.AsSpan(list24);
|
||||
num = 0;
|
||||
span[num] = 5039;
|
||||
num++;
|
||||
span[num] = 5047;
|
||||
num++;
|
||||
span[num] = 5051;
|
||||
num++;
|
||||
span[num] = 5055;
|
||||
createTasks = 4;
|
||||
List<ushort> list24 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list24, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list24);
|
||||
seq = 0;
|
||||
step[seq] = 5039;
|
||||
seq++;
|
||||
step[seq] = 5047;
|
||||
seq++;
|
||||
step[seq] = 5051;
|
||||
seq++;
|
||||
step[seq] = 5055;
|
||||
dictionary.Add(1187u, list24);
|
||||
num = 4;
|
||||
List<ushort> list25 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list25, num);
|
||||
span = CollectionsMarshal.AsSpan(list25);
|
||||
num2 = 0;
|
||||
span[num2] = 5064;
|
||||
num2++;
|
||||
span[num2] = 5074;
|
||||
num2++;
|
||||
span[num2] = 5081;
|
||||
num2++;
|
||||
span[num2] = 5085;
|
||||
seq = 4;
|
||||
List<ushort> list25 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list25, seq);
|
||||
step = CollectionsMarshal.AsSpan(list25);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 5064;
|
||||
createTasks++;
|
||||
step[createTasks] = 5074;
|
||||
createTasks++;
|
||||
step[createTasks] = 5081;
|
||||
createTasks++;
|
||||
step[createTasks] = 5085;
|
||||
dictionary.Add(1188u, list25);
|
||||
num2 = 4;
|
||||
List<ushort> list26 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list26, num2);
|
||||
span = CollectionsMarshal.AsSpan(list26);
|
||||
num = 0;
|
||||
span[num] = 5094;
|
||||
num++;
|
||||
span[num] = 5103;
|
||||
num++;
|
||||
span[num] = 5110;
|
||||
num++;
|
||||
span[num] = 5114;
|
||||
createTasks = 4;
|
||||
List<ushort> list26 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list26, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list26);
|
||||
seq = 0;
|
||||
step[seq] = 5094;
|
||||
seq++;
|
||||
step[seq] = 5103;
|
||||
seq++;
|
||||
step[seq] = 5110;
|
||||
seq++;
|
||||
step[seq] = 5114;
|
||||
dictionary.Add(1189u, list26);
|
||||
num = 4;
|
||||
List<ushort> list27 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list27, num);
|
||||
span = CollectionsMarshal.AsSpan(list27);
|
||||
num2 = 0;
|
||||
span[num2] = 5130;
|
||||
num2++;
|
||||
span[num2] = 5138;
|
||||
num2++;
|
||||
span[num2] = 5140;
|
||||
num2++;
|
||||
span[num2] = 5144;
|
||||
seq = 4;
|
||||
List<ushort> list27 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list27, seq);
|
||||
step = CollectionsMarshal.AsSpan(list27);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 5130;
|
||||
createTasks++;
|
||||
step[createTasks] = 5138;
|
||||
createTasks++;
|
||||
step[createTasks] = 5140;
|
||||
createTasks++;
|
||||
step[createTasks] = 5144;
|
||||
dictionary.Add(1190u, list27);
|
||||
num2 = 4;
|
||||
List<ushort> list28 = new List<ushort>(num2);
|
||||
CollectionsMarshal.SetCount(list28, num2);
|
||||
span = CollectionsMarshal.AsSpan(list28);
|
||||
num = 0;
|
||||
span[num] = 5153;
|
||||
num++;
|
||||
span[num] = 5156;
|
||||
num++;
|
||||
span[num] = 5159;
|
||||
num++;
|
||||
span[num] = 5160;
|
||||
createTasks = 4;
|
||||
List<ushort> list28 = new List<ushort>(createTasks);
|
||||
CollectionsMarshal.SetCount(list28, createTasks);
|
||||
step = CollectionsMarshal.AsSpan(list28);
|
||||
seq = 0;
|
||||
step[seq] = 5153;
|
||||
seq++;
|
||||
step[seq] = 5156;
|
||||
seq++;
|
||||
step[seq] = 5159;
|
||||
seq++;
|
||||
step[seq] = 5160;
|
||||
dictionary.Add(1191u, list28);
|
||||
num = 4;
|
||||
List<ushort> list29 = new List<ushort>(num);
|
||||
CollectionsMarshal.SetCount(list29, num);
|
||||
span = CollectionsMarshal.AsSpan(list29);
|
||||
num2 = 0;
|
||||
span[num2] = 5174;
|
||||
num2++;
|
||||
span[num2] = 5176;
|
||||
num2++;
|
||||
span[num2] = 5178;
|
||||
num2++;
|
||||
span[num2] = 5179;
|
||||
seq = 4;
|
||||
List<ushort> list29 = new List<ushort>(seq);
|
||||
CollectionsMarshal.SetCount(list29, seq);
|
||||
step = CollectionsMarshal.AsSpan(list29);
|
||||
createTasks = 0;
|
||||
step[createTasks] = 5174;
|
||||
createTasks++;
|
||||
step[createTasks] = 5176;
|
||||
createTasks++;
|
||||
step[createTasks] = 5178;
|
||||
createTasks++;
|
||||
step[createTasks] = 5179;
|
||||
dictionary.Add(1192u, list29);
|
||||
AetherCurrentQuestsByTerritory = dictionary.ToImmutableDictionary((KeyValuePair<uint, List<ushort>> x) => x.Key, (KeyValuePair<uint, List<ushort>> x) => x.Value.Select((ushort y) => new QuestId(y)).ToImmutableList());
|
||||
AetherCurrentQuests = AetherCurrentQuestsByTerritory.Values.SelectMany((ImmutableList<QuestId> x) => x).ToImmutableHashSet();
|
||||
|
|
|
|||
|
|
@ -80,12 +80,12 @@ internal sealed class TerritoryData
|
|||
|
||||
public string GetNameAndId(ushort territoryId)
|
||||
{
|
||||
string name = GetName(territoryId);
|
||||
if (name != null)
|
||||
string t = GetName(territoryId);
|
||||
if (t != null)
|
||||
{
|
||||
IFormatProvider invariantCulture = CultureInfo.InvariantCulture;
|
||||
DefaultInterpolatedStringHandler handler = new DefaultInterpolatedStringHandler(3, 2, invariantCulture);
|
||||
handler.AppendFormatted(name);
|
||||
handler.AppendFormatted(t);
|
||||
handler.AppendLiteral(" (");
|
||||
handler.AppendFormatted(territoryId);
|
||||
handler.AppendLiteral(")");
|
||||
|
|
@ -106,9 +106,9 @@ internal sealed class TerritoryData
|
|||
|
||||
public bool IsQuestBattleInstance(ushort territoryId)
|
||||
{
|
||||
if (_dutyTerritories.TryGetValue(territoryId, out var value))
|
||||
if (_dutyTerritories.TryGetValue(territoryId, out var debugStateProvider))
|
||||
{
|
||||
return value == 7;
|
||||
return debugStateProvider == 7;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -130,9 +130,9 @@ internal sealed class TerritoryData
|
|||
|
||||
public bool TryGetContentFinderConditionForSoloInstance(ElementId questId, byte index, [NotNullWhen(true)] out ContentFinderConditionData? contentFinderConditionData)
|
||||
{
|
||||
if (_questBattlesToContentFinderCondition.TryGetValue((questId, index), out var value))
|
||||
if (_questBattlesToContentFinderCondition.TryGetValue((questId, index), out var priorityQuestId))
|
||||
{
|
||||
return _contentFinderConditions.TryGetValue(value, out contentFinderConditionData);
|
||||
return _contentFinderConditions.TryGetValue(priorityQuestId, out contentFinderConditionData);
|
||||
}
|
||||
contentFinderConditionData = null;
|
||||
return false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue