From 67c7161596c00a15da4c5e11c2e9a2ceac49b75f Mon Sep 17 00:00:00 2001 From: Jackson <9527380+Jaksuhn@users.noreply.github.com> Date: Tue, 3 Dec 2024 19:10:52 +0100 Subject: [PATCH] something --- .../Features/WondrousTailsClickToOpen.cs | 40 +++++++++++++------ Automaton/Plugin.cs | 1 - 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/Automaton/Features/WondrousTailsClickToOpen.cs b/Automaton/Features/WondrousTailsClickToOpen.cs index 071ac62..3e8cfb8 100644 --- a/Automaton/Features/WondrousTailsClickToOpen.cs +++ b/Automaton/Features/WondrousTailsClickToOpen.cs @@ -71,7 +71,7 @@ private void ResetEventHandles() } } - private List GetInstanceListFromId(uint orderDataId) + private unsafe List GetInstanceListFromId(uint orderDataId) { var bingoOrderData = GetSheet().GetRow(orderDataId); Svc.Log.Info($"{nameof(OnDutySlotClick)}: [row={bingoOrderData.RowId}; type={bingoOrderData.Type}; text={bingoOrderData.Text.Value.Description};]"); @@ -105,23 +105,37 @@ private List GetInstanceListFromId(uint orderDataId) // Special categories case 3: - return bingoOrderData.Unknown1 switch + // handling AgentContentsFinder here is such a hack + switch (bingoOrderData.Unknown1) { - // Treasure Map Instances are Not Supported - 1 => [], + // Treasure Maps, nothing to do + case 1: + return []; - // PvP Categories are Not Supported - 2 => [], + // Frontlines + case 2: + AgentContentsFinder.Instance()->OpenRouletteDuty(7); + return []; // Deep Dungeons - 3 => _sheet - .Where(m => m.ContentType.RowId is 21) - .OrderBy(row => row.SortKey) - .Select(m => m.TerritoryType.RowId) - .ToList(), + case 3: + return _sheet + .Where(m => m.ContentType.RowId is 21) + .OrderBy(row => row.SortKey) + .Select(m => m.TerritoryType.RowId) + .ToList(); - _ => [], - }; + // Rival Wings + case 69: // TODO FIND + AgentContentsFinder.Instance()->OpenRegularDuty(599); // Hidden Gorge + return []; + + // Crystalline Conflict + case 52: + AgentContentsFinder.Instance()->OpenRouletteDuty(40); // Casual Match + return []; + } + return []; // Multi-instance raids case 4: diff --git a/Automaton/Plugin.cs b/Automaton/Plugin.cs index c57c81e..c354c83 100644 --- a/Automaton/Plugin.cs +++ b/Automaton/Plugin.cs @@ -8,7 +8,6 @@ using ECommons.Configuration; using ECommons.SimpleGui; using System.Collections.Specialized; -using System.Diagnostics; using System.Reflection; namespace Automaton;