From e4f2711b55792372ac574c6ca190734bc36500d0 Mon Sep 17 00:00:00 2001 From: spinnyspin <72470303+spinnyspin@users.noreply.github.com> Date: Tue, 6 Oct 2020 16:20:14 -0400 Subject: [PATCH] end in mist on housechecker --- HouseChecker.cs | 90 ++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/HouseChecker.cs b/HouseChecker.cs index 5a4c7c0..982ee31 100644 --- a/HouseChecker.cs +++ b/HouseChecker.cs @@ -58,15 +58,15 @@ private async Task Run() if (ConditionParser.HasAetheryte(2)) output.AddRange(await GetLavenderPlots()); - - if (ConditionParser.HasAetheryte(8)) - output.AddRange(await GetMistsPlots()); - + if (ConditionParser.HasAetheryte(9)) output.AddRange(await GetGobletPlots()); - + if (ConditionParser.HasAetheryte(111)) output.AddRange(await GetShiroganePlots()); + + if (ConditionParser.HasAetheryte(8)) + output.AddRange(await GetMistsPlots()); if(!output.Any()) Log1($"No Housing Plots For Sale"); @@ -94,27 +94,6 @@ private async Task Run() } - public static async Task> GetMistsPlots() - { - if (ConditionParser.IsQuestCompleted(66750)) - await GetToResidential(8); - else - await GetToMistsWindow(); - - if (!SelectString.IsOpen) - return new List(); - - await OpenHousingWards(); - var list = await HousingWards(); - - if (ConditionParser.IsQuestCompleted(66750)) - await CloseHousingWardsNoLoad(); - else - await CloseHousingWards(); - - return list; - } - public static async Task> GetLavenderPlots() { if (ConditionParser.IsQuestCompleted(66748)) @@ -177,6 +156,27 @@ public static async Task> GetShiroganePlots() return list; } + + public static async Task> GetMistsPlots() + { + if (ConditionParser.IsQuestCompleted(66750)) + await GetToResidential(8); + else + await GetToMistsWindow(); + + if (!SelectString.IsOpen) + return new List(); + + await OpenHousingWards(); + var list = await HousingWards(); + + if (ConditionParser.IsQuestCompleted(66750)) + await CloseHousingWardsNoLoad(); + else + await CloseHousingWards(); + + return list; + } private static async Task GetToResidential(uint aetheryteId) { @@ -311,25 +311,8 @@ public static async Task GetToGobletWindow() Navigator.PlayerMover.MoveStop(); await Coroutine.Wait(3000, () => SelectString.IsOpen); } - - public static async Task GetToMistsWindow() - { - await Navigation.GetTo(135, new Vector3(597.4801f, 61.59979f, -110.7737f)); - - var zoneChange = new Vector3(598.1823f, 61.52054f, -108.3216f); - - while (!SelectString.IsOpen) - { - Navigator.PlayerMover.MoveTowards(zoneChange); - await Coroutine.Sleep(50); - Navigator.PlayerMover.MoveStop(); - } - - Navigator.PlayerMover.MoveStop(); - await Coroutine.Wait(3000, () => SelectString.IsOpen); - } - - public static async Task GetToShiroganeWindow() + + public static async Task GetToShiroganeWindow() { await Navigation.GetTo(628, new Vector3(-116.2294f, -7.010099f, -40.55866f)); @@ -359,7 +342,24 @@ public static async Task GetToShiroganeWindow() await Coroutine.Wait(3000, () => SelectString.IsOpen); } + + public static async Task GetToMistsWindow() + { + await Navigation.GetTo(135, new Vector3(597.4801f, 61.59979f, -110.7737f)); + + var zoneChange = new Vector3(598.1823f, 61.52054f, -108.3216f); + while (!SelectString.IsOpen) + { + Navigator.PlayerMover.MoveTowards(zoneChange); + await Coroutine.Sleep(50); + Navigator.PlayerMover.MoveStop(); + } + + Navigator.PlayerMover.MoveStop(); + await Coroutine.Wait(3000, () => SelectString.IsOpen); + } + public static async Task CloseHousingWards() { if (HousingSelectBlock.Instance.IsOpen)