phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-26 00:40:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Stabilize quest log details loading and turn-in item sync

Browse source
This commit is contained in:
Kelsi 2026-02-19 00:56:24 -08:00
parent 334d4d3df6
commit 4fcf869e34
5 changed files with 135 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/ui/game_screen.cpp
View file

@ -4532,6 +4532,23 @@ void GameScreen::renderQuestRequestItemsWindow(game::GameHandler& gameHandler) {
bool open = true;
const auto& quest = gameHandler.getQuestRequestItems();
auto countItemInInventory = [&](uint32_t itemId) -> uint32_t {
const auto& inv = gameHandler.getInventory();
uint32_t total = 0;
for (int i = 0; i < inv.getBackpackSize(); ++i) {
const auto& slot = inv.getBackpackSlot(i);
if (!slot.empty() && slot.item.itemId == itemId) total += slot.item.stackCount;
}
for (int bag = 0; bag < game::Inventory::NUM_BAG_SLOTS; ++bag) {
int bagSize = inv.getBagSize(bag);
for (int s = 0; s < bagSize; ++s) {
const auto& slot = inv.getBagSlot(bag, s);
if (!slot.empty() && slot.item.itemId == itemId) total += slot.item.stackCount;
}
}
return total;
};
std::string processedTitle = replaceGenderPlaceholders(quest.title, gameHandler);
if (ImGui::Begin(processedTitle.c_str(), &open, ImGuiWindowFlags_NoCollapse)) {
if (!quest.completionText.empty()) {
@ -4545,11 +4562,17 @@ void GameScreen::renderQuestRequestItemsWindow(game::GameHandler& gameHandler) {
ImGui::Separator();
ImGui::TextColored(ImVec4(1.0f, 0.82f, 0.0f, 1.0f), "Required Items:");
for (const auto& item : quest.requiredItems) {
uint32_t have = countItemInInventory(item.itemId);
bool enough = have >= item.count;
auto* info = gameHandler.getItemInfo(item.itemId);
if (info && info->valid)
ImGui::Text(" %s x%u", info->name.c_str(), item.count);
else
ImGui::Text(" Item %u x%u", item.itemId, item.count);
const char* name = (info && info->valid) ? info->name.c_str() : nullptr;
if (name && *name) {
ImGui::TextColored(enough ? ImVec4(0.6f, 1.0f, 0.6f, 1.0f) : ImVec4(1.0f, 0.6f, 0.6f, 1.0f),
" %s %u/%u", name, have, item.count);
} else {
ImGui::TextColored(enough ? ImVec4(0.6f, 1.0f, 0.6f, 1.0f) : ImVec4(1.0f, 0.6f, 0.6f, 1.0f),
" Item %u %u/%u", item.itemId, have, item.count);
}
}
}
@ -4566,19 +4589,17 @@ void GameScreen::renderQuestRequestItemsWindow(game::GameHandler& gameHandler) {
ImGui::Separator();
ImGui::Spacing();
float buttonW = (ImGui::GetContentRegionAvail().x - ImGui::GetStyle().ItemSpacing.x) * 0.5f;
if (quest.isCompletable()) {
if (ImGui::Button("Complete Quest", ImVec2(buttonW, 0))) {
gameHandler.completeQuest();
}
} else {
ImGui::BeginDisabled();
ImGui::Button("Incomplete", ImVec2(buttonW, 0));
ImGui::EndDisabled();
if (ImGui::Button("Complete Quest", ImVec2(buttonW, 0))) {
gameHandler.completeQuest();
}
ImGui::SameLine();
if (ImGui::Button("Cancel", ImVec2(buttonW, 0))) {
gameHandler.closeQuestRequestItems();
}
if (!quest.isCompletable()) {
ImGui::TextDisabled("Server flagged this quest as incomplete; completion will be server-validated.");
}
}
ImGui::End();

29
src/ui/quest_log_screen.cpp
View file

@ -284,11 +284,14 @@ void QuestLogScreen::render(game::GameHandler& gameHandler) {
if (clicked) {
selectedIndex = static_cast<int>(i);
if (q.objectives.empty()) {
if (gameHandler.requestQuestQuery(q.questId)) {
if (!questDetailQueryNoResponse_.count(q.questId) &&
gameHandler.requestQuestQuery(q.questId)) {
lastDetailRequestQuestId_ = q.questId;
lastDetailRequestAt_ = ImGui::GetTime();
}
} else if (lastDetailRequestQuestId_ == q.questId) {
lastDetailRequestQuestId_ = 0;
questDetailQueryNoResponse_.erase(q.questId);
}
}
ImGui::PopID();
@ -310,23 +313,37 @@ void QuestLogScreen::render(game::GameHandler& gameHandler) {
ImGui::Separator();
if (sel.objectives.empty()) {
if (lastDetailRequestQuestId_ != sel.questId) {
if (gameHandler.requestQuestQuery(sel.questId)) {
lastDetailRequestQuestId_ = sel.questId;
}
bool noResponse = questDetailQueryNoResponse_.count(sel.questId) > 0;
bool pending = noResponse ? false : gameHandler.isQuestQueryPending(sel.questId);
const bool requestTimedOut =
(lastDetailRequestQuestId_ == sel.questId) &&
((ImGui::GetTime() - lastDetailRequestAt_) > 5.0);
if (lastDetailRequestQuestId_ == sel.questId && !pending) {
lastDetailRequestQuestId_ = 0;
questDetailQueryNoResponse_.erase(sel.questId);
} else if (requestTimedOut) {
lastDetailRequestQuestId_ = 0;
pending = false;
questDetailQueryNoResponse_.insert(sel.questId);
noResponse = true;
gameHandler.clearQuestQueryPending(sel.questId);
}
if (lastDetailRequestQuestId_ == sel.questId) {
if (pending) {
ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.8f, 1.0f), "Loading quest details...");
} else {
ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.8f, 1.0f), "Quest summary not available yet.");
}
if (ImGui::Button("Retry Details")) {
questDetailQueryNoResponse_.erase(sel.questId);
gameHandler.clearQuestQueryPending(sel.questId);
if (gameHandler.requestQuestQuery(sel.questId, true)) {
lastDetailRequestQuestId_ = sel.questId;
lastDetailRequestAt_ = ImGui::GetTime();
}
}
} else {
if (lastDetailRequestQuestId_ == sel.questId) lastDetailRequestQuestId_ = 0;
questDetailQueryNoResponse_.erase(sel.questId);
ImGui::TextColored(ImVec4(0.82f, 0.9f, 1.0f, 1.0f), "Summary");
std::string processedObjectives = replaceGenderPlaceholders(sel.objectives, gameHandler);
float textHeight = ImGui::GetContentRegionAvail().y * 0.45f;