QOL: GUI Stores

CMake/Assets.cmake

@@ -62,6 +62,7 @@ set(devilutionx_assets
   data/resistance.clx
   data/stash.clx
   data/stashnavbtns.clx
+  data/store.clx
   data/talkbutton.clx
   data/xpbar.clx
   fonts/12-00.clx

Source/CMakeLists.txt

@@ -166,6 +166,7 @@ set(libdevilutionx_SRCS
   qol/autopickup.cpp
   qol/chatlog.cpp
   qol/floatingnumbers.cpp
+  qol/guistore.cpp
   qol/itemlabels.cpp
   qol/monhealthbar.cpp
   qol/stash.cpp

Source/control.cpp

@@ -44,6 +44,7 @@
 #include "panels/spell_icons.hpp"
 #include "panels/spell_list.hpp"
 #include "playerdat.hpp"
+#include "qol/guistore.h"
 #include "qol/stash.h"
 #include "qol/xpbar.h"
 #include "stores.h"
@@ -107,7 +108,7 @@ const Rectangle &GetRightPanel()
 }
 bool IsLeftPanelOpen()
 {
-	return CharFlag || QuestLogIsOpen || IsStashOpen;
+	return CharFlag || QuestLogIsOpen || IsStashOpen || IsStoreOpen;
 }
 bool IsRightPanelOpen()
 {
@@ -686,7 +687,7 @@ bool IsLevelUpButtonVisible()
 	if (ControlMode == ControlTypes::VirtualGamepad) {
 		return false;
 	}
-	if (ActiveStore != TalkID::None || IsStashOpen) {
+	if (IsPlayerInStore() || IsStashOpen || IsStoreOpen) {
 		return false;
 	}
 	if (QuestLogIsOpen && GetLeftPanel().contains(GetMainPanel().position + Displacement { 0, -74 })) {
@@ -768,6 +769,7 @@ void OpenCharPanel()
 	QuestLogIsOpen = false;
 	CloseGoldWithdraw();
 	CloseStash();
+	CloseStore();
 	CharFlag = true;
 }
 
@@ -815,6 +817,7 @@ Point GetPanelPosition(UiPanels panel, Point offset)
 	case UiPanels::Quest:
 	case UiPanels::Character:
 	case UiPanels::Stash:
+	case UiPanels::Store:
 		return GetLeftPanel().position + displacement;
 	case UiPanels::Spell:
 	case UiPanels::Inventory:
@@ -1166,6 +1169,7 @@ void CheckMainPanelButtonUp()
 			CloseCharPanel();
 			CloseGoldWithdraw();
 			CloseStash();
+			CloseStore();
 			if (!QuestLogIsOpen)
 				StartQuestlog();
 			else
@@ -1183,6 +1187,7 @@ void CheckMainPanelButtonUp()
 			SpellbookFlag = false;
 			CloseGoldWithdraw();
 			CloseStash();
+			CloseStore();
 			invflag = !invflag;
 			CloseGoldDrop();
 			break;
@@ -1230,7 +1235,7 @@ void FreeControlPan()
 void DrawInfoBox(const Surface &out)
 {
 	DrawPanelBox(out, { 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 == StoreStruct::EmptyCell && !SpellSelectFlag && pcurs != CURSOR_HOURGLASS) {
 		InfoString = StringOrView {};
 		InfoColor = UiFlags::ColorWhite;
 	}

Source/controls/game_controls.cpp

@@ -14,6 +14,7 @@
 #include "gmenu.h"
 #include "options.h"
 #include "panels/spell_list.hpp"
+#include "qol/guistore.h"
 #include "qol/stash.h"
 #include "stores.h"
 
@@ -134,7 +135,7 @@ bool GetGameAction(const SDL_Event &event, ControllerButtonEvent ctrlEvent, Game
 					if (ControllerActionHeld == GameActionType_NONE) {
 						ControllerActionHeld = GameActionType_PRIMARY_ACTION;
 					}
-				} else if (sgpCurrentMenu != nullptr || ActiveStore != TalkID::None || QuestLogIsOpen) {
+				} else if (sgpCurrentMenu != nullptr || IsPlayerInStore() || QuestLogIsOpen) {
 					*action = GameActionSendKey { SDLK_RETURN, false };
 				} else {
 					*action = GameActionSendKey { SDLK_SPACE, false };
@@ -171,12 +172,12 @@ bool GetGameAction(const SDL_Event &event, ControllerButtonEvent ctrlEvent, Game
 				return true;
 			}
 			if (VirtualGamepadState.healthButton.isHeld && VirtualGamepadState.healthButton.didStateChange) {
-				if (!QuestLogIsOpen && !SpellbookFlag && ActiveStore == TalkID::None)
+				if (!QuestLogIsOpen && !SpellbookFlag && !IsPlayerInStore())
 					*action = GameAction(GameActionType_USE_HEALTH_POTION);
 				return true;
 			}
 			if (VirtualGamepadState.manaButton.isHeld && VirtualGamepadState.manaButton.didStateChange) {
-				if (!QuestLogIsOpen && !SpellbookFlag && ActiveStore == TalkID::None)
+				if (!QuestLogIsOpen && !SpellbookFlag && !IsPlayerInStore())
 					*action = GameAction(GameActionType_USE_MANA_POTION);
 				return true;
 			}
@@ -196,7 +197,7 @@ bool GetGameAction(const SDL_Event &event, ControllerButtonEvent ctrlEvent, Game
 
 	SDL_Keycode translation = SDLK_UNKNOWN;
 
-	if (gmenu_is_active() || ActiveStore != TalkID::None)
+	if (gmenu_is_active() || IsPlayerInStore())
 		translation = TranslateControllerButtonToGameMenuKey(ctrlEvent.button);
 	else if (inGameMenu)
 		translation = TranslateControllerButtonToMenuKey(ctrlEvent.button);
@@ -231,6 +232,22 @@ void PressControllerButton(ControllerButton button)
 		}
 	}
 
+	if (IsStoreOpen) {
+		switch (button) {
+		case ControllerButton_BUTTON_BACK:
+			// GUISTORE: Special action?
+			return;
+		case ControllerButton_BUTTON_LEFTSHOULDER:
+			// GUISTORE: Previous tab
+			return;
+		case ControllerButton_BUTTON_RIGHTSHOULDER:
+			// GUISTORE: Next tab
+			return;
+		default:
+			return;
+		}
+	}
+
 	if (PadHotspellMenuActive) {
 		auto quickSpellAction = [](size_t slot) {
 			if (SpellSelectFlag) {