mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-08-13 17:03:47 -04:00
Code Issues Projects Releases Wiki Activity

Fixed capacity on ammmo tracking

Browse Source
This commit is contained in:
PurpleHato 2022-09-03 21:57:58 +02:00
parent f69d9697e9
commit 377c030469
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View File

@ -249,7 +249,7 @@ ItemTrackerNumbers GetItemCurrentAndMax(ItemTrackerItem item) {
result.currentCapacity = 0; result.currentCapacity = 0;
result.maxCapacity = 0; result.maxCapacity = 0;
result.currentAmmo = 0; result.currentAmmo = 0;
switch (item.id) { switch (item.id) {
case ITEM_STICK: case ITEM_STICK:
result.currentCapacity = CUR_CAPACITY(UPG_STICKS); result.currentCapacity = CUR_CAPACITY(UPG_STICKS);
@ -393,17 +393,24 @@ void DrawItemCount(ItemTrackerItem item) {
break; break;
case ITEM_TRACKER_NUMBER_AMMO: case ITEM_TRACKER_NUMBER_AMMO:
{ {
std::string currentAndMaxString = std::to_string((int)currentAndMax.currentAmmo) + "/" + std::to_string((int)currentAndMax.maxCapacity); std::string currentAndMaxString = std::to_string((int)currentAndMax.currentAmmo) + "/" + std::to_string((int)currentAndMax.currentCapacity);
ImGui::SetCursorScreenPos(ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(currentAndMaxString.c_str()).x / 2), p.y - 14)); ImGui::SetCursorScreenPos(ImVec2(p.x + (iconSize / 2) - (ImGui::CalcTextSize(currentAndMaxString.c_str()).x / 2), p.y - 14));
if (currentAndMax.currentAmmo == 0) {
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(150, 150, 150, 255));
} else if (currentAndMax.currentAmmo == currentAndMax.currentCapacity) {
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 255, 0, 255));
} else {
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(255, 255, 255, 255));
}
ImGui::Text("%d/", (int)currentAndMax.currentAmmo); ImGui::Text("%d/", (int)currentAndMax.currentAmmo);
ImGui::PopStyleColor();
ImGui::SameLine(0, 0.0f); ImGui::SameLine(0, 0.0f);
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 255, 0, 255)); ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 255, 0, 255));
ImGui::Text("%d", (int)currentAndMax.maxCapacity); ImGui::Text("%d", (int)currentAndMax.currentCapacity);
ImGui::PopStyleColor(); ImGui::PopStyleColor();
} }
break; break;
} }
} }
} }