From a8379cc758a5bf8d3f4982507c2b5fa2384a6374 Mon Sep 17 00:00:00 2001 From: aMannus Date: Tue, 21 Oct 2025 19:10:28 +0200 Subject: [PATCH] Reset tricks on AP parse --- soh/soh/Enhancements/randomizer/context.cpp | 8 ++++++++ soh/soh/Enhancements/randomizer/context.h | 1 + 2 files changed, 9 insertions(+) diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp index a7855010f..e47723562 100644 --- a/soh/soh/Enhancements/randomizer/context.cpp +++ b/soh/soh/Enhancements/randomizer/context.cpp @@ -437,6 +437,7 @@ void Context::ParseArchipelago() { ArchipelagoClient& apClient = ArchipelagoClient::GetInstance(); ParseArchipelagoItemsLocations(apClient.GetScoutedItems()); ParseArchipelagoOptions(); + ParseArchipelagoTricks(); mEntranceShuffler->UnshuffleAllEntrances(); mDungeons->ResetAllDungeons(); mTrials->RemoveAllTrials(); @@ -750,6 +751,13 @@ void Context::ParseArchipelagoOptions() { mOptions[RSK_SHUFFLE_TREES].Set(slotData["shuffle_trees"]); } +void Context::ParseArchipelagoTricks() { + Context::ResetTrickOptions(); + + // TODO: Implement trick parsing from slot data + // See Context::ParseTricksJson for more info +} + void Context::ParseArchipelagoItemsLocations(const std::vector& scouted_items) { const std::string SlotName = ArchipelagoClient::GetInstance().GetSlotName(); nlohmann::json slotData = ArchipelagoClient::GetInstance().GetSlotData(); diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h index 415fc69bb..bd859565b 100644 --- a/soh/soh/Enhancements/randomizer/context.h +++ b/soh/soh/Enhancements/randomizer/context.h @@ -138,6 +138,7 @@ class Context { void ParseArchipelago(); void ParseArchipelagoOptions(); + void ParseArchipelagoTricks(); void ParseArchipelagoItemsLocations(const std::vector& slot_data); /**