Change clientVersion and add support triforce pieces

garrettjoecox · Jul 12, 2023 · 431ce50 · 431ce50
1 parent 5871cbe
commit 431ce50
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Anchor.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Anchor.cpp
@@ -158,6 +158,7 @@ void to_json(json& j, const SaveContext& saveContext) {
         {"inventory", saveContext.inventory},
         {"sohStats", saveContext.sohStats},
         {"adultTradeItems", saveContext.adultTradeItems},
+        {"triforcePiecesCollected", saveContext.triforcePiecesCollected},
     };
 }
 
@@ -179,11 +180,12 @@ void from_json(const json& j, SaveContext& saveContext) {
     j.at("inventory").get_to(saveContext.inventory);
     j.at("sohStats").get_to(saveContext.sohStats);
     j.at("adultTradeItems").get_to(saveContext.adultTradeItems);
+    j.contains("triforcePiecesCollected") ? j.at("triforcePiecesCollected").get_to(saveContext.triforcePiecesCollected) : gSaveContext.triforcePiecesCollected;
 }
 
 std::map<uint32_t, AnchorClient> GameInteractorAnchor::AnchorClients = {};
 std::vector<uint32_t> GameInteractorAnchor::FairyIndexToClientId = {};
-std::string GameInteractorAnchor::clientVersion = "Anchor Build 7";
+std::string GameInteractorAnchor::clientVersion = "Anchor + Triforce Hunt 2";
 std::string GameInteractorAnchor::seed = "00000";
 std::vector<std::pair<uint16_t, int16_t>> receivedItems = {};
 std::vector<AnchorMessage> anchorMessages = {};

diff --git a/soh/soh/util.cpp b/soh/soh/util.cpp
@@ -471,6 +471,7 @@ std::vector<std::string> randomizerItemNames = {
     "Buy Red Potion (40)",
     "Buy Red Potion (50)",
     "Triforce",
+    "Triforce Piece",
     "Hint",
     "Tycoon Wallet"
 };
@@ -629,7 +630,8 @@ std::map<uint32_t, const char*> itemIcons = {
     ITEM_ICON(ITEM_DUNGEON_MAP),
     ITEM_ICON(ITEM_KEY_SMALL),
     ITEM_ICON(ITEM_MAGIC_SMALL),
-    ITEM_ICON(ITEM_MAGIC_LARGE)
+    ITEM_ICON(ITEM_MAGIC_LARGE),
+    ITEM_ICON(ITEM_TRIFORCE_PIECE),
 };
 
 std::map<int32_t, int32_t> randomizerGetToItemIdIcon = {
@@ -825,6 +827,7 @@ std::map<int32_t, int32_t> randomizerGetToItemIdIcon = {
     { RG_BUY_RED_POTION_40, ITEM_POTION_RED },
     { RG_BUY_RED_POTION_50, ITEM_POTION_RED },
     { RG_TYCOON_WALLET, ITEM_WALLET_GIANT },
+    { RG_TRIFORCE_PIECE, ITEM_TRIFORCE_PIECE },
 };
 
 int32_t SohUtils::GetItemIdIconFromRandomizerGet(int32_t randomizerGet) {