nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Reset tricks on AP parse

Browse Source
This commit is contained in:
aMannus
2025-10-21 19:10:28 +02:00
parent de5972d67b
commit a8379cc758
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
soh/soh/Enhancements/randomizer/context.cpp
View File

@@ -437,6 +437,7 @@ void Context::ParseArchipelago() {
ArchipelagoClient& apClient = ArchipelagoClient::GetInstance(); ArchipelagoClient& apClient = ArchipelagoClient::GetInstance();
ParseArchipelagoItemsLocations(apClient.GetScoutedItems()); ParseArchipelagoItemsLocations(apClient.GetScoutedItems());
ParseArchipelagoOptions(); ParseArchipelagoOptions();
ParseArchipelagoTricks();
mEntranceShuffler->UnshuffleAllEntrances(); mEntranceShuffler->UnshuffleAllEntrances();
mDungeons->ResetAllDungeons(); mDungeons->ResetAllDungeons();
mTrials->RemoveAllTrials(); mTrials->RemoveAllTrials();
@@ -750,6 +751,13 @@ void Context::ParseArchipelagoOptions() {
mOptions[RSK_SHUFFLE_TREES].Set(slotData["shuffle_trees"]); 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<ArchipelagoClient::ApItem>& scouted_items) { void Context::ParseArchipelagoItemsLocations(const std::vector<ArchipelagoClient::ApItem>& scouted_items) {
const std::string SlotName = ArchipelagoClient::GetInstance().GetSlotName(); const std::string SlotName = ArchipelagoClient::GetInstance().GetSlotName();
nlohmann::json slotData = ArchipelagoClient::GetInstance().GetSlotData(); nlohmann::json slotData = ArchipelagoClient::GetInstance().GetSlotData();

1
soh/soh/Enhancements/randomizer/context.h
View File

@@ -138,6 +138,7 @@ class Context {
void ParseArchipelago(); void ParseArchipelago();
void ParseArchipelagoOptions(); void ParseArchipelagoOptions();
void ParseArchipelagoTricks();
void ParseArchipelagoItemsLocations(const std::vector<ArchipelagoClient::ApItem>& slot_data); void ParseArchipelagoItemsLocations(const std::vector<ArchipelagoClient::ApItem>& slot_data);
/** /**