From 221c095ee8350dcccd7300a60c66630caf11ad74 Mon Sep 17 00:00:00 2001 From: alydev Date: Fri, 10 Oct 2025 10:10:09 +1000 Subject: [PATCH] muffin v6.18 --- GatheringPaths/Properties/AssemblyInfo.cs | 6 +- LLib/Properties/AssemblyInfo.cs | 6 +- QuestPaths/Properties/AssemblyInfo.cs | 6 +- .../AssemblyQuestLoader.cs | 635 +++++++++++------- Questionable.Model/Properties/AssemblyInfo.cs | 6 +- Questionable/Properties/AssemblyInfo.cs | 6 +- .../QuestController.cs | 121 +--- .../AlliedSocietyDailyInfo.cs | 96 ++- .../QuestJournalComponent.cs | 10 +- .../QuestJournalUtils.cs | 22 +- Solution.sln | 90 +-- 11 files changed, 517 insertions(+), 487 deletions(-) diff --git a/GatheringPaths/Properties/AssemblyInfo.cs b/GatheringPaths/Properties/AssemblyInfo.cs index 83fbede..097c651 100644 --- a/GatheringPaths/Properties/AssemblyInfo.cs +++ b/GatheringPaths/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.Versioning; [assembly: AssemblyCompany("GatheringPaths")] [assembly: AssemblyConfiguration("Release")] -[assembly: AssemblyFileVersion("6.17.0.0")] -[assembly: AssemblyInformationalVersion("6.17+b9ba6488a9a81b413bf6c1b207819a073543b5c0")] +[assembly: AssemblyFileVersion("6.18.0.0")] +[assembly: AssemblyInformationalVersion("6.18+55d305f98d73b2cf5e970c9b286da47b60f0af3d")] [assembly: AssemblyProduct("GatheringPaths")] [assembly: AssemblyTitle("GatheringPaths")] [assembly: TargetPlatform("Windows7.0")] [assembly: SupportedOSPlatform("Windows7.0")] -[assembly: AssemblyVersion("6.17.0.0")] +[assembly: AssemblyVersion("6.18.0.0")] [module: RefSafetyRules(11)] diff --git a/LLib/Properties/AssemblyInfo.cs b/LLib/Properties/AssemblyInfo.cs index 3abf6c7..28f5649 100644 --- a/LLib/Properties/AssemblyInfo.cs +++ b/LLib/Properties/AssemblyInfo.cs @@ -7,12 +7,12 @@ using System.Security.Permissions; [assembly: AssemblyCompany("LLib")] [assembly: AssemblyConfiguration("Release")] -[assembly: AssemblyFileVersion("6.17.0.0")] -[assembly: AssemblyInformationalVersion("6.17+5367edf45faba59401605531555000d1429966c1")] +[assembly: AssemblyFileVersion("6.18.0.0")] +[assembly: AssemblyInformationalVersion("6.18+5367edf45faba59401605531555000d1429966c1")] [assembly: AssemblyProduct("LLib")] [assembly: AssemblyTitle("LLib")] [assembly: AssemblyMetadata("RepositoryUrl", "https://github.com/WigglyMuffin/LLib.git")] [assembly: TargetPlatform("Windows7.0")] [assembly: SupportedOSPlatform("Windows7.0")] -[assembly: AssemblyVersion("6.17.0.0")] +[assembly: AssemblyVersion("6.18.0.0")] [module: RefSafetyRules(11)] diff --git a/QuestPaths/Properties/AssemblyInfo.cs b/QuestPaths/Properties/AssemblyInfo.cs index 3436437..e97a3c0 100644 --- a/QuestPaths/Properties/AssemblyInfo.cs +++ b/QuestPaths/Properties/AssemblyInfo.cs @@ -5,9 +5,9 @@ using System.Runtime.Versioning; [assembly: AssemblyCompany("QuestPaths")] [assembly: AssemblyConfiguration("Release")] -[assembly: AssemblyFileVersion("6.17.0.0")] -[assembly: AssemblyInformationalVersion("6.17+b9ba6488a9a81b413bf6c1b207819a073543b5c0")] +[assembly: AssemblyFileVersion("6.18.0.0")] +[assembly: AssemblyInformationalVersion("6.18+55d305f98d73b2cf5e970c9b286da47b60f0af3d")] [assembly: AssemblyProduct("QuestPaths")] [assembly: AssemblyTitle("QuestPaths")] -[assembly: AssemblyVersion("6.17.0.0")] +[assembly: AssemblyVersion("6.18.0.0")] [module: RefSafetyRules(11)] diff --git a/QuestPaths/Questionable.QuestPaths/AssemblyQuestLoader.cs b/QuestPaths/Questionable.QuestPaths/AssemblyQuestLoader.cs index b5509ff..0b955f7 100644 --- a/QuestPaths/Questionable.QuestPaths/AssemblyQuestLoader.cs +++ b/QuestPaths/Questionable.QuestPaths/AssemblyQuestLoader.cs @@ -461502,6 +461502,7 @@ public static class AssemblyQuestLoader num2 = 0; span3[num2] = new QuestStep(EInteractionType.AcceptQuest, 1054636u, new Vector3(506.70618f, 142.24991f, 800.2289f), 1187) { + Fly = true, AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho, SkipConditions = new SkipConditions { @@ -461641,14 +461642,14 @@ public static class AssemblyQuestLoader reference157 = obj138; questRoot24.QuestSequence = list200; AddQuest(questId24, questRoot24); - QuestId questId25 = new QuestId(5338); + QuestId questId25 = new QuestId(5336); QuestRoot questRoot25 = new QuestRoot(); num = 1; List list208 = new List(num); CollectionsMarshal.SetCount(list208, num); span = CollectionsMarshal.AsSpan(list208); index = 0; - span[index] = "CryoTechnic"; + span[index] = "WigglyMuffin"; questRoot25.Author = list208; index = 4; List list209 = new List(index); @@ -461667,6 +461668,7 @@ public static class AssemblyQuestLoader num2 = 0; span3[num2] = new QuestStep(EInteractionType.AcceptQuest, 1054635u, new Vector3(493.2173f, 142.24991f, 783.0471f), 1187) { + Fly = true, AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho, SkipConditions = new SkipConditions { @@ -461684,28 +461686,167 @@ public static class AssemblyQuestLoader { Sequence = 1 }; - num2 = 1; + num2 = 4; List list211 = new List(num2); CollectionsMarshal.SetCount(list211, num2); span3 = CollectionsMarshal.AsSpan(list211); index2 = 0; + ref QuestStep reference160 = ref span3[index2]; + QuestStep obj141 = new QuestStep(EInteractionType.Interact, 1054640u, new Vector3(496.11658f, 142.24991f, 801.6022f), 1187) + { + TargetTerritoryId = (ushort)1297 + }; + SkipConditions skipConditions13 = new SkipConditions(); + SkipStepConditions skipStepConditions12 = new SkipStepConditions(); + num3 = 1; + List list212 = new List(num3); + CollectionsMarshal.SetCount(list212, num3); + span4 = CollectionsMarshal.AsSpan(list212); + index3 = 0; + span4[index3] = 1187; + skipStepConditions12.NotInTerritory = list212; + skipConditions13.StepIf = skipStepConditions12; + obj141.SkipConditions = skipConditions13; + reference160 = obj141; + index2++; + span3[index2] = new QuestStep(EInteractionType.WalkTo, null, new Vector3(52.610603f, 0f, 68.19062f), 1297) + { + Fly = false + }; + index2++; + span3[index2] = new QuestStep(EInteractionType.WalkTo, null, new Vector3(70.52385f, 1.8905392f, 65.476295f), 1297) + { + Fly = false + }; + index2++; + span3[index2] = new QuestStep(EInteractionType.Interact, 1055802u, new Vector3(74.75391f, 1.8866259f, 50.369995f), 1297); + obj140.Steps = list211; + reference159 = obj140; + num++; + ref QuestSequence reference161 = ref span2[num]; + QuestSequence obj142 = new QuestSequence + { + Sequence = 2 + }; + index2 = 4; + List list213 = new List(index2); + CollectionsMarshal.SetCount(list213, index2); + span3 = CollectionsMarshal.AsSpan(list213); + num2 = 0; + span3[num2] = new QuestStep(EInteractionType.Craft, null, null, 1297) + { + ItemId = 46208u, + ItemCount = 3 + }; + num2++; + span3[num2] = new QuestStep(EInteractionType.WalkTo, null, new Vector3(70.52385f, 1.8905392f, 65.476295f), 1297) + { + Mount = true, + Fly = false + }; + num2++; + span3[num2] = new QuestStep(EInteractionType.WalkTo, null, new Vector3(70.10631f, 1.8898277f, 100.54272f), 1297) + { + Fly = false + }; + num2++; + span3[num2] = new QuestStep(EInteractionType.Interact, 1055816u, new Vector3(98.924194f, 1.890541f, 98.74109f), 1297); + obj142.Steps = list213; + reference161 = obj142; + num++; + ref QuestSequence reference162 = ref span2[num]; + QuestSequence obj143 = new QuestSequence + { + Sequence = byte.MaxValue + }; + num2 = 1; + List list214 = new List(num2); + CollectionsMarshal.SetCount(list214, num2); + span3 = CollectionsMarshal.AsSpan(list214); + index2 = 0; + span3[index2] = new QuestStep(EInteractionType.CompleteQuest, 1054635u, new Vector3(493.2173f, 142.24991f, 783.0471f), 1187) + { + Fly = true, + Land = true, + AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho, + SkipConditions = new SkipConditions + { + AetheryteShortcutIf = new SkipAetheryteCondition + { + InSameTerritory = true + } + } + }; + obj143.Steps = list214; + reference162 = obj143; + questRoot25.QuestSequence = list209; + AddQuest(questId25, questRoot25); + QuestId questId26 = new QuestId(5338); + QuestRoot questRoot26 = new QuestRoot(); + num = 1; + List list215 = new List(num); + CollectionsMarshal.SetCount(list215, num); + span = CollectionsMarshal.AsSpan(list215); + index = 0; + span[index] = "CryoTechnic"; + questRoot26.Author = list215; + index = 4; + List list216 = new List(index); + CollectionsMarshal.SetCount(list216, index); + span2 = CollectionsMarshal.AsSpan(list216); + num = 0; + ref QuestSequence reference163 = ref span2[num]; + QuestSequence obj144 = new QuestSequence + { + Sequence = 0 + }; + index2 = 1; + List list217 = new List(index2); + CollectionsMarshal.SetCount(list217, index2); + span3 = CollectionsMarshal.AsSpan(list217); + num2 = 0; + span3[num2] = new QuestStep(EInteractionType.AcceptQuest, 1054635u, new Vector3(493.2173f, 142.24991f, 783.0471f), 1187) + { + Fly = true, + AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho, + SkipConditions = new SkipConditions + { + AetheryteShortcutIf = new SkipAetheryteCondition + { + InSameTerritory = true + } + } + }; + obj144.Steps = list217; + reference163 = obj144; + num++; + ref QuestSequence reference164 = ref span2[num]; + QuestSequence obj145 = new QuestSequence + { + Sequence = 1 + }; + num2 = 1; + List list218 = new List(num2); + CollectionsMarshal.SetCount(list218, num2); + span3 = CollectionsMarshal.AsSpan(list218); + index2 = 0; span3[index2] = new QuestStep(EInteractionType.Interact, 1055817u, new Vector3(458.15198f, 114.935f, 657.3739f), 1187) { Fly = true, Land = true }; - obj140.Steps = list211; - reference159 = obj140; + obj145.Steps = list218; + reference164 = obj145; num++; - ref QuestSequence reference160 = ref span2[num]; - QuestSequence obj141 = new QuestSequence + ref QuestSequence reference165 = ref span2[num]; + QuestSequence obj146 = new QuestSequence { Sequence = 2 }; index2 = 2; - List list212 = new List(index2); - CollectionsMarshal.SetCount(list212, index2); - span3 = CollectionsMarshal.AsSpan(list212); + List list219 = new List(index2); + CollectionsMarshal.SetCount(list219, index2); + span3 = CollectionsMarshal.AsSpan(list219); num2 = 0; span3[num2] = new QuestStep(EInteractionType.Craft, null, null, 959) { @@ -461714,18 +461855,18 @@ public static class AssemblyQuestLoader }; num2++; span3[num2] = new QuestStep(EInteractionType.Interact, 1055817u, new Vector3(458.15198f, 114.935f, 657.3739f), 1187); - obj141.Steps = list212; - reference160 = obj141; + obj146.Steps = list219; + reference165 = obj146; num++; - ref QuestSequence reference161 = ref span2[num]; - QuestSequence obj142 = new QuestSequence + ref QuestSequence reference166 = ref span2[num]; + QuestSequence obj147 = new QuestSequence { Sequence = byte.MaxValue }; num2 = 1; - List list213 = new List(num2); - CollectionsMarshal.SetCount(list213, num2); - span3 = CollectionsMarshal.AsSpan(list213); + List list220 = new List(num2); + CollectionsMarshal.SetCount(list220, num2); + span3 = CollectionsMarshal.AsSpan(list220); index2 = 0; span3[index2] = new QuestStep(EInteractionType.CompleteQuest, 1054635u, new Vector3(493.2173f, 142.24991f, 783.0471f), 1187) { @@ -461733,36 +461874,37 @@ public static class AssemblyQuestLoader Land = true, AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho }; - obj142.Steps = list213; - reference161 = obj142; - questRoot25.QuestSequence = list209; - AddQuest(questId25, questRoot25); - QuestId questId26 = new QuestId(5339); - QuestRoot questRoot26 = new QuestRoot(); + obj147.Steps = list220; + reference166 = obj147; + questRoot26.QuestSequence = list216; + AddQuest(questId26, questRoot26); + QuestId questId27 = new QuestId(5339); + QuestRoot questRoot27 = new QuestRoot(); num = 1; - List list214 = new List(num); - CollectionsMarshal.SetCount(list214, num); - span = CollectionsMarshal.AsSpan(list214); + List list221 = new List(num); + CollectionsMarshal.SetCount(list221, num); + span = CollectionsMarshal.AsSpan(list221); index = 0; span[index] = "CryoTechnic"; - questRoot26.Author = list214; + questRoot27.Author = list221; index = 3; - List list215 = new List(index); - CollectionsMarshal.SetCount(list215, index); - span2 = CollectionsMarshal.AsSpan(list215); + List list222 = new List(index); + CollectionsMarshal.SetCount(list222, index); + span2 = CollectionsMarshal.AsSpan(list222); num = 0; - ref QuestSequence reference162 = ref span2[num]; - QuestSequence obj143 = new QuestSequence + ref QuestSequence reference167 = ref span2[num]; + QuestSequence obj148 = new QuestSequence { Sequence = 0 }; index2 = 1; - List list216 = new List(index2); - CollectionsMarshal.SetCount(list216, index2); - span3 = CollectionsMarshal.AsSpan(list216); + List list223 = new List(index2); + CollectionsMarshal.SetCount(list223, index2); + span3 = CollectionsMarshal.AsSpan(list223); num2 = 0; span3[num2] = new QuestStep(EInteractionType.AcceptQuest, 1054635u, new Vector3(493.2173f, 142.24991f, 783.0471f), 1187) { + Fly = true, AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho, SkipConditions = new SkipConditions { @@ -461772,72 +461914,40 @@ public static class AssemblyQuestLoader } } }; - obj143.Steps = list216; - reference162 = obj143; + obj148.Steps = list223; + reference167 = obj148; num++; - ref QuestSequence reference163 = ref span2[num]; - QuestSequence obj144 = new QuestSequence + ref QuestSequence reference168 = ref span2[num]; + QuestSequence obj149 = new QuestSequence { Sequence = 1 }; num2 = 3; - List list217 = new List(num2); - CollectionsMarshal.SetCount(list217, num2); - span3 = CollectionsMarshal.AsSpan(list217); + List list224 = new List(num2); + CollectionsMarshal.SetCount(list224, num2); + span3 = CollectionsMarshal.AsSpan(list224); index2 = 0; - ref QuestStep reference164 = ref span3[index2]; - QuestStep obj145 = new QuestStep(EInteractionType.Interact, 1055818u, new Vector3(583.276f, 120.7841f, 382.55884f), 1187) - { - Fly = true, - Land = true - }; - num3 = 6; - List> list218 = new List>(num3); - CollectionsMarshal.SetCount(list218, num3); - Span> span8 = CollectionsMarshal.AsSpan(list218); - index3 = 0; - span8[index3] = null; - index3++; - ref List reference165 = ref span8[index3]; - int num4 = 1; - List list219 = new List(num4); - CollectionsMarshal.SetCount(list219, num4); - span7 = CollectionsMarshal.AsSpan(list219); - int index4 = 0; - span7[index4] = new QuestWorkValue(null, (byte)3, EQuestWorkMode.Bitwise); - reference165 = list219; - index3++; - span8[index3] = null; - index3++; - span8[index3] = null; - index3++; - span8[index3] = null; - index3++; - span8[index3] = null; - obj145.RequiredQuestVariables = list218; - reference164 = obj145; - index2++; - ref QuestStep reference166 = ref span3[index2]; - QuestStep obj146 = new QuestStep(EInteractionType.Interact, 1055819u, new Vector3(442.31323f, 101.649635f, 363.21045f), 1187) + ref QuestStep reference169 = ref span3[index2]; + QuestStep obj150 = new QuestStep(EInteractionType.Interact, 1055818u, new Vector3(583.276f, 120.7841f, 382.55884f), 1187) { Fly = true, Land = true }; index3 = 6; - List> list220 = new List>(index3); - CollectionsMarshal.SetCount(list220, index3); - span8 = CollectionsMarshal.AsSpan(list220); + List> list225 = new List>(index3); + CollectionsMarshal.SetCount(list225, index3); + Span> span8 = CollectionsMarshal.AsSpan(list225); num3 = 0; span8[num3] = null; num3++; - ref List reference167 = ref span8[num3]; - index4 = 1; - List list221 = new List(index4); - CollectionsMarshal.SetCount(list221, index4); - span7 = CollectionsMarshal.AsSpan(list221); - num4 = 0; - span7[num4] = new QuestWorkValue(null, (byte)1, EQuestWorkMode.Bitwise); - reference167 = list221; + ref List reference170 = ref span8[num3]; + int num4 = 1; + List list226 = new List(num4); + CollectionsMarshal.SetCount(list226, num4); + span7 = CollectionsMarshal.AsSpan(list226); + int index4 = 0; + span7[index4] = new QuestWorkValue(null, (byte)3, EQuestWorkMode.Bitwise); + reference170 = list226; num3++; span8[num3] = null; num3++; @@ -461846,30 +461956,30 @@ public static class AssemblyQuestLoader span8[num3] = null; num3++; span8[num3] = null; - obj146.RequiredQuestVariables = list220; - reference166 = obj146; + obj150.RequiredQuestVariables = list225; + reference169 = obj150; index2++; - ref QuestStep reference168 = ref span3[index2]; - QuestStep obj147 = new QuestStep(EInteractionType.Interact, 1055820u, new Vector3(379.50696f, 78.73412f, 440.63464f), 1187) + ref QuestStep reference171 = ref span3[index2]; + QuestStep obj151 = new QuestStep(EInteractionType.Interact, 1055819u, new Vector3(442.31323f, 101.649635f, 363.21045f), 1187) { Fly = true, Land = true }; num3 = 6; - List> list222 = new List>(num3); - CollectionsMarshal.SetCount(list222, num3); - span8 = CollectionsMarshal.AsSpan(list222); + List> list227 = new List>(num3); + CollectionsMarshal.SetCount(list227, num3); + span8 = CollectionsMarshal.AsSpan(list227); index3 = 0; span8[index3] = null; index3++; - ref List reference169 = ref span8[index3]; - num4 = 1; - List list223 = new List(num4); - CollectionsMarshal.SetCount(list223, num4); - span7 = CollectionsMarshal.AsSpan(list223); - index4 = 0; - span7[index4] = new QuestWorkValue(null, (byte)2, EQuestWorkMode.Bitwise); - reference169 = list223; + ref List reference172 = ref span8[index3]; + index4 = 1; + List list228 = new List(index4); + CollectionsMarshal.SetCount(list228, index4); + span7 = CollectionsMarshal.AsSpan(list228); + num4 = 0; + span7[num4] = new QuestWorkValue(null, (byte)1, EQuestWorkMode.Bitwise); + reference172 = list228; index3++; span8[index3] = null; index3++; @@ -461878,129 +461988,42 @@ public static class AssemblyQuestLoader span8[index3] = null; index3++; span8[index3] = null; - obj147.RequiredQuestVariables = list222; - reference168 = obj147; - obj144.Steps = list217; - reference163 = obj144; - num++; - ref QuestSequence reference170 = ref span2[num]; - QuestSequence obj148 = new QuestSequence - { - Sequence = byte.MaxValue - }; - index2 = 1; - List list224 = new List(index2); - CollectionsMarshal.SetCount(list224, index2); - span3 = CollectionsMarshal.AsSpan(list224); - num2 = 0; - span3[num2] = new QuestStep(EInteractionType.CompleteQuest, 1054635u, new Vector3(493.2173f, 142.24991f, 783.0471f), 1187) + obj151.RequiredQuestVariables = list227; + reference171 = obj151; + index2++; + ref QuestStep reference173 = ref span3[index2]; + QuestStep obj152 = new QuestStep(EInteractionType.Interact, 1055820u, new Vector3(379.50696f, 78.73412f, 440.63464f), 1187) { Fly = true, - Land = true, - AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho + Land = true }; - obj148.Steps = list224; - reference170 = obj148; - questRoot26.QuestSequence = list215; - AddQuest(questId26, questRoot26); - QuestId questId27 = new QuestId(5340); - QuestRoot questRoot27 = new QuestRoot(); - num = 1; - List list225 = new List(num); - CollectionsMarshal.SetCount(list225, num); - span = CollectionsMarshal.AsSpan(list225); - index = 0; - span[index] = "CryoTechnic"; - questRoot27.Author = list225; - index = 4; - List list226 = new List(index); - CollectionsMarshal.SetCount(list226, index); - span2 = CollectionsMarshal.AsSpan(list226); - num = 0; - ref QuestSequence reference171 = ref span2[num]; - QuestSequence obj149 = new QuestSequence - { - Sequence = 0 - }; - num2 = 1; - List list227 = new List(num2); - CollectionsMarshal.SetCount(list227, num2); - span3 = CollectionsMarshal.AsSpan(list227); - index2 = 0; - span3[index2] = new QuestStep(EInteractionType.AcceptQuest, 1054635u, new Vector3(493.2173f, 142.24991f, 783.0471f), 1187) - { - AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho, - SkipConditions = new SkipConditions - { - AetheryteShortcutIf = new SkipAetheryteCondition - { - InSameTerritory = true - } - } - }; - obj149.Steps = list227; - reference171 = obj149; - num++; - ref QuestSequence reference172 = ref span2[num]; - QuestSequence obj150 = new QuestSequence - { - Sequence = 1 - }; - index2 = 3; - List list228 = new List(index2); - CollectionsMarshal.SetCount(list228, index2); - span3 = CollectionsMarshal.AsSpan(list228); - num2 = 0; - ref QuestStep reference173 = ref span3[num2]; - QuestStep obj151 = new QuestStep(EInteractionType.Interact, 1054640u, new Vector3(496.11658f, 142.24991f, 801.6022f), 1187) - { - TargetTerritoryId = (ushort)1297 - }; - SkipConditions skipConditions13 = new SkipConditions(); - SkipStepConditions skipStepConditions12 = new SkipStepConditions(); - index3 = 1; - List list229 = new List(index3); + index3 = 6; + List> list229 = new List>(index3); CollectionsMarshal.SetCount(list229, index3); - span4 = CollectionsMarshal.AsSpan(list229); + span8 = CollectionsMarshal.AsSpan(list229); num3 = 0; - span4[num3] = 1187; - skipStepConditions12.NotInTerritory = list229; - skipConditions13.StepIf = skipStepConditions12; - obj151.SkipConditions = skipConditions13; - reference173 = obj151; - num2++; - span3[num2] = new QuestStep(EInteractionType.WalkTo, null, new Vector3(52.610603f, 0f, 68.19062f), 1297) - { - Fly = false - }; - num2++; - span3[num2] = new QuestStep(EInteractionType.Interact, 1055802u, new Vector3(74.75391f, 1.8866259f, 50.369995f), 1297); - obj150.Steps = list228; - reference172 = obj150; - num++; - ref QuestSequence reference174 = ref span2[num]; - QuestSequence obj152 = new QuestSequence - { - Sequence = 2 - }; - num2 = 4; - List list230 = new List(num2); - CollectionsMarshal.SetCount(list230, num2); - span3 = CollectionsMarshal.AsSpan(list230); - index2 = 0; - span3[index2] = new QuestStep(EInteractionType.Craft, null, null, 1297) - { - ItemId = 46214u, - ItemCount = 3 - }; - index2++; - span3[index2] = new QuestStep(EInteractionType.WalkTo, null, new Vector3(68.66426f, 1.8905385f, 65.188644f), 1297); - index2++; - span3[index2] = new QuestStep(EInteractionType.WalkTo, null, new Vector3(89.68089f, 3.372309f, 67.41638f), 1297); - index2++; - span3[index2] = new QuestStep(EInteractionType.Interact, 1055821u, new Vector3(88.97534f, 3.3723087f, 75.791504f), 1297); - obj152.Steps = list230; - reference174 = obj152; + span8[num3] = null; + num3++; + ref List reference174 = ref span8[num3]; + num4 = 1; + List list230 = new List(num4); + CollectionsMarshal.SetCount(list230, num4); + span7 = CollectionsMarshal.AsSpan(list230); + index4 = 0; + span7[index4] = new QuestWorkValue(null, (byte)2, EQuestWorkMode.Bitwise); + reference174 = list230; + num3++; + span8[num3] = null; + num3++; + span8[num3] = null; + num3++; + span8[num3] = null; + num3++; + span8[num3] = null; + obj152.RequiredQuestVariables = list229; + reference173 = obj152; + obj149.Steps = list224; + reference168 = obj149; num++; ref QuestSequence reference175 = ref span2[num]; QuestSequence obj153 = new QuestSequence @@ -462016,20 +462039,13 @@ public static class AssemblyQuestLoader { Fly = true, Land = true, - AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho, - SkipConditions = new SkipConditions - { - AetheryteShortcutIf = new SkipAetheryteCondition - { - InSameTerritory = true - } - } + AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho }; obj153.Steps = list231; reference175 = obj153; - questRoot27.QuestSequence = list226; + questRoot27.QuestSequence = list222; AddQuest(questId27, questRoot27); - QuestId questId28 = new QuestId(5341); + QuestId questId28 = new QuestId(5340); QuestRoot questRoot28 = new QuestRoot(); num = 1; List list232 = new List(num); @@ -462055,6 +462071,7 @@ public static class AssemblyQuestLoader index2 = 0; span3[index2] = new QuestStep(EInteractionType.AcceptQuest, 1054635u, new Vector3(493.2173f, 142.24991f, 783.0471f), 1187) { + Fly = true, AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho, SkipConditions = new SkipConditions { @@ -462072,7 +462089,7 @@ public static class AssemblyQuestLoader { Sequence = 1 }; - index2 = 4; + index2 = 3; List list235 = new List(index2); CollectionsMarshal.SetCount(list235, index2); span3 = CollectionsMarshal.AsSpan(list235); @@ -462100,9 +462117,7 @@ public static class AssemblyQuestLoader Fly = false }; num2++; - span3[num2] = new QuestStep(EInteractionType.WalkTo, null, new Vector3(89.2292f, 3.372309f, 66.11308f), 1297); - num2++; - span3[num2] = new QuestStep(EInteractionType.Interact, 1055821u, new Vector3(88.97534f, 3.3723087f, 75.791504f), 1297); + span3[num2] = new QuestStep(EInteractionType.Interact, 1055802u, new Vector3(74.75391f, 1.8866259f, 50.369995f), 1297); obj155.Steps = list235; reference177 = obj155; num++; @@ -462111,17 +462126,21 @@ public static class AssemblyQuestLoader { Sequence = 2 }; - num2 = 2; + num2 = 4; List list237 = new List(num2); CollectionsMarshal.SetCount(list237, num2); span3 = CollectionsMarshal.AsSpan(list237); index2 = 0; span3[index2] = new QuestStep(EInteractionType.Craft, null, null, 1297) { - ItemId = 46216u, + ItemId = 46214u, ItemCount = 3 }; index2++; + span3[index2] = new QuestStep(EInteractionType.WalkTo, null, new Vector3(68.66426f, 1.8905385f, 65.188644f), 1297); + index2++; + span3[index2] = new QuestStep(EInteractionType.WalkTo, null, new Vector3(89.68089f, 3.372309f, 67.41638f), 1297); + index2++; span3[index2] = new QuestStep(EInteractionType.Interact, 1055821u, new Vector3(88.97534f, 3.3723087f, 75.791504f), 1297); obj157.Steps = list237; reference179 = obj157; @@ -462153,7 +462172,7 @@ public static class AssemblyQuestLoader reference180 = obj158; questRoot28.QuestSequence = list233; AddQuest(questId28, questRoot28); - QuestId questId29 = new QuestId(5342); + QuestId questId29 = new QuestId(5341); QuestRoot questRoot29 = new QuestRoot(); num = 1; List list239 = new List(num); @@ -462179,6 +462198,7 @@ public static class AssemblyQuestLoader index2 = 0; span3[index2] = new QuestStep(EInteractionType.AcceptQuest, 1054635u, new Vector3(493.2173f, 142.24991f, 783.0471f), 1187) { + Fly = true, AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho, SkipConditions = new SkipConditions { @@ -462196,13 +462216,13 @@ public static class AssemblyQuestLoader { Sequence = 1 }; - index2 = 1; + index2 = 4; List list242 = new List(index2); CollectionsMarshal.SetCount(list242, index2); span3 = CollectionsMarshal.AsSpan(list242); num2 = 0; ref QuestStep reference183 = ref span3[num2]; - QuestStep obj161 = new QuestStep(EInteractionType.Interact, 1054676u, new Vector3(500.93835f, 142.24991f, 782.22314f), 1187) + QuestStep obj161 = new QuestStep(EInteractionType.Interact, 1054640u, new Vector3(496.11658f, 142.24991f, 801.6022f), 1187) { TargetTerritoryId = (ushort)1297 }; @@ -462218,6 +462238,15 @@ public static class AssemblyQuestLoader skipConditions15.StepIf = skipStepConditions14; obj161.SkipConditions = skipConditions15; reference183 = obj161; + num2++; + span3[num2] = new QuestStep(EInteractionType.WalkTo, null, new Vector3(52.610603f, 0f, 68.19062f), 1297) + { + Fly = false + }; + num2++; + span3[num2] = new QuestStep(EInteractionType.WalkTo, null, new Vector3(89.2292f, 3.372309f, 66.11308f), 1297); + num2++; + span3[num2] = new QuestStep(EInteractionType.Interact, 1055821u, new Vector3(88.97534f, 3.3723087f, 75.791504f), 1297); obj160.Steps = list242; reference182 = obj160; num++; @@ -462233,15 +462262,11 @@ public static class AssemblyQuestLoader index2 = 0; span3[index2] = new QuestStep(EInteractionType.Craft, null, null, 1297) { - ItemId = 46218u, + ItemId = 46216u, ItemCount = 3 }; index2++; - span3[index2] = new QuestStep(EInteractionType.Interact, 1055824u, new Vector3(520.714f, 111.135f, 608.5145f), 1187) - { - Fly = true, - Land = true - }; + span3[index2] = new QuestStep(EInteractionType.Interact, 1055821u, new Vector3(88.97534f, 3.3723087f, 75.791504f), 1297); obj162.Steps = list244; reference184 = obj162; num++; @@ -462272,6 +462297,126 @@ public static class AssemblyQuestLoader reference185 = obj163; questRoot29.QuestSequence = list240; AddQuest(questId29, questRoot29); + QuestId questId30 = new QuestId(5342); + QuestRoot questRoot30 = new QuestRoot(); + num = 1; + List list246 = new List(num); + CollectionsMarshal.SetCount(list246, num); + span = CollectionsMarshal.AsSpan(list246); + index = 0; + span[index] = "CryoTechnic"; + questRoot30.Author = list246; + index = 4; + List list247 = new List(index); + CollectionsMarshal.SetCount(list247, index); + span2 = CollectionsMarshal.AsSpan(list247); + num = 0; + ref QuestSequence reference186 = ref span2[num]; + QuestSequence obj164 = new QuestSequence + { + Sequence = 0 + }; + num2 = 1; + List list248 = new List(num2); + CollectionsMarshal.SetCount(list248, num2); + span3 = CollectionsMarshal.AsSpan(list248); + index2 = 0; + span3[index2] = new QuestStep(EInteractionType.AcceptQuest, 1054635u, new Vector3(493.2173f, 142.24991f, 783.0471f), 1187) + { + Fly = true, + AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho, + SkipConditions = new SkipConditions + { + AetheryteShortcutIf = new SkipAetheryteCondition + { + InSameTerritory = true + } + } + }; + obj164.Steps = list248; + reference186 = obj164; + num++; + ref QuestSequence reference187 = ref span2[num]; + QuestSequence obj165 = new QuestSequence + { + Sequence = 1 + }; + index2 = 1; + List list249 = new List(index2); + CollectionsMarshal.SetCount(list249, index2); + span3 = CollectionsMarshal.AsSpan(list249); + num2 = 0; + ref QuestStep reference188 = ref span3[num2]; + QuestStep obj166 = new QuestStep(EInteractionType.Interact, 1054676u, new Vector3(500.93835f, 142.24991f, 782.22314f), 1187) + { + TargetTerritoryId = (ushort)1297 + }; + SkipConditions skipConditions16 = new SkipConditions(); + SkipStepConditions skipStepConditions15 = new SkipStepConditions(); + num3 = 1; + List list250 = new List(num3); + CollectionsMarshal.SetCount(list250, num3); + span4 = CollectionsMarshal.AsSpan(list250); + index3 = 0; + span4[index3] = 1187; + skipStepConditions15.NotInTerritory = list250; + skipConditions16.StepIf = skipStepConditions15; + obj166.SkipConditions = skipConditions16; + reference188 = obj166; + obj165.Steps = list249; + reference187 = obj165; + num++; + ref QuestSequence reference189 = ref span2[num]; + QuestSequence obj167 = new QuestSequence + { + Sequence = 2 + }; + num2 = 2; + List list251 = new List(num2); + CollectionsMarshal.SetCount(list251, num2); + span3 = CollectionsMarshal.AsSpan(list251); + index2 = 0; + span3[index2] = new QuestStep(EInteractionType.Craft, null, null, 1297) + { + ItemId = 46218u, + ItemCount = 3 + }; + index2++; + span3[index2] = new QuestStep(EInteractionType.Interact, 1055824u, new Vector3(520.714f, 111.135f, 608.5145f), 1187) + { + Fly = true, + Land = true + }; + obj167.Steps = list251; + reference189 = obj167; + num++; + ref QuestSequence reference190 = ref span2[num]; + QuestSequence obj168 = new QuestSequence + { + Sequence = byte.MaxValue + }; + index2 = 1; + List list252 = new List(index2); + CollectionsMarshal.SetCount(list252, index2); + span3 = CollectionsMarshal.AsSpan(list252); + num2 = 0; + span3[num2] = new QuestStep(EInteractionType.CompleteQuest, 1054635u, new Vector3(493.2173f, 142.24991f, 783.0471f), 1187) + { + Fly = true, + Land = true, + AetheryteShortcut = EAetheryteLocation.UrqopachaWorlarsEcho, + SkipConditions = new SkipConditions + { + AetheryteShortcutIf = new SkipAetheryteCondition + { + InSameTerritory = true + } + } + }; + obj168.Steps = list252; + reference190 = obj168; + questRoot30.QuestSequence = list247; + AddQuest(questId30, questRoot30); } private static void LoadQuests107() diff --git a/Questionable.Model/Properties/AssemblyInfo.cs b/Questionable.Model/Properties/AssemblyInfo.cs index 91147b2..23d364b 100644 --- a/Questionable.Model/Properties/AssemblyInfo.cs +++ b/Questionable.Model/Properties/AssemblyInfo.cs @@ -5,9 +5,9 @@ using System.Runtime.Versioning; [assembly: AssemblyCompany("Questionable.Model")] [assembly: AssemblyConfiguration("Release")] -[assembly: AssemblyFileVersion("6.17.0.0")] -[assembly: AssemblyInformationalVersion("6.17+b9ba6488a9a81b413bf6c1b207819a073543b5c0")] +[assembly: AssemblyFileVersion("6.18.0.0")] +[assembly: AssemblyInformationalVersion("6.18+55d305f98d73b2cf5e970c9b286da47b60f0af3d")] [assembly: AssemblyProduct("Questionable.Model")] [assembly: AssemblyTitle("Questionable.Model")] -[assembly: AssemblyVersion("6.17.0.0")] +[assembly: AssemblyVersion("6.18.0.0")] [module: RefSafetyRules(11)] diff --git a/Questionable/Properties/AssemblyInfo.cs b/Questionable/Properties/AssemblyInfo.cs index e7bde67..7a3a7cb 100644 --- a/Questionable/Properties/AssemblyInfo.cs +++ b/Questionable/Properties/AssemblyInfo.cs @@ -7,12 +7,12 @@ using System.Security.Permissions; [assembly: AssemblyCompany("Questionable")] [assembly: AssemblyConfiguration("Release")] -[assembly: AssemblyFileVersion("6.17.0.0")] -[assembly: AssemblyInformationalVersion("6.17+b9ba6488a9a81b413bf6c1b207819a073543b5c0")] +[assembly: AssemblyFileVersion("6.18.0.0")] +[assembly: AssemblyInformationalVersion("6.18+55d305f98d73b2cf5e970c9b286da47b60f0af3d")] [assembly: AssemblyProduct("Questionable")] [assembly: AssemblyTitle("Questionable")] [assembly: AssemblyMetadata("RepositoryUrl", "https://github.com/WigglyMuffin/Ambivalence")] [assembly: TargetPlatform("Windows7.0")] [assembly: SupportedOSPlatform("Windows7.0")] -[assembly: AssemblyVersion("6.17.0.0")] +[assembly: AssemblyVersion("6.18.0.0")] [module: RefSafetyRules(11)] diff --git a/Questionable/Questionable.Controller/QuestController.cs b/Questionable/Questionable.Controller/QuestController.cs index dc09739..18dc6cd 100644 --- a/Questionable/Questionable.Controller/QuestController.cs +++ b/Questionable/Questionable.Controller/QuestController.cs @@ -290,11 +290,11 @@ internal sealed class QuestController : MiniTaskController _safeAnimationEnd = DateTime.Now.AddSeconds(1f + num); } } - UpdateCurrentQuest(); if (AutomationType == EAutomationType.Manual && !IsRunning && !IsQuestWindowOpen) { return; } + UpdateCurrentQuest(); if (!_clientState.IsLoggedIn) { StopAllDueToConditionFailed("Logged out"); @@ -511,20 +511,6 @@ internal sealed class QuestController : MiniTaskController _pendingQuest = null; CheckNextTasks("Pending quest accepted"); } - if (_startedQuest != null && !_questFunctions.IsQuestAccepted(_startedQuest.Quest.Id)) - { - if (_startedQuest.Quest.Info.IsRepeatable) - { - _logger.LogInformation("Repeatable quest {QuestId} is no longer accepted, clearing started quest", _startedQuest.Quest.Id); - } - else if (!_questFunctions.IsQuestComplete(_startedQuest.Quest.Id)) - { - _logger.LogInformation("Quest {QuestId} was abandoned, clearing started quest", _startedQuest.Quest.Id); - _startedQuest = null; - Stop("Quest abandoned"); - return; - } - } if (_simulatedQuest == null && _nextQuest != null && !((!_nextQuest.Quest.Info.IsRepeatable) ? (!_questFunctions.IsQuestAcceptedOrComplete(_nextQuest.Quest.Id)) : (!_questFunctions.IsQuestAccepted(_nextQuest.Quest.Id)))) { _logger.LogInformation("Next quest {QuestId} accepted or completed", _nextQuest.Quest.Id); @@ -533,27 +519,11 @@ internal sealed class QuestController : MiniTaskController _startedQuest = _nextQuest; AutomationType = EAutomationType.SingleQuestB; } - else if (_questFunctions.IsQuestAccepted(_nextQuest.Quest.Id)) - { - QuestProgressInfo questProgressInfo = _questFunctions.GetQuestProgressInfo(_nextQuest.Quest.Id); - if (questProgressInfo != null) - { - _startedQuest = new QuestProgress(_nextQuest.Quest, questProgressInfo.Sequence); - _logger.LogInformation("Moving accepted next quest to started quest (sequence: {Sequence})", questProgressInfo.Sequence); - _nextQuest = null; - CheckNextTasks("Next quest already accepted"); - return; - } - _logger.LogWarning("Could not get quest progress info for accepted quest {QuestId}", _nextQuest.Quest.Id); - } _logger.LogDebug("Started: {StartedQuest}", _startedQuest?.Quest.Id); _nextQuest = null; } byte b; QuestProgress questProgress; - ElementId CurrentQuest; - byte Sequence; - MainScenarioQuestState State; if (_simulatedQuest != null) { b = _simulatedQuest.Sequence; @@ -577,71 +547,24 @@ internal sealed class QuestController : MiniTaskController ExecuteNextStep(); } } - else if (_startedQuest != null) - { - questProgress = _startedQuest; - b = _startedQuest.Sequence; - QuestProgressInfo questProgressInfo2 = _questFunctions.GetQuestProgressInfo(_startedQuest.Quest.Id); - if (questProgressInfo2 != null && questProgressInfo2.Sequence != b) - { - _logger.LogInformation("Updating started quest sequence from {OldSequence} to {NewSequence}", b, questProgressInfo2.Sequence); - b = questProgressInfo2.Sequence; - } - if (AutomationType == EAutomationType.Manual || !IsRunning) - { - _questFunctions.GetCurrentQuest(AutomationType != EAutomationType.SingleQuestB).Deconstruct(out CurrentQuest, out Sequence, out State); - ElementId elementId = CurrentQuest; - byte sequence = Sequence; - (ElementId, byte)? tuple = (from x in ManualPriorityQuests - where _questFunctions.IsReadyToAcceptQuest(x.Id) || _questFunctions.IsQuestAccepted(x.Id) - select (Id: x.Id, _questFunctions.GetQuestProgressInfo(x.Id)?.Sequence ?? 0)).FirstOrDefault(); - if (tuple.HasValue) - { - (ElementId, byte) valueOrDefault = tuple.GetValueOrDefault(); - if ((object)valueOrDefault.Item1 != null) - { - (elementId, sequence) = valueOrDefault; - } - } - if (elementId != null && elementId.Value != 0 && _startedQuest.Quest.Id != elementId) - { - _logger.LogInformation("Game current quest changed from {OldQuest} to {NewQuest}, updating started quest", _startedQuest.Quest.Id, elementId); - if (_questRegistry.TryGetQuest(elementId, out Quest quest)) - { - _logger.LogInformation("Switching to new quest: {QuestName}", quest.Info.Name); - _startedQuest = new QuestProgress(quest, sequence); - if (_clientState.LocalPlayer != null && _clientState.LocalPlayer.Level < quest.Info.Level) - { - _logger.LogInformation("Stopping automation, player level ({PlayerLevel}) < quest level ({QuestLevel}", _clientState.LocalPlayer.Level, quest.Info.Level); - Stop("Quest level too high"); - } - questProgress = _startedQuest; - } - else - { - _logger.LogInformation("New quest {QuestId} not found in registry", elementId); - } - } - } - } else { - _questFunctions.GetCurrentQuest(AutomationType != EAutomationType.SingleQuestB).Deconstruct(out CurrentQuest, out Sequence, out State); - ElementId elementId2 = CurrentQuest; + _questFunctions.GetCurrentQuest(AutomationType != EAutomationType.SingleQuestB).Deconstruct(out ElementId CurrentQuest, out byte Sequence, out MainScenarioQuestState State); + ElementId elementId = CurrentQuest; b = Sequence; MainScenarioQuestState mainScenarioQuestState = State; - (ElementId, byte)? tuple3 = (from x in ManualPriorityQuests + (ElementId, byte)? tuple = (from x in ManualPriorityQuests where _questFunctions.IsReadyToAcceptQuest(x.Id) || _questFunctions.IsQuestAccepted(x.Id) select (Id: x.Id, _questFunctions.GetQuestProgressInfo(x.Id)?.Sequence ?? 0)).FirstOrDefault(); - if (tuple3.HasValue) + if (tuple.HasValue) { - (ElementId, byte) valueOrDefault2 = tuple3.GetValueOrDefault(); - if ((object)valueOrDefault2.Item1 != null) + (ElementId, byte) valueOrDefault = tuple.GetValueOrDefault(); + if ((object)valueOrDefault.Item1 != null) { - (elementId2, b) = valueOrDefault2; + (elementId, b) = valueOrDefault; } } - if (elementId2 == null || elementId2.Value == 0) + if (elementId == null || elementId.Value == 0) { if (_startedQuest != null) { @@ -662,9 +585,9 @@ internal sealed class QuestController : MiniTaskController } else { - if (_startedQuest == null || _startedQuest.Quest.Id != elementId2) + if (_startedQuest == null || _startedQuest.Quest.Id != elementId) { - Quest quest2; + Quest quest; if (_configuration.Stop.Enabled && _startedQuest != null && _configuration.Stop.QuestsToStopAfter.Contains(_startedQuest.Quest.Id) && _questFunctions.IsQuestComplete(_startedQuest.Quest.Id)) { ElementId id = _startedQuest.Quest.Id; @@ -673,13 +596,13 @@ internal sealed class QuestController : MiniTaskController _startedQuest = null; Stop($"Stopping point [{id}] reached"); } - else if (_questRegistry.TryGetQuest(elementId2, out quest2)) + else if (_questRegistry.TryGetQuest(elementId, out quest)) { - _logger.LogInformation("New quest: {QuestName}", quest2.Info.Name); - _startedQuest = new QuestProgress(quest2, b); - if (_clientState.LocalPlayer != null && _clientState.LocalPlayer.Level < quest2.Info.Level) + _logger.LogInformation("New quest: {QuestName}", quest.Info.Name); + _startedQuest = new QuestProgress(quest, b); + if (_clientState.LocalPlayer != null && _clientState.LocalPlayer.Level < quest.Info.Level) { - _logger.LogInformation("Stopping automation, player level ({PlayerLevel}) < quest level ({QuestLevel}", _clientState.LocalPlayer.Level, quest2.Info.Level); + _logger.LogInformation("Stopping automation, player level ({PlayerLevel}) < quest level ({QuestLevel}", _clientState.LocalPlayer.Level, quest.Info.Level); Stop("Quest level too high"); return; } @@ -704,10 +627,7 @@ internal sealed class QuestController : MiniTaskController if (questProgress == null) { DebugState = "No quest active"; - if (!IsRunning) - { - Stop("No quest active"); - } + Stop("No quest active"); return; } if (_gameFunctions.IsOccupied() && !_gameFunctions.IsOccupiedWithCustomDeliveryNpc(questProgress.Quest)) @@ -913,13 +833,6 @@ internal sealed class QuestController : MiniTaskController } } - public void SetStartedQuest(Quest quest, byte sequence = 0) - { - _logger.LogInformation("Setting started quest: {QuestId}", quest.Id); - _startedQuest = new QuestProgress(quest, sequence); - _nextQuest = null; - } - public void SetGatheringQuest(Quest? quest) { _logger.LogInformation("GatheringQuest: {QuestId}", quest?.Id); diff --git a/Questionable/Questionable.Model/AlliedSocietyDailyInfo.cs b/Questionable/Questionable.Model/AlliedSocietyDailyInfo.cs index 9eb661c..8346f36 100644 --- a/Questionable/Questionable.Model/AlliedSocietyDailyInfo.cs +++ b/Questionable/Questionable.Model/AlliedSocietyDailyInfo.cs @@ -41,63 +41,51 @@ internal sealed class AlliedSocietyDailyInfo : IQuestInfo { QuestId = new AlliedSocietyDailyId((byte)beastTribe.RowId, rank); Name = beastTribe.Name.ToString(); - IReadOnlyList readOnlyList = null; - try + List list2; + switch ((EAlliedSociety)(byte)beastTribe.RowId) { - List list2; - switch ((EAlliedSociety)(byte)beastTribe.RowId) - { - case EAlliedSociety.Amaljaa: - case EAlliedSociety.Sylphs: - case EAlliedSociety.Kobolds: - case EAlliedSociety.Sahagin: - case EAlliedSociety.VanuVanu: - case EAlliedSociety.Vath: - case EAlliedSociety.Kojin: - case EAlliedSociety.Ananta: - case EAlliedSociety.Pixies: - case EAlliedSociety.Arkasodara: - case EAlliedSociety.Pelupelu: - { - List list3 = new List(); - list3.AddRange(classJobUtils.AsIndividualJobs(EExtendedClassJob.DoW, null)); - list3.AddRange(classJobUtils.AsIndividualJobs(EExtendedClassJob.DoM, null)); - list2 = list3; - break; - } - case EAlliedSociety.Ixal: - case EAlliedSociety.Moogles: - case EAlliedSociety.Dwarves: - case EAlliedSociety.Loporrits: - case EAlliedSociety.YokHuy: - list2 = classJobUtils.AsIndividualJobs(EExtendedClassJob.DoH, null).ToList(); - break; - case EAlliedSociety.Qitari: - case EAlliedSociety.Omicrons: - case EAlliedSociety.MamoolJa: - list2 = classJobUtils.AsIndividualJobs(EExtendedClassJob.DoL, null).ToList(); - break; - case EAlliedSociety.Namazu: - { - List list = new List(); - list.AddRange(classJobUtils.AsIndividualJobs(EExtendedClassJob.DoH, null)); - list.AddRange(classJobUtils.AsIndividualJobs(EExtendedClassJob.DoL, null)); - list2 = list; - break; - } - default: - throw new ArgumentOutOfRangeException("beastTribe"); - } - readOnlyList = list2; - } - catch (ArgumentOutOfRangeException) + case EAlliedSociety.Amaljaa: + case EAlliedSociety.Sylphs: + case EAlliedSociety.Kobolds: + case EAlliedSociety.Sahagin: + case EAlliedSociety.VanuVanu: + case EAlliedSociety.Vath: + case EAlliedSociety.Kojin: + case EAlliedSociety.Ananta: + case EAlliedSociety.Pixies: + case EAlliedSociety.Arkasodara: + case EAlliedSociety.Pelupelu: { - List list4 = new List(); - list4.AddRange(classJobUtils.AsIndividualJobs(EExtendedClassJob.DoW, null)); - list4.AddRange(classJobUtils.AsIndividualJobs(EExtendedClassJob.DoM, null)); - readOnlyList = new _003C_003Ez__ReadOnlyList(list4); + List list3 = new List(); + list3.AddRange(classJobUtils.AsIndividualJobs(EExtendedClassJob.DoW, null)); + list3.AddRange(classJobUtils.AsIndividualJobs(EExtendedClassJob.DoM, null)); + list2 = list3; + break; } - ClassJobs = readOnlyList; + case EAlliedSociety.Ixal: + case EAlliedSociety.Moogles: + case EAlliedSociety.Dwarves: + case EAlliedSociety.Loporrits: + case EAlliedSociety.YokHuy: + list2 = classJobUtils.AsIndividualJobs(EExtendedClassJob.DoH, null).ToList(); + break; + case EAlliedSociety.Qitari: + case EAlliedSociety.Omicrons: + case EAlliedSociety.MamoolJa: + list2 = classJobUtils.AsIndividualJobs(EExtendedClassJob.DoL, null).ToList(); + break; + case EAlliedSociety.Namazu: + { + List list = new List(); + list.AddRange(classJobUtils.AsIndividualJobs(EExtendedClassJob.DoH, null)); + list.AddRange(classJobUtils.AsIndividualJobs(EExtendedClassJob.DoL, null)); + list2 = list; + break; + } + default: + throw new ArgumentOutOfRangeException("beastTribe"); + } + ClassJobs = list2; Expansion = (EExpansionVersion)beastTribe.Expansion.RowId; } } diff --git a/Questionable/Questionable.Windows.JournalComponents/QuestJournalComponent.cs b/Questionable/Questionable.Windows.JournalComponents/QuestJournalComponent.cs index dc8bace..f86cdd8 100644 --- a/Questionable/Questionable.Windows.JournalComponents/QuestJournalComponent.cs +++ b/Questionable/Questionable.Windows.JournalComponents/QuestJournalComponent.cs @@ -311,6 +311,11 @@ internal sealed class QuestJournalComponent goto IL_0210; IL_0210: ImGui.TableNextColumn(); + if (_questFunctions.IsQuestAccepted(questInfo.QuestId)) + { + _uiUtils.ChecklistItem("Active", ImGuiColors.DalamudYellow, FontAwesomeIcon.PersonWalkingArrowRight); + return; + } if (_questFunctions.IsQuestComplete(questInfo.QuestId)) { if (questInfo.IsRepeatable && _questFunctions.IsReadyToAcceptQuest(questInfo.QuestId)) @@ -323,11 +328,6 @@ internal sealed class QuestJournalComponent } return; } - if (_questFunctions.IsQuestAccepted(questInfo.QuestId)) - { - _uiUtils.ChecklistItem("Active", ImGuiColors.DalamudYellow, FontAwesomeIcon.PersonWalkingArrowRight); - return; - } bool flag = false; bool flag2 = _questFunctions.IsQuestUnobtainable(questInfo.QuestId); bool flag3 = _questFunctions.IsQuestLocked(questInfo.QuestId); diff --git a/Questionable/Questionable.Windows.JournalComponents/QuestJournalUtils.cs b/Questionable/Questionable.Windows.JournalComponents/QuestJournalUtils.cs index 9753af9..6e2e8fd 100644 --- a/Questionable/Questionable.Windows.JournalComponents/QuestJournalUtils.cs +++ b/Questionable/Questionable.Windows.JournalComponents/QuestJournalUtils.cs @@ -59,28 +59,12 @@ internal sealed class QuestJournalUtils { return; } - using (ImRaii.Disabled(!_questFunctions.IsReadyToAcceptQuest(questInfo.QuestId) && !_questFunctions.IsQuestAccepted(questInfo.QuestId))) + using (ImRaii.Disabled(!_questFunctions.IsReadyToAcceptQuest(questInfo.QuestId))) { if (ImGui.MenuItem("Start as next quest")) { - if (quest == null) - { - return; - } - if (_questFunctions.IsQuestAccepted(questInfo.QuestId)) - { - QuestProgressInfo questProgressInfo = _questFunctions.GetQuestProgressInfo(questInfo.QuestId); - if (questProgressInfo != null) - { - _questController.SetStartedQuest(quest, questProgressInfo.Sequence); - _questController.Start(label); - } - } - else - { - _questController.SetNextQuest(quest); - _questController.Start(label); - } + _questController.SetNextQuest(quest); + _questController.Start(label); } } List incompletePrerequisiteQuests = GetIncompletePrerequisiteQuests(questInfo); diff --git a/Solution.sln b/Solution.sln index 37ae7af..2134059 100644 --- a/Solution.sln +++ b/Solution.sln @@ -2,15 +2,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuestPaths", "QuestPaths\QuestPaths.csproj", "{03FCE305-0D27-4737-B9D3-355DA5A9DD82}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuestPaths", "QuestPaths\QuestPaths.csproj", "{442AB657-455F-42DD-BFDC-F9C034BAF528}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GatheringPaths", "GatheringPaths\GatheringPaths.csproj", "{F24DD684-543A-45D0-814D-C6481D3B147C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GatheringPaths", "GatheringPaths\GatheringPaths.csproj", "{FE881E2D-713D-42BE-A023-2BC724BDFFEB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Questionable", "Questionable\Questionable.csproj", "{E1581BFD-DBED-414A-B6D9-BDAD3B0FB450}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Questionable", "Questionable\Questionable.csproj", "{A5C50C48-5B13-4C67-AFED-E994669040CE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Questionable.Model", "Questionable.Model\Questionable.Model.csproj", "{2F1ABB12-17D6-4FF8-A6FA-F757C9E89A04}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Questionable.Model", "Questionable.Model\Questionable.Model.csproj", "{78C31351-CEAB-4D69-9A41-F159EEB4C449}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "LLib\LLib.csproj", "{18FF6CA8-A436-4FEC-B888-568A1D5511DA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "LLib\LLib.csproj", "{8E90FF18-67CE-46D4-A05A-DAA903E04469}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -20,46 +20,46 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {03FCE305-0D27-4737-B9D3-355DA5A9DD82}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU - {03FCE305-0D27-4737-B9D3-355DA5A9DD82}.Debug|AnyCPU.Build.0 = Debug|AnyCPU - {03FCE305-0D27-4737-B9D3-355DA5A9DD82}.Debug|x64.ActiveCfg = Debug|AnyCPU - {03FCE305-0D27-4737-B9D3-355DA5A9DD82}.Debug|x64.Build.0 = Debug|AnyCPU - {03FCE305-0D27-4737-B9D3-355DA5A9DD82}.Release|AnyCPU.ActiveCfg = Release|AnyCPU - {03FCE305-0D27-4737-B9D3-355DA5A9DD82}.Release|AnyCPU.Build.0 = Release|AnyCPU - {03FCE305-0D27-4737-B9D3-355DA5A9DD82}.Release|x64.ActiveCfg = Release|AnyCPU - {03FCE305-0D27-4737-B9D3-355DA5A9DD82}.Release|x64.Build.0 = Release|AnyCPU - {F24DD684-543A-45D0-814D-C6481D3B147C}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU - {F24DD684-543A-45D0-814D-C6481D3B147C}.Debug|AnyCPU.Build.0 = Debug|AnyCPU - {F24DD684-543A-45D0-814D-C6481D3B147C}.Debug|x64.ActiveCfg = Debug|AnyCPU - {F24DD684-543A-45D0-814D-C6481D3B147C}.Debug|x64.Build.0 = Debug|AnyCPU - {F24DD684-543A-45D0-814D-C6481D3B147C}.Release|AnyCPU.ActiveCfg = Release|AnyCPU - {F24DD684-543A-45D0-814D-C6481D3B147C}.Release|AnyCPU.Build.0 = Release|AnyCPU - {F24DD684-543A-45D0-814D-C6481D3B147C}.Release|x64.ActiveCfg = Release|AnyCPU - {F24DD684-543A-45D0-814D-C6481D3B147C}.Release|x64.Build.0 = Release|AnyCPU - {E1581BFD-DBED-414A-B6D9-BDAD3B0FB450}.Debug|AnyCPU.ActiveCfg = Debug|x64 - {E1581BFD-DBED-414A-B6D9-BDAD3B0FB450}.Debug|AnyCPU.Build.0 = Debug|x64 - {E1581BFD-DBED-414A-B6D9-BDAD3B0FB450}.Debug|x64.ActiveCfg = Debug|x64 - {E1581BFD-DBED-414A-B6D9-BDAD3B0FB450}.Debug|x64.Build.0 = Debug|x64 - {E1581BFD-DBED-414A-B6D9-BDAD3B0FB450}.Release|AnyCPU.ActiveCfg = Release|x64 - {E1581BFD-DBED-414A-B6D9-BDAD3B0FB450}.Release|AnyCPU.Build.0 = Release|x64 - {E1581BFD-DBED-414A-B6D9-BDAD3B0FB450}.Release|x64.ActiveCfg = Release|x64 - {E1581BFD-DBED-414A-B6D9-BDAD3B0FB450}.Release|x64.Build.0 = Release|x64 - {2F1ABB12-17D6-4FF8-A6FA-F757C9E89A04}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU - {2F1ABB12-17D6-4FF8-A6FA-F757C9E89A04}.Debug|AnyCPU.Build.0 = Debug|AnyCPU - {2F1ABB12-17D6-4FF8-A6FA-F757C9E89A04}.Debug|x64.ActiveCfg = Debug|AnyCPU - {2F1ABB12-17D6-4FF8-A6FA-F757C9E89A04}.Debug|x64.Build.0 = Debug|AnyCPU - {2F1ABB12-17D6-4FF8-A6FA-F757C9E89A04}.Release|AnyCPU.ActiveCfg = Release|AnyCPU - {2F1ABB12-17D6-4FF8-A6FA-F757C9E89A04}.Release|AnyCPU.Build.0 = Release|AnyCPU - {2F1ABB12-17D6-4FF8-A6FA-F757C9E89A04}.Release|x64.ActiveCfg = Release|AnyCPU - {2F1ABB12-17D6-4FF8-A6FA-F757C9E89A04}.Release|x64.Build.0 = Release|AnyCPU - {18FF6CA8-A436-4FEC-B888-568A1D5511DA}.Debug|AnyCPU.ActiveCfg = Debug|x64 - {18FF6CA8-A436-4FEC-B888-568A1D5511DA}.Debug|AnyCPU.Build.0 = Debug|x64 - {18FF6CA8-A436-4FEC-B888-568A1D5511DA}.Debug|x64.ActiveCfg = Debug|x64 - {18FF6CA8-A436-4FEC-B888-568A1D5511DA}.Debug|x64.Build.0 = Debug|x64 - {18FF6CA8-A436-4FEC-B888-568A1D5511DA}.Release|AnyCPU.ActiveCfg = Release|x64 - {18FF6CA8-A436-4FEC-B888-568A1D5511DA}.Release|AnyCPU.Build.0 = Release|x64 - {18FF6CA8-A436-4FEC-B888-568A1D5511DA}.Release|x64.ActiveCfg = Release|x64 - {18FF6CA8-A436-4FEC-B888-568A1D5511DA}.Release|x64.Build.0 = Release|x64 + {442AB657-455F-42DD-BFDC-F9C034BAF528}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU + {442AB657-455F-42DD-BFDC-F9C034BAF528}.Debug|AnyCPU.Build.0 = Debug|AnyCPU + {442AB657-455F-42DD-BFDC-F9C034BAF528}.Debug|x64.ActiveCfg = Debug|AnyCPU + {442AB657-455F-42DD-BFDC-F9C034BAF528}.Debug|x64.Build.0 = Debug|AnyCPU + {442AB657-455F-42DD-BFDC-F9C034BAF528}.Release|AnyCPU.ActiveCfg = Release|AnyCPU + {442AB657-455F-42DD-BFDC-F9C034BAF528}.Release|AnyCPU.Build.0 = Release|AnyCPU + {442AB657-455F-42DD-BFDC-F9C034BAF528}.Release|x64.ActiveCfg = Release|AnyCPU + {442AB657-455F-42DD-BFDC-F9C034BAF528}.Release|x64.Build.0 = Release|AnyCPU + {FE881E2D-713D-42BE-A023-2BC724BDFFEB}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU + {FE881E2D-713D-42BE-A023-2BC724BDFFEB}.Debug|AnyCPU.Build.0 = Debug|AnyCPU + {FE881E2D-713D-42BE-A023-2BC724BDFFEB}.Debug|x64.ActiveCfg = Debug|AnyCPU + {FE881E2D-713D-42BE-A023-2BC724BDFFEB}.Debug|x64.Build.0 = Debug|AnyCPU + {FE881E2D-713D-42BE-A023-2BC724BDFFEB}.Release|AnyCPU.ActiveCfg = Release|AnyCPU + {FE881E2D-713D-42BE-A023-2BC724BDFFEB}.Release|AnyCPU.Build.0 = Release|AnyCPU + {FE881E2D-713D-42BE-A023-2BC724BDFFEB}.Release|x64.ActiveCfg = Release|AnyCPU + {FE881E2D-713D-42BE-A023-2BC724BDFFEB}.Release|x64.Build.0 = Release|AnyCPU + {A5C50C48-5B13-4C67-AFED-E994669040CE}.Debug|AnyCPU.ActiveCfg = Debug|x64 + {A5C50C48-5B13-4C67-AFED-E994669040CE}.Debug|AnyCPU.Build.0 = Debug|x64 + {A5C50C48-5B13-4C67-AFED-E994669040CE}.Debug|x64.ActiveCfg = Debug|x64 + {A5C50C48-5B13-4C67-AFED-E994669040CE}.Debug|x64.Build.0 = Debug|x64 + {A5C50C48-5B13-4C67-AFED-E994669040CE}.Release|AnyCPU.ActiveCfg = Release|x64 + {A5C50C48-5B13-4C67-AFED-E994669040CE}.Release|AnyCPU.Build.0 = Release|x64 + {A5C50C48-5B13-4C67-AFED-E994669040CE}.Release|x64.ActiveCfg = Release|x64 + {A5C50C48-5B13-4C67-AFED-E994669040CE}.Release|x64.Build.0 = Release|x64 + {78C31351-CEAB-4D69-9A41-F159EEB4C449}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU + {78C31351-CEAB-4D69-9A41-F159EEB4C449}.Debug|AnyCPU.Build.0 = Debug|AnyCPU + {78C31351-CEAB-4D69-9A41-F159EEB4C449}.Debug|x64.ActiveCfg = Debug|AnyCPU + {78C31351-CEAB-4D69-9A41-F159EEB4C449}.Debug|x64.Build.0 = Debug|AnyCPU + {78C31351-CEAB-4D69-9A41-F159EEB4C449}.Release|AnyCPU.ActiveCfg = Release|AnyCPU + {78C31351-CEAB-4D69-9A41-F159EEB4C449}.Release|AnyCPU.Build.0 = Release|AnyCPU + {78C31351-CEAB-4D69-9A41-F159EEB4C449}.Release|x64.ActiveCfg = Release|AnyCPU + {78C31351-CEAB-4D69-9A41-F159EEB4C449}.Release|x64.Build.0 = Release|AnyCPU + {8E90FF18-67CE-46D4-A05A-DAA903E04469}.Debug|AnyCPU.ActiveCfg = Debug|x64 + {8E90FF18-67CE-46D4-A05A-DAA903E04469}.Debug|AnyCPU.Build.0 = Debug|x64 + {8E90FF18-67CE-46D4-A05A-DAA903E04469}.Debug|x64.ActiveCfg = Debug|x64 + {8E90FF18-67CE-46D4-A05A-DAA903E04469}.Debug|x64.Build.0 = Debug|x64 + {8E90FF18-67CE-46D4-A05A-DAA903E04469}.Release|AnyCPU.ActiveCfg = Release|x64 + {8E90FF18-67CE-46D4-A05A-DAA903E04469}.Release|AnyCPU.Build.0 = Release|x64 + {8E90FF18-67CE-46D4-A05A-DAA903E04469}.Release|x64.ActiveCfg = Release|x64 + {8E90FF18-67CE-46D4-A05A-DAA903E04469}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE