[QOL] The buy and sell functionality of NPC stores is now visually driven to align with the stash and Diablo 2 style of trading (#8434)

- 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>

Author: strich

CMake/Assets.cmake

@@ -62,9 +62,13 @@ set(devilutionx_assets
   data/monstertags.clx
   data/panel8buc.clx
   data/panel8bucp.clx
+  data/repairAllBtn.clx
+  data/repairSingleBtn.clx
   data/resistance.clx
   data/stash.clx
   data/stashnavbtns.clx
+  data/store.clx
+  data/tabBtnUp.clx
   data/talkbutton.clx
   data/xpbar.clx
   fonts/12-00.clx

Source/CMakeLists.txt

@@ -150,6 +150,7 @@ set(libdevilutionx_SRCS
   qol/itemlabels.cpp
   qol/monhealthbar.cpp
   qol/stash.cpp
+  qol/visual_store.cpp
   qol/xpbar.cpp
 
   quests/validation.cpp

Source/control/control_infobox.cpp

@@ -6,6 +6,7 @@
 #include "levels/trigs.h"
 #include "panels/partypanel.hpp"
 #include "qol/stash.h"
+#include "qol/visual_store.h"
 #include "qol/xpbar.h"
 #include "towners.h"
 #include "utils/algorithm/container.hpp"
@@ -174,6 +175,29 @@ Rectangle GetFloatingInfoRect(const int lineHeight, const int textSpacing)
 		}
 	}
 
+	// 5) Visual Store (Rect position)
+	if (pcursstoreitem != -1) {
+		const VisualStorePage &page = VisualStore.pages[VisualStore.currentPage];
+		std::span<Item> allItems = GetVisualStoreItems();
+		for (const auto &vsItem : page.items) {
+			if (vsItem.index != pcursstoreitem)
+				continue;
+
+			const Item &item = allItems[vsItem.index];
+			Point itemPosition = GetVisualStoreSlotCoord(vsItem.position);
+			const Size itemGridSize = GetInventorySize(item);
+
+			itemPosition.y += itemGridSize.height * (VisualStoreGridHeight + 1) - 1; // Align position to bottom left of the item graphic
+			itemPosition.x += itemGridSize.width * VisualStoreGridWidth / 2;         // Align position to center of the item graphic
+			itemPosition.x -= maxW / 2;                                              // Align position to the center of the floating item info box
+
+			return { { itemPosition.x, itemPosition.y }, { maxW, totalH } };
+		}
+	}
+	if (pcursstorebtn != -1) {
+		return { GetVisualBtnCoord(pcursstorebtn).position, { maxW, totalH } };
+	}
+
 	return { { 0, 0 }, { 0, 0 } };
 }
 
@@ -201,6 +225,11 @@ int GetHoverSpriteHeight()
 		auto &it = Stash.stashList[pcursstashitem];
 		return GetInventorySize(it).height * (InventorySlotSizeInPixels.height + 1);
 	}
+	if (pcursstoreitem != -1) {
+		std::span<Item> allItems = GetVisualStoreItems();
+		auto &it = allItems[pcursstoreitem];
+		return GetInventorySize(it).height * (INV_SLOT_SIZE_PX + 1);
+	}
 	return InventorySlotSizeInPixels.height;
 }
 
