From 11bdd48f435bdf42700b58a36fa0f49c42769255 Mon Sep 17 00:00:00 2001
From: Anthony Stewart <anthony.l.stewart@outlook.com>
Date: Sat, 12 Apr 2025 12:28:59 -0500
Subject: [PATCH] Added Rando::Context::ParseTricksJson.

---
 soh/soh/Enhancements/randomizer/context.cpp  | 12 ++++++++++++
 soh/soh/Enhancements/randomizer/context.h    |  1 +
 soh/soh/Enhancements/randomizer/settings.cpp |  8 ++++++++
 soh/soh/Enhancements/randomizer/settings.h   |  8 ++++++++
 4 files changed, 29 insertions(+)

diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 4127ab21a..0149bbe3a 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -399,6 +399,7 @@ void Context::ParseSpoiler(const char* spoilerFileName) {
         Rando::Settings::GetInstance()->ParseJson(spoilerFileJson);
         ParseItemLocationsJson(spoilerFileJson);
         ParseHintJson(spoilerFileJson);
+        ParseTricksJson(spoilerFileJson);
         mEntranceShuffler->ParseJson(spoilerFileJson);
         mDungeons->ParseJson(spoilerFileJson);
         mTrials->ParseJson(spoilerFileJson);
@@ -467,6 +468,17 @@ void Context::ParseHintJson(nlohmann::json spoilerFileJson) {
     CreateStaticHints();
 }
 
+void Context::ParseTricksJson(nlohmann::json spoilerFileJson) {
+    nlohmann::json enabledTricksJson = spoilerFileJson["enabledTricks"];
+    const auto& settings = Rando::Settings::GetInstance();
+    for (auto it : enabledTricksJson) {
+        int rt = settings->GetRandomizerTrickByName(it);
+        if (rt != -1) {
+            mTrickOptions[rt].Set(RO_GENERIC_ON);
+        }
+    }
+}
+
 std::shared_ptr<EntranceShuffler> Context::GetEntranceShuffler() {
     return mEntranceShuffler;
 }
diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h
index 7f18f7a9d..a7e6a0047 100644
--- a/soh/soh/Enhancements/randomizer/context.h
+++ b/soh/soh/Enhancements/randomizer/context.h
@@ -110,6 +110,7 @@ class Context {
     void ParseItemLocationsJson(nlohmann::json spoilerFileJson);
     void WriteHintJson(nlohmann::ordered_json& spoilerFileJson);
     void ParseHintJson(nlohmann::json spoilerFileJson);
+    void ParseTricksJson(nlohmann::json spoilerFileJson);
     std::map<RandomizerCheck, ItemOverride> overrides = {};
     std::vector<std::vector<RandomizerCheck>> playthroughLocations = {};
     std::vector<RandomizerCheck> everyPossibleLocation = {};
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 6f3553261..ee3408474 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -1739,6 +1739,14 @@ TrickOption& Settings::GetTrickOption(const RandomizerTrick key) {
     return mTrickOptions[key];
 }
 
+int Settings::GetRandomizerTrickByName(const std::string& name) {
+    const auto& it = mTrickNameToEnum.find(name);
+    if (it == mTrickNameToEnum.end()) {
+        return -1;
+    }
+    return it->second;
+}
+
 void Context::ResetTrickOptions() {
     for (int count = 0; count < RT_MAX; count++) {
         mTrickOptions[count].Set(0); // RANDOTODO this can probably be done better
diff --git a/soh/soh/Enhancements/randomizer/settings.h b/soh/soh/Enhancements/randomizer/settings.h
index c820a9df9..c7f6e3893 100644
--- a/soh/soh/Enhancements/randomizer/settings.h
+++ b/soh/soh/Enhancements/randomizer/settings.h
@@ -50,6 +50,14 @@ class Settings {
      */
     TrickOption& GetTrickOption(RandomizerTrick key);
 
+    /**
+     * @brief Get the RandomizerTrick corresponding to the provided name.
+     * 
+     * @param name
+     * @return int RandomizerTrick index or -1 if not found
+     */
+    int GetRandomizerTrickByName(const std::string& name);
+
     /**
      * @brief Returns a reference to the entire array of options.
      *