Browse Source
- Add repair buttons (including “Repair All”) with proper alignment, tooltips, and cursor hit areas - Improve controller support: - Fix grid snapping and cursor positioning across panels - Allow pressing/releasing UI buttons - Fix item selling and movement between panels (inventory, belt, store) - Prevent invalid interactions: - Disable tab/repair navigation while holding items - Hide unavailable options for non-Smith vendors - Fix UI issues: - Item misalignment and snapping - Floating gold cost display - Level-up button overlapping store panel - Fix vendor-specific issues: - Correct tooltip for non-Smith vendors - Clean up Adria dialog options - Fix stability issues: - Resolve segfault when selling items - Refactor and cleanup: - Unify store sell logic - Remove unused and stale code - Improve IsPlayerInStore() logic - General bug fixes and UI interaction improvements --------- Co-authored-by: Yuri Pourre <yuripourre@users.noreply.github.com>pull/8373/merge
Scott Richmond
21 hours ago
committed by
GitHub
21 changed files with 1675 additions and 132 deletions
@ -0,0 +1,826 @@
|
||||
/**
|
||||
* @file qol/visual_store.cpp |
||||
* |
||||
* Implementation of visual grid-based store UI. |
||||
*/ |
||||
#include "qol/visual_store.h" |
||||
|
||||
#include <algorithm> |
||||
#include <cstdint> |
||||
#include <span> |
||||
|
||||
#include "control/control.hpp" |
||||
#include "controls/plrctrls.h" |
||||
#include "cursor.h" |
||||
#include "engine/clx_sprite.hpp" |
||||
#include "engine/load_clx.hpp" |
||||
#include "engine/points_in_rectangle_range.hpp" |
||||
#include "engine/rectangle.hpp" |
||||
#include "engine/render/clx_render.hpp" |
||||
#include "engine/render/text_render.hpp" |
||||
#include "engine/size.hpp" |
||||
#include "game_mode.hpp" |
||||
#include "headless_mode.hpp" |
||||
#include "inv.h" |
||||
#include "items.h" |
||||
#include "minitext.h" |
||||
#include "options.h" |
||||
#include "panels/info_box.hpp" |
||||
#include "panels/ui_panels.hpp" |
||||
#include "player.h" |
||||
#include "qol/stash.h" |
||||
#include "spells.h" |
||||
#include "stores.h" |
||||
#include "utils/format_int.hpp" |
||||
#include "utils/language.h" |
||||
#include "utils/str_cat.hpp" |
||||
|
||||
namespace devilution { |
||||
|
||||
bool IsVisualStoreOpen; |
||||
VisualStoreState VisualStore; |
||||
int16_t pcursstoreitem = -1; |
||||
int16_t pcursstorebtn = -1; |
||||
|
||||
namespace { |
||||
|
||||
OptionalOwnedClxSpriteList VisualStorePanelArt; |
||||
OptionalOwnedClxSpriteList VisualStoreNavButtonArt; |
||||
OptionalOwnedClxSpriteList VisualStoreRepairAllButtonArt; |
||||
OptionalOwnedClxSpriteList VisualStoreRepairButtonArt; |
||||
|
||||
int VisualStoreButtonPressed = -1; |
||||
|
||||
constexpr Size ButtonSize { 27, 16 }; |
||||
|
||||
/** Contains mappings for the buttons in the visual store (tabs, repair) */ |
||||
constexpr Rectangle VisualStoreButtonRect[] = { |
||||
// Tab buttons (Smith only) - positioned below title
|
||||
{ { 14, 21 }, { 72, 22 } }, // Basic tab
|
||||
{ { 14 + 73, 21 }, { 72, 22 } }, // Premium tab
|
||||
{ { 233, 315 }, { 48, 24 } }, // Repair All Btn
|
||||
{ { 286, 315 }, { 24, 24 } }, // Repair Btn
|
||||
}; |
||||
|
||||
constexpr int TabButtonBasic = 0; |
||||
constexpr int TabButtonPremium = 1; |
||||
constexpr int RepairAllBtn = 2; |
||||
constexpr int RepairBtn = 3; |
||||
|
||||
/** @brief Get the items array for a specific vendor/tab combination. */ |
||||
std::span<Item> GetVendorItems(VisualStoreVendor vendor, VisualStoreTab tab) |
||||
{ |
||||
switch (vendor) { |
||||
case VisualStoreVendor::Smith: { |
||||
if (tab == VisualStoreTab::Premium) { |
||||
return { PremiumItems.data(), static_cast<size_t>(PremiumItems.size()) }; |
||||
} |
||||
return { SmithItems.data(), static_cast<size_t>(SmithItems.size()) }; |
||||
} |
||||
case VisualStoreVendor::Witch: { |
||||
return { WitchItems.data(), static_cast<size_t>(WitchItems.size()) }; |
||||
} |
||||
case VisualStoreVendor::Healer: { |
||||
return { HealerItems.data(), static_cast<size_t>(HealerItems.size()) }; |
||||
} |
||||
case VisualStoreVendor::Boy: { |
||||
if (BoyItem.isEmpty()) { |
||||
return {}; |
||||
} |
||||
return { &BoyItem, 1 }; |
||||
} |
||||
} |
||||
return {}; |
||||
} |
||||
|
||||
/** @brief Check if the current vendor has tabs (Smith only). */ |
||||
bool VendorHasTabs() |
||||
{ |
||||
return VisualStore.vendor == VisualStoreVendor::Smith; |
||||
} |
||||
|
||||
/** @brief Check if the current vendor accepts items for sale. */ |
||||
bool VendorAcceptsSale() |
||||
{ |
||||
switch (VisualStore.vendor) { |
||||
case VisualStoreVendor::Smith: |
||||
case VisualStoreVendor::Witch: { |
||||
return true; |
||||
} |
||||
case VisualStoreVendor::Healer: |
||||
case VisualStoreVendor::Boy: { |
||||
return false; |
||||
} |
||||
} |
||||
return false; |
||||
} |
||||
|
||||
/** @brief Calculate the sell price for an item (1/4 of value). */ |
||||
int GetSellPrice(const Item &item) |
||||
{ |
||||
int value = item._ivalue; |
||||
if (item._iMagical != ITEM_QUALITY_NORMAL && item._iIdentified) |
||||
value = item._iIvalue; |
||||
return std::max(value / 4, 1); |
||||
} |
||||
|
||||
/** @brief Rebuild the grid layout for the current vendor/tab. */ |
||||
void RefreshVisualStoreLayout() |
||||
{ |
||||
VisualStore.pages.clear(); |
||||
std::span<Item> items = GetVisualStoreItems(); |
||||
|
||||
if (items.empty()) { |
||||
VisualStore.pages.emplace_back(); |
||||
VisualStorePage &page = VisualStore.pages.back(); |
||||
memset(page.grid, 0, sizeof(page.grid)); |
||||
return; |
||||
} |
||||
|
||||
auto createNewPage = [&]() -> VisualStorePage & { |
||||
VisualStore.pages.emplace_back(); |
||||
VisualStorePage &page = VisualStore.pages.back(); |
||||
memset(page.grid, 0, sizeof(page.grid)); |
||||
return page; |
||||
}; |
||||
|
||||
VisualStorePage *currentPage = &createNewPage(); |
||||
|
||||
for (uint16_t i = 0; i < static_cast<uint16_t>(items.size()); i++) { |
||||
const Item &item = items[i]; |
||||
if (item.isEmpty()) |
||||
continue; |
||||
|
||||
const Size itemSize = GetInventorySize(item); |
||||
bool placed = false; |
||||
|
||||
// Try to place in current page
|
||||
for (auto stashPosition : PointsInRectangle(Rectangle { { 0, 0 }, Size { VisualStoreGridWidth - (itemSize.width - 1), VisualStoreGridHeight - (itemSize.height - 1) } })) { |
||||
bool isSpaceFree = true; |
||||
for (auto itemPoint : PointsInRectangle(Rectangle { stashPosition, itemSize })) { |
||||
if (currentPage->grid[itemPoint.x][itemPoint.y] != 0) { |
||||
isSpaceFree = false; |
||||
break; |
||||
} |
||||
} |
||||
|
||||
if (isSpaceFree) { |
||||
for (auto itemPoint : PointsInRectangle(Rectangle { stashPosition, itemSize })) { |
||||
currentPage->grid[itemPoint.x][itemPoint.y] = i + 1; |
||||
} |
||||
currentPage->items.push_back({ i, stashPosition + Displacement { 0, itemSize.height - 1 } }); |
||||
placed = true; |
||||
break; |
||||
} |
||||
} |
||||
|
||||
if (!placed) { |
||||
// Start new page
|
||||
currentPage = &createNewPage(); |
||||
// Try placing again in new page
|
||||
for (auto stashPosition : PointsInRectangle(Rectangle { { 0, 0 }, Size { VisualStoreGridWidth - (itemSize.width - 1), VisualStoreGridHeight - (itemSize.height - 1) } })) { |
||||
bool isSpaceFree = true; |
||||
for (auto itemPoint : PointsInRectangle(Rectangle { stashPosition, itemSize })) { |
||||
if (currentPage->grid[itemPoint.x][itemPoint.y] != 0) { |
||||
isSpaceFree = false; |
||||
break; |
||||
} |
||||
} |
||||
|
||||
if (isSpaceFree) { |
||||
for (auto itemPoint : PointsInRectangle(Rectangle { stashPosition, itemSize })) { |
||||
currentPage->grid[itemPoint.x][itemPoint.y] = i + 1; |
||||
} |
||||
currentPage->items.push_back({ i, stashPosition + Displacement { 0, itemSize.height - 1 } }); |
||||
placed = true; |
||||
break; |
||||
} |
||||
} |
||||
} |
||||
} |
||||
|
||||
if (VisualStore.currentPage >= VisualStore.pages.size()) |
||||
VisualStore.currentPage = VisualStore.pages.empty() ? 0 : static_cast<unsigned>(VisualStore.pages.size() - 1); |
||||
} |
||||
|
||||
} // namespace
|
||||
|
||||
void InitVisualStore() |
||||
{ |
||||
if (HeadlessMode) |
||||
return; |
||||
|
||||
VisualStorePanelArt = LoadClx("data\\store.clx"); |
||||
VisualStoreNavButtonArt = LoadClx("data\\tabBtnUp.clx"); |
||||
VisualStoreRepairAllButtonArt = LoadClx("data\\repairAllBtn.clx"); |
||||
VisualStoreRepairButtonArt = LoadClx("data\\repairSingleBtn.clx"); |
||||
} |
||||
|
||||
void FreeVisualStoreGFX() |
||||
{ |
||||
VisualStoreNavButtonArt = std::nullopt; |
||||
VisualStorePanelArt = std::nullopt; |
||||
VisualStoreRepairAllButtonArt = std::nullopt; |
||||
VisualStoreRepairButtonArt = std::nullopt; |
||||
} |
||||
|
||||
void OpenVisualStore(VisualStoreVendor vendor) |
||||
{ |
||||
IsVisualStoreOpen = true; |
||||
invflag = true; // Open inventory panel alongside
|
||||
|
||||
VisualStore.vendor = vendor; |
||||
VisualStore.activeTab = VisualStoreTab::Basic; |
||||
VisualStore.currentPage = 0; |
||||
|
||||
pcursstoreitem = -1; |
||||
pcursstorebtn = -1; |
||||
|
||||
// Refresh item stat flags for current player
|
||||
std::span<Item> items = GetVisualStoreItems(); |
||||
for (Item &item : items) { |
||||
item._iStatFlag = MyPlayer->CanUseItem(item); |
||||
} |
||||
|
||||
RefreshVisualStoreLayout(); |
||||
|
||||
// Initialize controller focus to the visual store grid
|
||||
FocusOnVisualStore(); |
||||
} |
||||
|
||||
void CloseVisualStore() |
||||
{ |
||||
if (IsVisualStoreOpen) { |
||||
IsVisualStoreOpen = false; |
||||
invflag = false; |
||||
pcursstoreitem = -1; |
||||
pcursstorebtn = -1; |
||||
VisualStoreButtonPressed = -1; |
||||
VisualStore.pages.clear(); |
||||
} |
||||
} |
||||
|
||||
void SetVisualStoreTab(VisualStoreTab tab) |
||||
{ |
||||
if (!VendorHasTabs()) |
||||
return; |
||||
|
||||
VisualStore.activeTab = tab; |
||||
VisualStore.currentPage = 0; |
||||
pcursstoreitem = -1; |
||||
pcursstorebtn = -1; |
||||
|
||||
// Refresh item stat flags
|
||||
std::span<Item> items = GetVisualStoreItems(); |
||||
for (Item &item : items) { |
||||
item._iStatFlag = MyPlayer->CanUseItem(item); |
||||
} |
||||
|
||||
RefreshVisualStoreLayout(); |
||||
} |
||||
|
||||
void VisualStoreNextPage() |
||||
{ |
||||
if (VisualStore.currentPage + 1 < VisualStore.pages.size()) { |
||||
VisualStore.currentPage++; |
||||
pcursstoreitem = -1; |
||||
pcursstorebtn = -1; |
||||
} |
||||
} |
||||
|
||||
void VisualStorePreviousPage() |
||||
{ |
||||
if (VisualStore.currentPage > 0) { |
||||
VisualStore.currentPage--; |
||||
pcursstoreitem = -1; |
||||
pcursstorebtn = -1; |
||||
} |
||||
} |
||||
|
||||
int GetRepairCost(const Item &item) |
||||
{ |
||||
if (item.isEmpty() || item._iDurability == item._iMaxDur || item._iMaxDur == DUR_INDESTRUCTIBLE) |
||||
return 0; |
||||
|
||||
const int due = item._iMaxDur - item._iDurability; |
||||
if (item._iMagical != ITEM_QUALITY_NORMAL && item._iIdentified) { |
||||
return 30 * item._iIvalue * due / (item._iMaxDur * 100 * 2); |
||||
} else { |
||||
return std::max(item._ivalue * due / (item._iMaxDur * 2), 1); |
||||
} |
||||
} |
||||
|
||||
void VisualStoreRepairAll() |
||||
{ |
||||
Player &myPlayer = *MyPlayer; |
||||
int totalCost = 0; |
||||
|
||||
// Check body items
|
||||
for (auto &item : myPlayer.InvBody) { |
||||
totalCost += GetRepairCost(item); |
||||
} |
||||
|
||||
// Check inventory items
|
||||
for (int i = 0; i < myPlayer._pNumInv; i++) { |
||||
totalCost += GetRepairCost(myPlayer.InvList[i]); |
||||
} |
||||
|
||||
if (totalCost == 0) |
||||
return; |
||||
|
||||
if (!PlayerCanAfford(totalCost)) { |
||||
|
||||
return; |
||||
} |
||||
|
||||
// Execute repairs
|
||||
TakePlrsMoney(totalCost); |
||||
|
||||
for (auto &item : myPlayer.InvBody) { |
||||
if (!item.isEmpty() && item._iMaxDur != DUR_INDESTRUCTIBLE) |
||||
item._iDurability = item._iMaxDur; |
||||
} |
||||
|
||||
for (int i = 0; i < myPlayer._pNumInv; i++) { |
||||
Item &item = myPlayer.InvList[i]; |
||||
if (!item.isEmpty() && item._iMaxDur != DUR_INDESTRUCTIBLE) |
||||
item._iDurability = item._iMaxDur; |
||||
} |
||||
|
||||
PlaySFX(SfxID::ItemGold); |
||||
CalcPlrInv(myPlayer, true); |
||||
} |
||||
|
||||
void VisualStoreRepair() |
||||
{ |
||||
NewCursor(CURSOR_REPAIR); |
||||
} |
||||
|
||||
void VisualStoreRepairItem(int invIndex) |
||||
{ |
||||
Player &myPlayer = *MyPlayer; |
||||
Item *item = nullptr; |
||||
|
||||
if (invIndex < INVITEM_INV_FIRST) { |
||||
item = &myPlayer.InvBody[invIndex]; |
||||
} else if (invIndex <= INVITEM_INV_LAST) { |
||||
item = &myPlayer.InvList[invIndex - INVITEM_INV_FIRST]; |
||||
} else { |
||||
return; // Belt items don't have durability
|
||||
} |
||||
|
||||
if (item->isEmpty()) |
||||
return; |
||||
|
||||
int cost = GetRepairCost(*item); |
||||
if (cost <= 0) |
||||
return; |
||||
|
||||
if (!PlayerCanAfford(cost)) { |
||||
|
||||
return; |
||||
} |
||||
|
||||
TakePlrsMoney(cost); |
||||
item->_iDurability = item->_iMaxDur; |
||||
PlaySFX(SfxID::ItemGold); |
||||
CalcPlrInv(myPlayer, true); |
||||
} |
||||
|
||||
Point GetVisualStoreSlotCoord(Point slot) |
||||
{ |
||||
constexpr int SlotSpacing = INV_SLOT_SIZE_PX + 1; |
||||
// Grid starts below the header area
|
||||
return GetPanelPosition(UiPanels::Stash, slot * SlotSpacing + Displacement { 17, 44 }); |
||||
} |
||||
|
||||
Rectangle GetVisualBtnCoord(int btnId) |
||||
{ |
||||
return { GetPanelPosition(UiPanels::Stash, VisualStoreButtonRect[btnId].position), VisualStoreButtonRect[btnId].size }; |
||||
} |
||||
|
||||
int GetVisualStoreItemCount() |
||||
{ |
||||
std::span<Item> items = GetVisualStoreItems(); |
||||
int count = 0; |
||||
for (const Item &item : items) { |
||||
if (!item.isEmpty()) |
||||
count++; |
||||
} |
||||
return count; |
||||
} |
||||
|
||||
std::span<Item> GetVisualStoreItems() |
||||
{ |
||||
return GetVendorItems(VisualStore.vendor, VisualStore.activeTab); |
||||
} |
||||
|
||||
int GetVisualStorePageCount() |
||||
{ |
||||
return std::max(1, static_cast<int>(VisualStore.pages.size())); |
||||
} |
||||
|
||||
void DrawVisualStore(const Surface &out) |
||||
{ |
||||
if (!VisualStorePanelArt) |
||||
return; |
||||
|
||||
RenderClxSprite(out, (*VisualStorePanelArt)[0], GetPanelPosition(UiPanels::Stash)); |
||||
|
||||
const Point panelPos = GetPanelPosition(UiPanels::Stash); |
||||
const UiFlags styleWhite = UiFlags::VerticalCenter | UiFlags::ColorWhite; |
||||
const UiFlags styleTabPushed = UiFlags::VerticalCenter | UiFlags::ColorButtonpushed; |
||||
constexpr int TextHeight = 13; |
||||
|
||||
// Draw tab buttons
|
||||
UiFlags basicStyle = VisualStore.activeTab == VisualStoreTab::Basic ? styleWhite : styleTabPushed; |
||||
UiFlags premiumStyle = VisualStore.activeTab == VisualStoreTab::Premium ? styleWhite : styleTabPushed; |
||||
switch (VisualStore.vendor) { |
||||
case VisualStoreVendor::Smith: { |
||||
const Rectangle regBtnPos = { GetPanelPosition(UiPanels::Stash, VisualStoreButtonRect[TabButtonBasic].position), VisualStoreButtonRect[TabButtonBasic].size }; |
||||
RenderClxSprite(out, (*VisualStoreNavButtonArt)[VisualStore.activeTab != VisualStoreTab::Basic], regBtnPos.position); |
||||
DrawString(out, _("Basic"), regBtnPos, { .flags = UiFlags::AlignCenter | basicStyle }); |
||||
|
||||
const Rectangle premBtnPos = { GetPanelPosition(UiPanels::Stash, VisualStoreButtonRect[TabButtonPremium].position), VisualStoreButtonRect[TabButtonPremium].size }; |
||||
RenderClxSprite(out, (*VisualStoreNavButtonArt)[VisualStore.activeTab != VisualStoreTab::Premium], premBtnPos.position); |
||||
DrawString(out, _("Premium"), premBtnPos, { .flags = UiFlags::AlignCenter | premiumStyle }); |
||||
break; |
||||
} |
||||
case VisualStoreVendor::Witch: |
||||
case VisualStoreVendor::Boy: |
||||
case VisualStoreVendor::Healer: { |
||||
const Rectangle miscBtnPos = { GetPanelPosition(UiPanels::Stash, VisualStoreButtonRect[TabButtonBasic].position), VisualStoreButtonRect[TabButtonBasic].size }; |
||||
RenderClxSprite(out, (*VisualStoreNavButtonArt)[VisualStoreButtonPressed == TabButtonBasic], miscBtnPos.position); |
||||
DrawString(out, _("Misc"), miscBtnPos, { .flags = UiFlags::AlignCenter | basicStyle }); |
||||
break; |
||||
} |
||||
default: { |
||||
break; |
||||
} |
||||
} |
||||
|
||||
if (VisualStore.currentPage >= VisualStore.pages.size()) |
||||
return; |
||||
|
||||
const VisualStorePage &page = VisualStore.pages[VisualStore.currentPage]; |
||||
std::span<Item> allItems = GetVisualStoreItems(); |
||||
|
||||
constexpr Displacement offset { 0, INV_SLOT_SIZE_PX - 1 }; |
||||
|
||||
// First pass: draw item slot backgrounds
|
||||
for (int y = 0; y < VisualStoreGridHeight; y++) { |
||||
for (int x = 0; x < VisualStoreGridWidth; x++) { |
||||
const uint16_t itemPlusOne = page.grid[x][y]; |
||||
if (itemPlusOne == 0) |
||||
continue; |
||||
|
||||
const Item &item = allItems[itemPlusOne - 1]; |
||||
Point position = GetVisualStoreSlotCoord({ x, y }) + offset; |
||||
InvDrawSlotBack(out, position, InventorySlotSizeInPixels, item._iMagical); |
||||
} |
||||
} |
||||
|
||||
// Second pass: draw item sprites
|
||||
for (const auto &vsItem : page.items) { |
||||
const Item &item = allItems[vsItem.index]; |
||||
Point position = GetVisualStoreSlotCoord(vsItem.position) + offset; |
||||
|
||||
const int frame = item._iCurs + CURSOR_FIRSTITEM; |
||||
const ClxSprite sprite = GetInvItemSprite(frame); |
||||
|
||||
// Draw highlight outline if this item is hovered
|
||||
if (pcursstoreitem == vsItem.index) { |
||||
const uint8_t color = GetOutlineColor(item, true); |
||||
ClxDrawOutline(out, color, position, sprite); |
||||
} |
||||
|
||||
DrawItem(item, out, position, sprite); |
||||
} |
||||
|
||||
// Draw player gold at bottom
|
||||
uint32_t totalGold = MyPlayer->_pGold + Stash.gold; |
||||
DrawString(out, StrCat(_("Gold: "), FormatInteger(totalGold)), |
||||
{ panelPos + Displacement { 20, 320 }, { 280, TextHeight } }, |
||||
{ .flags = styleWhite }); |
||||
|
||||
// Draw Repair All
|
||||
if (VisualStore.vendor == VisualStoreVendor::Smith) { |
||||
const Rectangle repairAllBtnPos = { GetPanelPosition(UiPanels::Stash, VisualStoreButtonRect[RepairAllBtn].position), VisualStoreButtonRect[RepairAllBtn].size }; |
||||
RenderClxSprite(out, (*VisualStoreRepairAllButtonArt)[VisualStoreButtonPressed == RepairAllBtn], repairAllBtnPos.position); |
||||
|
||||
const Rectangle repairBtnPos = { GetPanelPosition(UiPanels::Stash, VisualStoreButtonRect[RepairBtn].position), VisualStoreButtonRect[RepairBtn].size }; |
||||
RenderClxSprite(out, (*VisualStoreRepairButtonArt)[VisualStoreButtonPressed == RepairBtn], repairBtnPos.position); |
||||
} |
||||
} |
||||
|
||||
int16_t CheckVisualStoreHLight(Point mousePosition) |
||||
{ |
||||
// Check buttons first
|
||||
const Point panelPos = GetPanelPosition(UiPanels::Stash); |
||||
if (MyPlayer->HoldItem.isEmpty()) { |
||||
for (int i = 0; i < 4; i++) { |
||||
// Skip tab buttons if vendor doesn't have tabs
|
||||
if (!VendorHasTabs() && i != TabButtonBasic) |
||||
continue; |
||||
|
||||
Rectangle button = VisualStoreButtonRect[i]; |
||||
button.position = GetPanelPosition(UiPanels::Stash, button.position); |
||||
|
||||
if (button.contains(mousePosition)) { |
||||
if (i == TabButtonBasic) { |
||||
if (VendorHasTabs()) { |
||||
InfoString = _("Basic"); |
||||
FloatingInfoString = _("Basic"); |
||||
AddInfoBoxString(_("Basic items")); |
||||
AddInfoBoxString(_("Basic items"), true); |
||||
} else { |
||||
InfoString = _("Misc"); |
||||
FloatingInfoString = _("Misc"); |
||||
AddInfoBoxString(_("Miscellaneous items")); |
||||
AddInfoBoxString(_("Miscellaneous items"), true); |
||||
} |
||||
InfoColor = UiFlags::ColorWhite; |
||||
pcursstorebtn = TabButtonBasic; |
||||
return -1; |
||||
} else if (i == TabButtonPremium) { |
||||
InfoString = _("Premium"); |
||||
FloatingInfoString = _("Premium"); |
||||
AddInfoBoxString(_("Premium items")); |
||||
AddInfoBoxString(_("Premium items"), true); |
||||
InfoColor = UiFlags::ColorWhite; |
||||
pcursstorebtn = TabButtonPremium; |
||||
return -1; |
||||
} else if (i == RepairAllBtn) { |
||||
int totalCost = 0; |
||||
Player &myPlayer = *MyPlayer; |
||||
for (auto &item : myPlayer.InvBody) |
||||
totalCost += GetRepairCost(item); |
||||
for (int j = 0; j < myPlayer._pNumInv; j++) |
||||
totalCost += GetRepairCost(myPlayer.InvList[j]); |
||||
|
||||
InfoString = _("Repair All"); |
||||
FloatingInfoString = _("Repair All"); |
||||
if (totalCost > 0) { |
||||
AddInfoBoxString(StrCat(FormatInteger(totalCost), " Gold")); |
||||
AddInfoBoxString(StrCat(FormatInteger(totalCost), " Gold"), true); |
||||
} else { |
||||
AddInfoBoxString(_("Nothing to repair")); |
||||
AddInfoBoxString(_("Nothing to repair"), true); |
||||
} |
||||
InfoColor = UiFlags::ColorWhite; |
||||
pcursstorebtn = RepairAllBtn; |
||||
return -1; |
||||
} else if (i == RepairBtn) { |
||||
InfoString = _("Repair"); |
||||
FloatingInfoString = _("Repair"); |
||||
AddInfoBoxString(_("Repair a single item")); |
||||
AddInfoBoxString(_("Repair a single item"), true); |
||||
InfoColor = UiFlags::ColorWhite; |
||||
pcursstorebtn = RepairBtn; |
||||
return -1; |
||||
} |
||||
} |
||||
} |
||||
} |
||||
|
||||
if (VisualStore.currentPage >= VisualStore.pages.size()) |
||||
return -1; |
||||
|
||||
const VisualStorePage &page = VisualStore.pages[VisualStore.currentPage]; |
||||
std::span<Item> allItems = GetVisualStoreItems(); |
||||
|
||||
for (int y = 0; y < VisualStoreGridHeight; y++) { |
||||
for (int x = 0; x < VisualStoreGridWidth; x++) { |
||||
const uint16_t itemPlusOne = page.grid[x][y]; |
||||
if (itemPlusOne == 0) |
||||
continue; |
||||
|
||||
const int itemIndex = itemPlusOne - 1; |
||||
const Item &item = allItems[itemIndex]; |
||||
|
||||
const Rectangle cell { |
||||
GetVisualStoreSlotCoord({ x, y }), |
||||
InventorySlotSizeInPixels + 1 |
||||
}; |
||||
|
||||
if (cell.contains(mousePosition)) { |
||||
const int price = item._iIvalue; |
||||
const bool canAfford = PlayerCanAfford(price); |
||||
|
||||
InfoString = item.getName(); |
||||
FloatingInfoString = item.getName(); |
||||
InfoColor = canAfford ? item.getTextColor() : UiFlags::ColorRed; |
||||
|
||||
if (item._iIdentified) { |
||||
PrintItemDetails(item); |
||||
} else { |
||||
PrintItemDur(item); |
||||
} |
||||
|
||||
AddInfoBoxString(StrCat(FormatInteger(price), " Gold")); |
||||
|
||||
return static_cast<int16_t>(itemIndex); |
||||
} |
||||
} |
||||
} |
||||
|
||||
return -1; |
||||
} |
||||
|
||||
void CheckVisualStoreItem(Point mousePosition, bool isCtrlHeld, bool isShiftHeld) |
||||
{ |
||||
// Check if clicking on an item to buy
|
||||
int16_t itemIndex = CheckVisualStoreHLight(mousePosition); |
||||
if (itemIndex < 0) |
||||
return; |
||||
|
||||
std::span<Item> items = GetVisualStoreItems(); |
||||
if (itemIndex >= static_cast<int16_t>(items.size())) |
||||
return; |
||||
|
||||
Item &item = items[itemIndex]; |
||||
if (item.isEmpty()) |
||||
return; |
||||
|
||||
// Check if player can afford the item
|
||||
int price = item._iIvalue; |
||||
uint32_t totalGold = MyPlayer->_pGold + Stash.gold; |
||||
if (totalGold < static_cast<uint32_t>(price)) { |
||||
// InitDiabloMsg(EMSG_NOT_ENOUGH_GOLD);
|
||||
return; |
||||
} |
||||
|
||||
// Check if player has room for the item
|
||||
if (!StoreAutoPlace(item, false)) { |
||||
// InitDiabloMsg(EMSG_INVENTORY_FULL);
|
||||
return; |
||||
} |
||||
|
||||
// Execute the purchase
|
||||
TakePlrsMoney(price); |
||||
StoreAutoPlace(item, true); |
||||
PlaySFX(ItemInvSnds[ItemCAnimTbl[item._iCurs]]); |
||||
|
||||
// Remove item from store (vendor-specific handling)
|
||||
switch (VisualStore.vendor) { |
||||
case VisualStoreVendor::Smith: { |
||||
if (VisualStore.activeTab == VisualStoreTab::Premium) { |
||||
// Premium items get replaced
|
||||
PremiumItems[itemIndex].clear(); |
||||
SpawnPremium(*MyPlayer); |
||||
} else { |
||||
// Basic items are removed
|
||||
SmithItems.erase(SmithItems.begin() + itemIndex); |
||||
} |
||||
break; |
||||
} |
||||
case VisualStoreVendor::Witch: { |
||||
// First 3 items are pinned, don't remove them
|
||||
if (itemIndex >= 3) { |
||||
WitchItems.erase(WitchItems.begin() + itemIndex); |
||||
} |
||||
break; |
||||
} |
||||
case VisualStoreVendor::Healer: { |
||||
// First 2-3 items are pinned
|
||||
if (itemIndex >= (gbIsMultiplayer ? 3 : 2)) { |
||||
HealerItems.erase(HealerItems.begin() + itemIndex); |
||||
} |
||||
break; |
||||
} |
||||
case VisualStoreVendor::Boy: { |
||||
BoyItem.clear(); |
||||
break; |
||||
} |
||||
} |
||||
|
||||
pcursstoreitem = -1; |
||||
RefreshVisualStoreLayout(); |
||||
} |
||||
|
||||
void CheckVisualStorePaste(Point mousePosition) |
||||
{ |
||||
if (!VendorAcceptsSale()) |
||||
return; |
||||
|
||||
Player &player = *MyPlayer; |
||||
if (player.HoldItem.isEmpty()) |
||||
return; |
||||
|
||||
// Check if the item can be sold to this vendor
|
||||
if (!CanSellToCurrentVendor(player.HoldItem)) { |
||||
player.SaySpecific(HeroSpeech::ICantDoThat); |
||||
return; |
||||
} |
||||
|
||||
// Calculate sell price
|
||||
int sellPrice = GetSellPrice(player.HoldItem); |
||||
|
||||
// Add gold to player
|
||||
AddGoldToInventory(player, sellPrice); |
||||
PlaySFX(SfxID::ItemGold); |
||||
|
||||
// Clear the held item
|
||||
player.HoldItem.clear(); |
||||
NewCursor(CURSOR_HAND); |
||||
} |
||||
|
||||
bool CanSellToCurrentVendor(const Item &item) |
||||
{ |
||||
if (item.isEmpty()) |
||||
return false; |
||||
|
||||
switch (VisualStore.vendor) { |
||||
case VisualStoreVendor::Smith: { |
||||
return SmithWillBuy(item); |
||||
} |
||||
case VisualStoreVendor::Witch: { |
||||
return WitchWillBuy(item); |
||||
} |
||||
case VisualStoreVendor::Healer: |
||||
case VisualStoreVendor::Boy: { |
||||
return false; |
||||
} |
||||
} |
||||
return false; |
||||
} |
||||
|
||||
void SellItemToVisualStore(int invIndex) |
||||
{ |
||||
if (!VendorAcceptsSale()) |
||||
return; |
||||
|
||||
Player &player = *MyPlayer; |
||||
Item &item = player.InvList[invIndex]; |
||||
|
||||
if (!CanSellToCurrentVendor(item)) { |
||||
player.SaySpecific(HeroSpeech::ICantDoThat); |
||||
return; |
||||
} |
||||
|
||||
// Calculate sell price
|
||||
int sellPrice = GetSellPrice(item); |
||||
|
||||
// Add gold to player
|
||||
AddGoldToInventory(player, sellPrice); |
||||
PlaySFX(SfxID::ItemGold); |
||||
|
||||
// Remove item from inventory
|
||||
player.RemoveInvItem(invIndex); |
||||
} |
||||
|
||||
void CheckVisualStoreButtonPress(Point mousePosition) |
||||
{ |
||||
if (!MyPlayer->HoldItem.isEmpty()) |
||||
return; |
||||
|
||||
for (int i = 0; i < 4; i++) { |
||||
// Skip tab buttons if vendor doesn't have tabs
|
||||
if (!VendorHasTabs() && i != TabButtonBasic) |
||||
continue; |
||||
|
||||
Rectangle button = VisualStoreButtonRect[i]; |
||||
button.position = GetPanelPosition(UiPanels::Stash, button.position); |
||||
|
||||
if (button.contains(mousePosition)) { |
||||
VisualStoreButtonPressed = i; |
||||
return; |
||||
} |
||||
} |
||||
|
||||
VisualStoreButtonPressed = -1; |
||||
} |
||||
|
||||
void CheckVisualStoreButtonRelease(Point mousePosition) |
||||
{ |
||||
if (VisualStoreButtonPressed == -1) |
||||
return; |
||||
|
||||
Rectangle button = VisualStoreButtonRect[VisualStoreButtonPressed]; |
||||
button.position = GetPanelPosition(UiPanels::Stash, button.position); |
||||
|
||||
if (button.contains(mousePosition)) { |
||||
switch (VisualStoreButtonPressed) { |
||||
case TabButtonBasic: { |
||||
SetVisualStoreTab(VisualStoreTab::Basic); |
||||
break; |
||||
} |
||||
case TabButtonPremium: { |
||||
SetVisualStoreTab(VisualStoreTab::Premium); |
||||
break; |
||||
} |
||||
case RepairAllBtn: { |
||||
VisualStoreRepairAll(); |
||||
break; |
||||
} |
||||
case RepairBtn: { |
||||
VisualStoreRepair(); |
||||
break; |
||||
} |
||||
} |
||||
} |
||||
|
||||
VisualStoreButtonPressed = -1; |
||||
} |
||||
|
||||
} // namespace devilution
|
||||
@ -0,0 +1,188 @@
|
||||
/**
|
||||
* @file qol/visual_store.h |
||||
* |
||||
* Interface of visual grid-based store UI. |
||||
*/ |
||||
#pragma once |
||||
|
||||
#include <cstdint> |
||||
#include <span> |
||||
#include <vector> |
||||
|
||||
#include "engine/point.hpp" |
||||
#include "engine/surface.hpp" |
||||
#include "items.h" |
||||
|
||||
namespace devilution { |
||||
|
||||
enum class VisualStoreVendor : uint8_t { |
||||
Smith, |
||||
Witch, |
||||
Healer, |
||||
Boy |
||||
}; |
||||
|
||||
enum class VisualStoreTab : uint8_t { |
||||
Basic = 0, |
||||
Premium = 1 |
||||
}; |
||||
|
||||
// Grid: 10x9 = 90 slots per page
|
||||
inline constexpr int VisualStoreGridWidth = 10; |
||||
inline constexpr int VisualStoreGridHeight = 9; |
||||
|
||||
struct VisualStoreItem { |
||||
uint16_t index; // Index in the vendor's item list
|
||||
Point position; // Top-left position in the grid
|
||||
}; |
||||
|
||||
struct VisualStorePage { |
||||
std::vector<VisualStoreItem> items; |
||||
uint16_t grid[VisualStoreGridWidth][VisualStoreGridHeight]; |
||||
}; |
||||
|
||||
struct VisualStoreState { |
||||
VisualStoreVendor vendor; |
||||
VisualStoreTab activeTab; // For Smith: Regular vs Premium
|
||||
unsigned currentPage; |
||||
std::vector<VisualStorePage> pages; |
||||
}; |
||||
|
||||
extern bool IsVisualStoreOpen; |
||||
extern VisualStoreState VisualStore; |
||||
extern int16_t pcursstoreitem; // Currently highlighted store item index (-1 if none)
|
||||
extern int16_t pcursstorebtn; |
||||
|
||||
/**
|
||||
* @brief Load visual store graphics. |
||||
*/ |
||||
void InitVisualStore(); |
||||
|
||||
/**
|
||||
* @brief Free visual store graphics. |
||||
*/ |
||||
void FreeVisualStoreGFX(); |
||||
|
||||
/**
|
||||
* @brief Open the visual store for a vendor. |
||||
* Opens both the store panel (left) and inventory panel (right). |
||||
* @param vendor The vendor to open the store for. |
||||
*/ |
||||
void OpenVisualStore(VisualStoreVendor vendor); |
||||
|
||||
/**
|
||||
* @brief Close the visual store and inventory panels. |
||||
*/ |
||||
void CloseVisualStore(); |
||||
|
||||
/**
|
||||
* @brief Set the active tab for Smith (Regular/Premium). |
||||
* @param tab The tab to switch to. |
||||
*/ |
||||
void SetVisualStoreTab(VisualStoreTab tab); |
||||
|
||||
/**
|
||||
* @brief Navigate to the next page of store items. |
||||
*/ |
||||
void VisualStoreNextPage(); |
||||
|
||||
/**
|
||||
* @brief Navigate to the previous page of store items. |
||||
*/ |
||||
void VisualStorePreviousPage(); |
||||
|
||||
/**
|
||||
* @brief Render the visual store panel to the given buffer. |
||||
*/ |
||||
void DrawVisualStore(const Surface &out); |
||||
|
||||
/**
|
||||
* @brief Handle a click on the visual store panel. |
||||
* @param mousePosition The mouse position. |
||||
*/ |
||||
void CheckVisualStoreItem(Point mousePosition, bool isCtrlHeld, bool isShiftHeld); |
||||
|
||||
/**
|
||||
* @brief Handle dropping an item on the visual store to sell. |
||||
* @param mousePosition The mouse position. |
||||
*/ |
||||
void CheckVisualStorePaste(Point mousePosition); |
||||
|
||||
/**
|
||||
* @brief Check for item highlight under the cursor. |
||||
* @param mousePosition The mouse position. |
||||
* @return The index of the highlighted item, or -1 if none. |
||||
*/ |
||||
int16_t CheckVisualStoreHLight(Point mousePosition); |
||||
|
||||
/**
|
||||
* @brief Handle button press in the visual store. |
||||
* @param mousePosition The mouse position. |
||||
*/ |
||||
void CheckVisualStoreButtonPress(Point mousePosition); |
||||
|
||||
/**
|
||||
* @brief Handle button release in the visual store. |
||||
* @param mousePosition The mouse position. |
||||
*/ |
||||
void CheckVisualStoreButtonRelease(Point mousePosition); |
||||
|
||||
/**
|
||||
* @brief Check if an item can be sold to the current vendor. |
||||
* @param item The item to check. |
||||
* @return true if the item can be sold. |
||||
*/ |
||||
bool CanSellToCurrentVendor(const Item &item); |
||||
|
||||
/**
|
||||
* @brief Sell an item from the player's inventory to the current vendor. |
||||
* @param invIndex The inventory index of the item. |
||||
*/ |
||||
void SellItemToVisualStore(int invIndex); |
||||
|
||||
/**
|
||||
* @brief Get the number of items for the current vendor/tab. |
||||
* @return The item count. |
||||
*/ |
||||
int GetVisualStoreItemCount(); |
||||
|
||||
/**
|
||||
* @brief Get the items array for the current vendor/tab. |
||||
* @return A span of items. |
||||
*/ |
||||
std::span<Item> GetVisualStoreItems(); |
||||
|
||||
/**
|
||||
* @brief Get the total number of pages for the current vendor/tab. |
||||
* @return The page count. |
||||
*/ |
||||
int GetVisualStorePageCount(); |
||||
|
||||
/**
|
||||
* @brief Convert a grid slot position to screen coordinates. |
||||
* @param slot The grid slot position. |
||||
* @return The screen coordinates. |
||||
*/ |
||||
Point GetVisualStoreSlotCoord(Point slot); |
||||
|
||||
/**
|
||||
* @brief Gets the point for a btn on the panel. |
||||
* @param slot Btn id. |
||||
* @return The screen coordinates. |
||||
*/ |
||||
Rectangle GetVisualBtnCoord(int btnId); |
||||
|
||||
/**
|
||||
* @brief Calculate the cost to repair an item. |
||||
* @param item The item to repair. |
||||
* @return The cost in gold. |
||||
*/ |
||||
int GetRepairCost(const Item &item); |
||||
|
||||
/**
|
||||
* @brief Repair a specific item from the player's inventory/body. |
||||
* @param invIndex The inventory index of the item. |
||||
*/ |
||||
void VisualStoreRepairItem(int invIndex); |
||||
|
||||
} // namespace devilution
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in new issue