@@ -356,7 +385,7 @@ void CheckPanelInfo()
 void DrawInfoBox(const Surface &out)
 {
 	DrawPanelBox(out, MakeSdlRect(InfoBoxRect.position.x, InfoBoxRect.position.y + PanelPaddingHeight, InfoBoxRect.size.width, InfoBoxRect.size.height), GetMainPanel().position + Displacement { InfoBoxRect.position.x, InfoBoxRect.position.y });
-	if (!MainPanelFlag && !trigflag && pcursinvitem == -1 && pcursstashitem == StashStruct::EmptyCell && !SpellSelectFlag && pcurs != CURSOR_HOURGLASS) {
+	if (!MainPanelFlag && !trigflag && pcursinvitem == -1 && pcursstashitem == StashStruct::EmptyCell && pcursstoreitem == -1 && pcursstorebtn == -1 && !SpellSelectFlag && pcurs != CURSOR_HOURGLASS) {
 		InfoString = StringOrView {};
 		InfoColor = UiFlags::ColorWhite;
 	}
@@ -413,7 +442,7 @@ void DrawInfoBox(const Surface &out)
 
 void DrawFloatingInfoBox(const Surface &out)
 {
-	if (pcursinvitem == -1 && pcursstashitem == StashStruct::EmptyCell) {
+	if (pcursinvitem == -1 && pcursstashitem == StashStruct::EmptyCell && pcursstoreitem == -1 && pcursstorebtn == -1) {
 		FloatingInfoString = StringOrView {};
 		InfoColor = UiFlags::ColorWhite;
 	}

Source/control/control_panel.cpp

@@ -23,6 +23,7 @@
 #include "panels/spell_list.hpp"
 #include "pfile.h"
 #include "qol/stash.h"
+#include "qol/visual_store.h"
 #include "stores.h"
 #include "utils/sdl_compat.h"
 
@@ -59,7 +60,7 @@ const Rectangle &GetRightPanel()
 }
 bool IsLeftPanelOpen()
 {
-	return CharFlag || QuestLogIsOpen || IsStashOpen;
+	return CharFlag || QuestLogIsOpen || IsStashOpen || IsVisualStoreOpen;
 }
 bool IsRightPanelOpen()
 {
@@ -223,7 +224,7 @@ bool IsLevelUpButtonVisible()
 	if (ControlMode == ControlTypes::VirtualGamepad) {
 		return false;
 	}
-	if (IsPlayerInStore() || IsStashOpen) {
+	if (IsPlayerInStore() || IsStashOpen || IsVisualStoreOpen) {
 		return false;
 	}
 	if (QuestLogIsOpen && GetLeftPanel().contains(GetMainPanel().position + Displacement { 0, -74 })) {
@@ -300,6 +301,7 @@ void OpenCharPanel()
 	QuestLogIsOpen = false;
 	CloseGoldWithdraw();
 	CloseStash();
+	CloseVisualStore();
 	CharFlag = true;
 }
 
@@ -565,6 +567,7 @@ void CheckMainPanelButtonUp()
 			CloseCharPanel();
 			CloseGoldWithdraw();
 			CloseStash();
+			CloseVisualStore();
 			if (!QuestLogIsOpen)
 				StartQuestlog();
 			else
@@ -593,9 +596,10 @@ void CheckMainPanelButtonUp()
 			break;
 		case PanelButtonInventory:
 			SpellbookFlag = false;
+			invflag = !invflag;
 			CloseGoldWithdraw();
 			CloseStash();
-			invflag = !invflag;
+			CloseVisualStore();
 			CloseGoldDrop();
 			break;
 		case PanelButtonSpellbook:

Source/controls/game_controls.cpp

@@ -181,6 +181,10 @@ bool GetGameAction(const SDL_Event &event, ControllerButtonEvent ctrlEvent, Game
 			if ((!VirtualGamepadState.primaryActionButton.isHeld && ControllerActionHeld == GameActionType_PRIMARY_ACTION)
 			    || (!VirtualGamepadState.secondaryActionButton.isHeld && ControllerActionHeld == GameActionType_SECONDARY_ACTION)
 			    || (!VirtualGamepadState.spellActionButton.isHeld && ControllerActionHeld == GameActionType_CAST_SPELL)) {
+				// Handle button release for visual store buttons
+				if (ControllerActionHeld == GameActionType_PRIMARY_ACTION) {
+					PerformPrimaryActionRelease();
+				}
 				ControllerActionHeld = GameActionType_NONE;
 				LastPlayerAction = PlayerActionType::None;
 			}
@@ -399,6 +403,13 @@ bool HandleControllerButtonEvent(const SDL_Event &event, const ControllerButtonE
 	if (ctrlEvent.up && !PadmapperActionNameTriggeredByButtonEvent(ctrlEvent).empty()) {
 		// Button press may have brought up a menu;
 		// don't confuse release of that button with intent to interact with the menu
+
+		// Handle visual store button release for physical gamepad
+		std::string_view actionName = PadmapperActionNameTriggeredByButtonEvent(ctrlEvent);
+		if (actionName == "PrimaryAction") {
+			PerformPrimaryActionRelease();
+		}
+
 		PadmapperRelease(ctrlEvent.button, /*invokeAction=*/true);
 		return true;
 	} else if (GetGameAction(event, ctrlEvent, &action)) {