diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp index ac4bcfdd65..ed26e90783 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp @@ -239,12 +239,17 @@ std::unordered_map equipTrackerMap = { ITEM_TRACKER_MAP_ENTRY(ITEM_BOOTS_HOVER, 14), }; +bool IsValidSaveFile() { + bool validSave = gSaveContext.fileNum >= 0 && gSaveContext.fileNum <= 2; + return validSave; +} + void DrawEquip(uint32_t itemId) { const ItemTrackerMapEntry& entry = equipTrackerMap[itemId]; bool hasEquip = (entry.bitMask & gSaveContext.inventory.equipment) != 0; int iconSize = CVar_GetS32("gRandoTrackIconSize", 0); - ImGui::Image(SohImGui::GetTextureByName(hasEquip ? entry.name : entry.nameFaded), ImVec2(iconSize, iconSize), - ImVec2(0, 0), ImVec2(1, 1)); + ImGui::Image(SohImGui::GetTextureByName(hasEquip && IsValidSaveFile() ? entry.name : entry.nameFaded), + ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1)); SetLastItemHoverText(SohUtils::GetItemName(entry.id)); } @@ -264,8 +269,8 @@ void DrawQuest(uint32_t itemId) { bool hasQuestItem = (entry.bitMask & gSaveContext.inventory.questItems) != 0; int iconSize = CVar_GetS32("gRandoTrackIconSize", 0); ImGui::BeginGroup(); - ImGui::Image(SohImGui::GetTextureByName(hasQuestItem ? entry.name : entry.nameFaded), ImVec2(iconSize, iconSize), - ImVec2(0, 0), ImVec2(1, 1)); + ImGui::Image(SohImGui::GetTextureByName(hasQuestItem && IsValidSaveFile() ? entry.name : entry.nameFaded), + ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1)); ImVec2 p = ImGui::GetCursorScreenPos(); int estimatedTextWidth = 10; @@ -447,18 +452,29 @@ void DrawItem(uint32_t itemId) { } } - const ItemTrackerMapEntry& entry = itemTrackerMap[hasItem ? actualItemId : itemId]; + const ItemTrackerMapEntry& entry = itemTrackerMap[hasItem && IsValidSaveFile() ? actualItemId : itemId]; int iconSize = CVar_GetS32("gRandoTrackIconSize", 0); ImGui::BeginGroup(); - ImGui::Image(SohImGui::GetTextureByName(hasItem ? entry.name : entry.nameFaded), ImVec2(iconSize, iconSize), - ImVec2(0, 0), ImVec2(1, 1)); + ImGui::Image(SohImGui::GetTextureByName(hasItem && IsValidSaveFile() ? entry.name : entry.nameFaded), + ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1)); ImVec2 p = ImGui::GetCursorScreenPos(); int estimatedTextWidth = 10; int estimatedTextHeight = 10; ImGui::SetCursorScreenPos(ImVec2(p.x - 5 + (iconSize / 2) - estimatedTextWidth, p.y - estimatedTextHeight)); - switch (actualItemId) { + if (IsValidSaveFile()) { + DrawItemAmmo(actualItemId); + } else { + ImGui::Text(" "); + } + ImGui::EndGroup(); + + SetLastItemHoverText(SohUtils::GetItemName(entry.id)); +} + +void DrawItemAmmo(int itemId) { + switch (itemId) { case ITEM_STICK: if (CVar_GetS32("gItemTrackerAmmoDisplay", 0) == 1) { if (AMMO(ITEM_STICK) == CUR_CAPACITY(UPG_STICKS)) { @@ -667,18 +683,15 @@ void DrawItem(uint32_t itemId) { ImGui::Text(" "); break; } - ImGui::EndGroup(); - - SetLastItemHoverText(SohUtils::GetItemName(entry.id)); } void DrawBottle(uint32_t itemId, uint32_t bottleSlot) { uint32_t actualItemId = gSaveContext.inventory.items[SLOT(itemId) + bottleSlot]; bool hasItem = actualItemId != ITEM_NONE; - const ItemTrackerMapEntry& entry = itemTrackerMap[hasItem ? actualItemId : itemId]; + const ItemTrackerMapEntry& entry = itemTrackerMap[hasItem && IsValidSaveFile() ? actualItemId : itemId]; int iconSize = CVar_GetS32("gRandoTrackIconSize", 0); - ImGui::Image(SohImGui::GetTextureByName(hasItem ? entry.name : entry.nameFaded), ImVec2(iconSize, iconSize), - ImVec2(0, 0), ImVec2(1, 1)); + ImGui::Image(SohImGui::GetTextureByName(hasItem && IsValidSaveFile() ? entry.name : entry.nameFaded), + ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1)); SetLastItemHoverText(SohUtils::GetItemName(entry.id)); }; @@ -691,12 +704,12 @@ void DrawDungeonItem(uint32_t itemId, uint32_t scene) { bool hasSmallKey = (gSaveContext.inventory.dungeonKeys[scene]) >= 0; ImGui::BeginGroup(); if (itemId == ITEM_KEY_SMALL) { - ImGui::Image(SohImGui::GetTextureByName(hasSmallKey ? entry.name : entry.nameFaded), ImVec2(iconSize, iconSize), - ImVec2(0, 0), ImVec2(1, 1)); + ImGui::Image(SohImGui::GetTextureByName(hasSmallKey && IsValidSaveFile() ? entry.name : entry.nameFaded), + ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1)); } else { - ImGui::Image(SohImGui::GetTextureByName(hasItem ? entry.name : entry.nameFaded), ImVec2(iconSize, iconSize), - ImVec2(0, 0), ImVec2(1, 1)); + ImGui::Image(SohImGui::GetTextureByName(hasItem && IsValidSaveFile() ? entry.name : entry.nameFaded), + ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1)); } ImVec2 p = ImGui::GetCursorScreenPos(); @@ -705,7 +718,7 @@ void DrawDungeonItem(uint32_t itemId, uint32_t scene) { ImGui::SetCursorScreenPos(ImVec2(p.x - 5 + (iconSize / 2) - estimatedTextWidth, p.y - estimatedTextHeight)); if (itemId == ITEM_KEY_SMALL) { // This check there for small key is necessary to get the text position properly and can't be on the same ITEM_KEY chack from the top - if (gSaveContext.inventory.dungeonKeys[scene] <= 0) { + if (gSaveContext.inventory.dungeonKeys[scene] <= 0 || !IsValidSaveFile()) { ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(155, 155, 155, 255)); ImGui::Text("0"); ImGui::PopStyleColor(); @@ -763,7 +776,7 @@ std::unordered_map> upgradeTracker void DrawUpgrade(int32_t categoryId) { int iconSize = CVar_GetS32("gRandoTrackIconSize", 0); - if (CUR_UPG_VALUE(categoryId) == 0) { + if (CUR_UPG_VALUE(categoryId) == 0 || !IsValidSaveFile()) { const ItemTrackerUpgradeEntry& entry = upgradeTrackerMap[categoryId][0]; ImGui::Image(SohImGui::GetTextureByName(entry.nameFaded), ImVec2(iconSize, iconSize), ImVec2(0, 0), ImVec2(1, 1)); @@ -822,8 +835,8 @@ void DrawSong(int32_t songId) { CVar_GetS32("gItemTrackeSongColor", 0) ? songTrackerMap[songId] : vanillaSongTrackerMap[songId]; uint32_t bitMask = 1 << entry.id; bool hasSong = (bitMask & gSaveContext.inventory.questItems) != 0; - ImGui::Image(SohImGui::GetTextureByName(hasSong ? entry.name : entry.nameFaded), ImVec2(iconSize / 1.5, iconSize), - ImVec2(0, 0), ImVec2(1, 1)); + ImGui::Image(SohImGui::GetTextureByName(hasSong && IsValidSaveFile() ? entry.name : entry.nameFaded), + ImVec2(iconSize / 1.5, iconSize), ImVec2(0, 0), ImVec2(1, 1)); SetLastItemHoverText(SohUtils::GetQuestItemName(entry.id)); } @@ -1280,7 +1293,7 @@ void DrawFloatingDungeons(int Icon_Cells_Size, int Icon_Spacing) { DrawDungeonItem(ITEM_KEY_SMALL, SCENE_HAKADAN); ImGui::SameLine(Icon_Cells_Size * 5); ImGui::SetCursorPosX(ImGui::GetCursorPosX() + Icon_Spacing * 5); - DrawDungeonItem(ITEM_KEY_SMALL, SCENE_GANON); + DrawDungeonItem(ITEM_KEY_SMALL, SCENE_GANONTIKA); ImGui::EndGroup(); // BOSS KEYS FOR FOREST TO GANON ImGui::BeginGroup(); @@ -1347,7 +1360,7 @@ void DrawFloatingDungeons(int Icon_Cells_Size, int Icon_Spacing) { DrawDungeonItem(ITEM_KEY_SMALL, SCENE_MEN); ImGui::SameLine(Icon_Cells_Size * 5); ImGui::SetCursorPosX(ImGui::GetCursorPosX() + Icon_Spacing * 5); - DrawDungeonItem(ITEM_KEY_SMALL, SCENE_GANON); + DrawDungeonItem(ITEM_KEY_SMALL, SCENE_GANONTIKA); ImGui::EndGroup(); ImGui::BeginGroup(); DrawDungeonItem(ITEM_COMPASS, SCENE_JYASINZOU); @@ -1362,7 +1375,7 @@ void DrawFloatingDungeons(int Icon_Cells_Size, int Icon_Spacing) { DrawDungeonItem(ITEM_COMPASS, SCENE_ICE_DOUKUTO); ImGui::SameLine(Icon_Cells_Size * 5); ImGui::SetCursorPosX(ImGui::GetCursorPosX() + Icon_Spacing * 5); - DrawDungeonItem(ITEM_KEY_BOSS, SCENE_GANONTIKA); + DrawDungeonItem(ITEM_KEY_BOSS, SCENE_GANON); ImGui::EndGroup(); } ImGui::BeginGroup(); @@ -1577,6 +1590,10 @@ void DrawItemTrackerOptions(bool& open) { ImGui::Text("Chroma Key"); auto flags = ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaBar | ImGuiColorEditFlags_NoLabel; ImGui::ColorEdit4("Chroma Key Selection", (float*)&ChromaKeyBackground, flags); + CVar_SetFloat("gItemTrackerBgColorR", ChromaKeyBackground.x); + CVar_SetFloat("gItemTrackerBgColorG", ChromaKeyBackground.y); + CVar_SetFloat("gItemTrackerBgColorB", ChromaKeyBackground.z); + CVar_SetFloat("gItemTrackerBgColorA", ChromaKeyBackground.w); const char* ItemsTrackerTheme[3] = { "One Block", "Grouped style n.1", "Grouped style n.2" }; ImGui::Text("Using theme :"); @@ -1653,4 +1670,14 @@ void InitItemTracker() { CVar_RegisterS32("gRandoTrackIconSize", 32); SohImGui::AddWindow("Randomizer", "Item Tracker", DrawItemTracker); SohImGui::AddWindow("Randomizer", "Item Tracker Settings", DrawItemTrackerOptions); + float trackerBgR = CVar_GetFloat("gItemTrackerBgColorR", 0); + float trackerBgG = CVar_GetFloat("gItemTrackerBgColorG", 0); + float trackerBgB = CVar_GetFloat("gItemTrackerBgColorB", 0); + float trackerBgA = CVar_GetFloat("gItemTrackerBgColorA", 1); + ChromaKeyBackground = { + trackerBgR, + trackerBgG, + trackerBgB, + trackerBgA + }; // Float value, 1 = 255 in rgb value. } diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h index b67a939fb8..1397c3d589 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h @@ -1,4 +1,5 @@ #pragma once void InitItemTracker(); -void DrawItemTracker(bool& open); \ No newline at end of file +void DrawItemTracker(bool& open); +void DrawItemAmmo(int itemId);