From 954a96baeb9f25c80e1b9fd77ca57b7fac8f8f77 Mon Sep 17 00:00:00 2001 From: aMannus Date: Thu, 25 Aug 2022 10:27:04 +0200 Subject: [PATCH 1/3] tha fix --- soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp index fc8a55a3a..d8e805348 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp @@ -605,7 +605,11 @@ std::vector GetDungeonItemsVector(std::vector i) { switch (dungeons[j].items[i]) { case ITEM_KEY_SMALL: - dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_KEY_SMALL, dungeons[j].id, DrawDungeonItem)); + if (dungeons[j].id == SCENE_GANON) { + dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_KEY_SMALL, SCENE_GANONTIKA, DrawDungeonItem)); + } else { + dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_KEY_SMALL, dungeons[j].id, DrawDungeonItem)); + } break; case ITEM_KEY_BOSS: dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_KEY_BOSS, dungeons[j].id, DrawDungeonItem)); From 6fd22f50abe6fa0a0c4da89c8bcd5fd7e9e033b6 Mon Sep 17 00:00:00 2001 From: aMannus Date: Thu, 25 Aug 2022 10:35:04 +0200 Subject: [PATCH 2/3] Swapped logic to boss key --- .../randomizer/randomizer_item_tracker.cpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp index d8e805348..48494d0f7 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp @@ -85,7 +85,7 @@ std::vector itemTrackerDungeonsWithMapsHorizontal = { { SCENE_MIZUSIN, { ITEM_KEY_SMALL, ITEM_KEY_BOSS, ITEM_DUNGEON_MAP, ITEM_COMPASS } }, { SCENE_JYASINZOU, { ITEM_KEY_SMALL, ITEM_KEY_BOSS, ITEM_DUNGEON_MAP, ITEM_COMPASS } }, { SCENE_HAKADAN, { ITEM_KEY_SMALL, ITEM_KEY_BOSS, ITEM_DUNGEON_MAP, ITEM_COMPASS } }, - { SCENE_GANON, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, + { SCENE_GANONTIKA, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, { SCENE_HAKADANCH, { ITEM_KEY_SMALL, ITEM_DUNGEON_MAP, ITEM_COMPASS } }, { SCENE_ICE_DOUKUTO, { ITEM_DUNGEON_MAP, ITEM_COMPASS } }, { SCENE_MEN, { ITEM_KEY_SMALL } }, @@ -97,7 +97,7 @@ std::vector itemTrackerDungeonsHorizontal = { { SCENE_MIZUSIN, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, { SCENE_JYASINZOU, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, { SCENE_HAKADAN, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, - { SCENE_GANON, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, + { SCENE_GANONTIKA, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, { SCENE_HAKADANCH, { ITEM_KEY_SMALL } }, { SCENE_MEN, { ITEM_KEY_SMALL } }, }; @@ -114,7 +114,7 @@ std::vector itemTrackerDungeonsWithMapsCompact = { { SCENE_DDAN, { ITEM_DUNGEON_MAP, ITEM_COMPASS } }, { SCENE_BDAN, { ITEM_DUNGEON_MAP, ITEM_COMPASS } }, { SCENE_ICE_DOUKUTO, { ITEM_DUNGEON_MAP, ITEM_COMPASS } }, - { SCENE_GANON, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, + { SCENE_GANONTIKA, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, { SCENE_MEN, { ITEM_KEY_SMALL } }, }; @@ -124,7 +124,7 @@ std::vector itemTrackerDungeonsCompact = { { SCENE_MIZUSIN, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, { SCENE_JYASINZOU, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, { SCENE_HAKADAN, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, - { SCENE_GANON, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, + { SCENE_GANONTIKA, { ITEM_KEY_SMALL, ITEM_KEY_BOSS } }, { SCENE_HAKADANCH, { ITEM_KEY_SMALL } }, { SCENE_MEN, { ITEM_KEY_SMALL } }, { SCENE_GERUDOWAY, { ITEM_KEY_SMALL } }, @@ -141,7 +141,7 @@ std::map itemTrackerDungeonShortNames = { { SCENE_DDAN, "DCVN" }, { SCENE_BDAN, "JABU" }, { SCENE_ICE_DOUKUTO, "ICE" }, - { SCENE_GANON, "GANON" }, + { SCENE_GANONTIKA, "GANON" }, { SCENE_MEN, "GTG" }, { SCENE_GERUDOWAY, "HIDE" }, }; @@ -288,7 +288,7 @@ ImVec2 GetItemCurrentAndMax(ItemTrackerItem item) { case SCENE_HAKADANCH: result.y = 3; break; - case SCENE_GANON: + case SCENE_GANONTIKA: result.y = 2; break; case SCENE_MEN: @@ -605,14 +605,14 @@ std::vector GetDungeonItemsVector(std::vector i) { switch (dungeons[j].items[i]) { case ITEM_KEY_SMALL: - if (dungeons[j].id == SCENE_GANON) { - dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_KEY_SMALL, SCENE_GANONTIKA, DrawDungeonItem)); - } else { - dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_KEY_SMALL, dungeons[j].id, DrawDungeonItem)); - } + dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_KEY_SMALL, dungeons[j].id, DrawDungeonItem)); break; case ITEM_KEY_BOSS: - dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_KEY_BOSS, dungeons[j].id, DrawDungeonItem)); + if (dungeons[j].id == SCENE_GANONTIKA) { + dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_KEY_BOSS, SCENE_GANON, DrawDungeonItem)); + } else { + dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_KEY_BOSS, dungeons[j].id, DrawDungeonItem)); + } break; case ITEM_DUNGEON_MAP: dungeonItems.push_back(ITEM_TRACKER_ITEM(ITEM_DUNGEON_MAP, dungeons[j].id, DrawDungeonItem)); From c41de36c46eab2f443b9f34b8a719484132d6b62 Mon Sep 17 00:00:00 2001 From: aMannus Date: Thu, 25 Aug 2022 10:36:28 +0200 Subject: [PATCH 3/3] Comment --- soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp index 48494d0f7..8cede9a66 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp @@ -608,6 +608,7 @@ std::vector GetDungeonItemsVector(std::vector