item pick up not working

build/Debug/D2tweaks.Build.CppClean.log

@@ -0,0 +1,77 @@
+d:\vscode\d2tweaks-rnd2k\build\debug\src\common\asm_code.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\common\hooking.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2win.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2gfx.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2client.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2common.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2lang.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2game.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2net.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\controls\checkbox.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\controls\image.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\controls\label.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\controls\button.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\loot_filter\loot_filter.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\loot_filter\loot_filter_settings_toggle_menu.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\loot_filter\loot_filter_settings_menu.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\common\string_utils.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\common\config.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\common\ini.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\vc143.pdb
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\client_module.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\small_patches\small_patches.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\common\common.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\common\asset_manager.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\server_module.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\server.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\controls\group.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\menu.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\ui_manager.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2launch.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\fog.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\storm.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2cmp.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\utils\mpq_ifstream.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\utils\screen.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\main.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\vendor\d2template\d2template.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\vendor\dllnotify\dllnotify.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\vendor\minhook\src\buffer.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\vendor\minhook\src\hook.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\vendor\minhook\src\trampoline.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\vendor\minhook\src\hde\hde32.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\vendor\minhook\src\hde\hde64.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\client.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\autosort\autosort_client.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\auto_gold_pickup\auto_gold_pickup_client.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\auto_item_pickup\auto_item_pickup_client.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\damage_display\damage_display_client.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\item_drop_message\item_drop_message_client.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\item_move\item_move_client.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\loot_filter\loot_filter_settings.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\test\test.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\trader_update\trader_update_client.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\transmute\transmute_client.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\autosort\autosort_server.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\auto_gold_pickup\auto_gold_pickup_server.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\auto_item_pickup\auto_item_pickup_server.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\damage_display\damage_display_server.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\identify_on_pickup\identify_on_pickup_server.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\item_drop_message\item_drop_message_server.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\item_move\item_move_server.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\test\test.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\trader_update\trader_update_server.obj
+d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\transmute\transmute_server.obj
+d:\diablo ii\mods\ironman-dev\d2tweaks.dll
+d:\diablo ii\mods\ironman-dev\d2tweaks.pdb
+d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.ilk
+d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.pdb
+d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.vcxproj.filelistabsolute.txt
+d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\cl.command.1.tlog
+d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\cl.items.tlog
+d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\cl.read.1.tlog
+d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\cl.write.1.tlog
+d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\link.command.1.tlog
+d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\link.read.1.tlog
+d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\link.secondary.1.tlog
+d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\link.write.1.tlog

build/Debug/D2tweaks.log

@@ -1,39 +1,2 @@
-  client.cpp
-  autosort_client.cpp
-D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\client\modules\autosort\autosort_client.cpp(197,15): warning C4018: '<': signed/unsigned mismatch
-D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\client\modules\autosort\autosort_client.cpp(197,66): warning C4018: '<=': signed/unsigned mismatch
-  auto_gold_pickup_client.cpp
-  auto_item_pickup_client.cpp
-  damage_display_client.cpp
-D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\client\modules\damage_display\damage_display_client.cpp(135,12): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
-D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\client\modules\damage_display\damage_display_client.cpp(140,31): warning C4244: '=': conversion from 'ULONGLONG' to 'long', possible loss of data
-D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\client\modules\damage_display\damage_display_client.cpp(264,59): warning C4244: 'argument': conversion from 'float' to 'int', possible loss of data
-  item_drop_message_client.cpp
-  item_move_client.cpp
-D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\client\modules\item_move\item_move_client.cpp(99,33): warning C4018: '<': signed/unsigned mismatch
-  loot_filter.cpp
-  loot_filter_settings.cpp
-  loot_filter_settings_menu.cpp
-  loot_filter_settings_toggle_menu.cpp
-  test.cpp
-  trader_update_client.cpp
-  transmute_client.cpp
-  autosort_server.cpp
-D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\server\modules\autosort\autosort_server.cpp(363,25): warning C4018: '<=': signed/unsigned mismatch
-D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\server\modules\autosort\autosort_server.cpp(364,26): warning C4018: '<=': signed/unsigned mismatch
-  auto_gold_pickup_server.cpp
-D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\server\modules\auto_gold_pickup\auto_gold_pickup_server.cpp(49,33): warning C4018: '>': signed/unsigned mismatch
-  auto_item_pickup_server.cpp
-  damage_display_server.cpp
-  identify_on_pickup_server.cpp
-  item_drop_message_server.cpp
-  item_move_server.cpp
-D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\server\modules\item_move\item_move_server.cpp(144,1): warning C4715: 'd2_tweaks::server::modules::item_move::handle_packet': not all control paths return a value
-  test.cpp
-  trader_update_server.cpp
-  transmute_server.cpp
-  ui_manager.cpp
-  d2common.cpp
-  screen.cpp
-  LINK : ..\..\Diablo II\MODS\ironman-dev\D2tweaks.dll not found or not built by the last incremental link; performing full link
+  loot_filter_settings_toggle_menu.cpp
   D2tweaks.vcxproj -> D:\Diablo II\MODS\ironman-dev\D2tweaks.dll

build/Debug/D2tweaks.vcxproj.FileListAbsolute.txt

@@ -1,2 +1 @@
 D:\VSCode\D2tweaks_src_17.04.2024\Build\Debug\D2tweaks.dll
-D:\VSCode\d2tweaks-rnd2k\Build\Debug\D2tweaks.dll

include/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.h

@@ -16,7 +16,7 @@ namespace d2_tweaks {
 		namespace modules {
 			class loot_filter_settings_toggle_menu final : public ui::menu, singleton<loot_filter_settings_toggle_menu> {
 				ui::controls::button* m_toggle_filter_settings_btn;
-				
+				ui::controls::button* m_btn_toggle_stats;
 				ui::controls::button* m_btn_toggle_help;
 				ui::controls::button* m_btn_toggle_cube;
 				ui::controls::button* m_btn_toggle_stash;
@@ -28,17 +28,23 @@ namespace d2_tweaks {
 				menu* m_filter_settings_menu;
 				menu* m_menu;
 				bool m_show;
+				bool m_show_bag;
 				
-				ui::controls::button* m_btn_toggle_stats;
 
 				explicit loot_filter_settings_toggle_menu(token);
 
+				void toggle_show() {
+					m_show = !m_show;
+					set_enabled(m_show);
+					set_visible(m_show);
+				}
+
 				void toggle_filter_settings_click();
 				void toggle_stats_settings_click();
 				void toggle_help_click();
 				void toggle_cube_click();
 				void toggle_stash_click();
-				
+				void toggle_bag_click();
 				void draw() override;
 
 				bool key_event(uint32_t key, bool up) override;

src/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.cpp

@@ -158,131 +158,6 @@ void displayStat() {
 	int y = GetPrivateProfileInt("BagStats", "y", 0, "./d2tweaks.ini");
 	int z = GetPrivateProfileInt("BagStats", "spacer", 0, "./d2tweaks.ini");
 
-	//for (auto item = inventory->first_item; item != nullptr; item = item->item_data->pt_next_item) {
-	//	const auto record = diablo2::d2_common::get_item_record(item->data_record_index);
-	//	auto recordType = diablo2::d2_common::get_item_type_record(record->type);
-	//	char* normCode1 = record->string_code;
-	//	if (strncmp(normCode1, "ib1", 3) == 0) {
-	//		bag = item;
-	//		bagGuid = item->guid;
-
-	//		// gems
-	//		statRuby = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Ruby, NULL);
-	//		statAmethyst = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Amethyst, NULL);
-	//		statDiamond = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Diamond, NULL);
-	//		statEmerald = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Emerald, NULL);
-	//		statSapphire = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Sapphire, NULL);
-	//		statTopaz = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Topaz, NULL);
-	//		statSkull = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Skull, NULL);
-
-	//		// runes
-	//		runebag_RunesA = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_runebag_RunesA, NULL);
-	//		runebag_RunesB = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_runebag_RunesB, NULL);
-	//		runebag_RunesC = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_runebag_RunesC, NULL);
-	//		runebag_RunesD = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_runebag_RunesD, NULL);
-	//		runebag_RunesE = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_runebag_RunesE, NULL);
-	//		runebag_RunesF = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_runebag_RunesF, NULL);
-
-	//		// rejuv & misc potions
-	//		gembag_Potions = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Potions, NULL);
-
-	//		// potions
-	//		gembag_PotionsHP = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_PotionsHP, NULL);
-	//		gembag_PotionsMana = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_PotionsMana, NULL);
-
-	//		// stones
-	//		gembag_Stones_Flourite = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_Flourite, NULL);
-	//		gembag_Stones_Jade = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_Jade, NULL);
-	//		gembag_Stones_Argonite = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_Argonite, NULL);
-	//		gembag_Stones_Azurite = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_Azurite, NULL);
-	//		gembag_Stones_Sulpher = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_Sulpher, NULL);
-	//		gembag_Stones_Quartz = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_Quartz, NULL);
-	//		gembag_Stones_TigerEye = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_TigerEye, NULL);
-
-	//		diablo2::d2_win::set_current_font(diablo2::UI_FONT_16);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Chipped Rubies: ")), x, y + 15 + textOffset, diablo2::UI_COLOR_RED, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(statRuby)).c_str()), x + z, y + 15 + textOffset, diablo2::UI_COLOR_RED, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Chipped Amethyst: ")), x, y + 27 + textOffset, diablo2::UI_COLOR_PURPLE, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(statAmethyst)).c_str()), x + z, y + 27 + textOffset, diablo2::UI_COLOR_PURPLE, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Chipped Diamonds: ")), x, y + 39 + textOffset, diablo2::UI_COLOR_WHITE, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(statDiamond)).c_str()), x + z, y + 39 + textOffset, diablo2::UI_COLOR_WHITE, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Chipped Emeralds: ")), x, y + 51 + textOffset, diablo2::UI_COLOR_LIGHT_GREEN, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(statEmerald)).c_str()), x + z, y + 51 + textOffset, diablo2::UI_COLOR_LIGHT_GREEN, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Chipped Sapphires: ")), x, y + 63 + textOffset, diablo2::UI_COLOR_BLUE, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(statSapphire)).c_str()), x + z, y + 63 + textOffset, diablo2::UI_COLOR_BLUE, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Chipped Topaz: ")), x, y + 75 + textOffset, diablo2::UI_COLOR_YELLOW, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(statTopaz)).c_str()), x + z, y + 75 + textOffset, diablo2::UI_COLOR_YELLOW, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Chipped Skulls: ")), x, y + 87 + textOffset, diablo2::UI_COLOR_GREY, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(statSkull)).c_str()), x + z, y + 87 + textOffset, diablo2::UI_COLOR_GREY, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Runes 1 - 6: ")), x, y + 109 + textOffset, diablo2::UI_COLOR_GREY, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(runebag_RunesA)).c_str()), x + z, y + 109 + textOffset, diablo2::UI_COLOR_GREY, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Runes 7 - 12: ")), x, y + 121 + textOffset, diablo2::UI_COLOR_GREY, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(runebag_RunesB)).c_str()), x + z, y + 121 + textOffset, diablo2::UI_COLOR_GREY, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Runes 13 - 18: ")), x, y + 133 + textOffset, diablo2::UI_COLOR_GREY, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(runebag_RunesC)).c_str()), x + z, y + 133 + textOffset, diablo2::UI_COLOR_GREY, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Runes 19 - 24: ")), x, y + 145 + textOffset, diablo2::UI_COLOR_GREY, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(runebag_RunesD)).c_str()), x + z, y + 145 + textOffset, diablo2::UI_COLOR_GREY, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Runes 25 - 30: ")), x, y + 157 + textOffset, diablo2::UI_COLOR_GREY, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(runebag_RunesE)).c_str()), x + z, y + 157 + textOffset, diablo2::UI_COLOR_GREY, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Runes 31 - 33: ")), x, y + 169 + textOffset, diablo2::UI_COLOR_GREY, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(runebag_RunesF)).c_str()), x + z, y + 169 + textOffset, diablo2::UI_COLOR_GREY, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Rejuv ")), x, y + 191 + textOffset, diablo2::UI_COLOR_PURPLE, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"& Misc Potions: ")), x + 48, y + 191 + textOffset, diablo2::UI_COLOR_WHITE, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(gembag_Potions)).c_str()), x + z, y + 191 + textOffset, diablo2::UI_COLOR_WHITE, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Healing Potions: ")), x, y + 213 + textOffset, diablo2::UI_COLOR_RED, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(gembag_PotionsHP)).c_str()), x + z, y + 213 + textOffset, diablo2::UI_COLOR_RED, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Mana Potions: ")), x, y + 225 + textOffset, diablo2::UI_COLOR_BLUE, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(gembag_PotionsMana)).c_str()), x + z, y + 225 + textOffset, diablo2::UI_COLOR_BLUE, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Flourite Stones: ")), x, y + 247 + textOffset, diablo2::UI_COLOR_PURPLE, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(gembag_Stones_Flourite)).c_str()), x + z, y + 247 + textOffset, diablo2::UI_COLOR_PURPLE, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Jade Stones: ")), x, y + 259 + textOffset, diablo2::UI_COLOR_LIGHT_GREEN, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(gembag_Stones_Jade)).c_str()), x + z, y + 259 + textOffset, diablo2::UI_COLOR_LIGHT_GREEN, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Argonite Stones: ")), x, y + 271 + textOffset, diablo2::UI_COLOR_RED, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(gembag_Stones_Argonite)).c_str()), x + z, y + 271 + textOffset, diablo2::UI_COLOR_RED, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Azurite Stones: ")), x, y + 283 + textOffset, diablo2::UI_COLOR_BLUE, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(gembag_Stones_Azurite)).c_str()), x + z, y + 283 + textOffset, diablo2::UI_COLOR_BLUE, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Sulpher Stones: ")), x, y + 295 + textOffset, diablo2::UI_COLOR_ORANGE, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(gembag_Stones_Sulpher)).c_str()), x + z, y + 295 + textOffset, diablo2::UI_COLOR_ORANGE, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Quartz Stones: ")), x, y + 307 + textOffset, diablo2::UI_COLOR_WHITE, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(gembag_Stones_Quartz)).c_str()), x + z, y + 307 + textOffset, diablo2::UI_COLOR_WHITE, 0);
-
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Tiger Eye Stones: ")), x, y + 319 + textOffset, diablo2::UI_COLOR_YELLOW, 0);
-	//		diablo2::d2_win::draw_text(const_cast<wchar_t*>((std::to_wstring(gembag_Stones_TigerEye)).c_str()), x + z, y + 319 + textOffset, diablo2::UI_COLOR_YELLOW, 0);
-
-	//		diablo2::d2_win::set_current_font(diablo2::UI_FONT_16);
-
-	//		// print a string using draw_text
-	//		// diablo2::d2_win::draw_text(const_cast<wchar_t*>((L"Gem/Rune/Stone/Potion Extract Menu")), 10, 25, diablo2::UI_COLOR_YELLOW, 0);
-
-	//		diablo2::d2_win::set_current_font(diablo2::UI_FONT_16);
-
-	//		diablo2::d2_gfx::draw_filled_rect(0, 0, 100, 100, 113, 0);
-
-	//	}
-	//}
-
 	for (auto item = inventory->first_item; item != nullptr; item = item->item_data->pt_next_item) {
 		const auto record = diablo2::d2_common::get_item_record(item->data_record_index);
 		auto recordType = diablo2::d2_common::get_item_type_record(record->type);
@@ -1379,22 +1254,12 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_item(bool va
 #include <d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.h>
 
 void d2_tweaks::client::modules::loot_filter_settings_menu::close_window(bool value) {
-
 	auto& toggle_menu = singleton<loot_filter_settings_toggle_menu>::instance();
-
 	toggle_menu.m_show = false;
-	
 	m_stats_enabled = true;
-
 	toggle_menu.m_filter_settings_menu->set_enabled(false);
 	toggle_menu.m_filter_settings_menu->set_visible(false);
-
-	toggle_menu.m_btn_toggle_stats->set_enabled(true);
-	toggle_menu.m_btn_toggle_stats->set_visible(true);
-
-
-
-	
+	toggle_menu.toggle_cube_click();
 }
 
 void d2_tweaks::client::modules::loot_filter_settings_menu::extract_rejuv_potion(bool value) {

src/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.cpp

@@ -140,6 +140,9 @@ void d2_tweaks::client::modules::loot_filter_settings_toggle_menu::toggle_filter
 
 	m_btn_toggle_stats->set_enabled(true);
 	m_btn_toggle_stats->set_visible(true);
+
+	toggle_cube_click();
+
 }
 
 void d2_tweaks::client::modules::loot_filter_settings_toggle_menu::toggle_stats_settings_click() {
@@ -270,6 +273,8 @@ bool d2_tweaks::client::modules::loot_filter_settings_toggle_menu::key_event(uin
 		m_btn_toggle_stats->set_enabled(true);
 		m_btn_toggle_stats->set_visible(true);
 
+		toggle_cube_click();
+
 		return true; // Block the key stroke
 	}
 
@@ -281,6 +286,8 @@ bool d2_tweaks::client::modules::loot_filter_settings_toggle_menu::key_event(uin
 		m_filter_settings_menu->set_enabled(m_show);
 		m_filter_settings_menu->set_visible(m_show);
 
+		toggle_cube_click();
+
 		return true; //block escape key stroke
 	}
 

src/d2tweaks/ui/ui_manager.cpp

@@ -513,7 +513,6 @@ bool isStoneCode(const char* normCode) {
 auto D2CLIENT_StoredTickCount1 = GetTickCount();
 
 void sendPacketAndUpdateProperty(int gemBagGuid, uint32_t iCode, int prop, int val, int item_guid, diablo2::structures::unit* gemBag) {
-
 	// get item using item guid
 
 	if (250 < GetTickCount() - D2CLIENT_StoredTickCount1) {
@@ -539,8 +538,6 @@ void sendPacketAndUpdateProperty(int gemBagGuid, uint32_t iCode, int prop, int v
 	}
 }
 
-
-
 LRESULT d2_tweaks::ui::ui_manager::wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 	static auto& instance = singleton<ui_manager>::instance();
 
@@ -1207,7 +1204,6 @@ LRESULT d2_tweaks::ui::ui_manager::wnd_proc(HWND hWnd, UINT msg, WPARAM wParam,
 				diablo2::d2_common::inv_remove_item(player->inventory, g_hoverItem);
 			}
 
-
 			if (strncmp(normCode, "hp1", 3) == 0) {
 				sendPacketAndUpdateProperty(gemBagGuid, 'hp1 ', 397, 1, g_hoverItem->guid, gemBag);
 				diablo2::d2_common::inv_remove_item(player->inventory, g_hoverItem);
@@ -1299,16 +1295,48 @@ LRESULT d2_tweaks::ui::ui_manager::wnd_proc(HWND hWnd, UINT msg, WPARAM wParam,
 				diablo2::d2_common::inv_remove_item(player->inventory, g_hoverItem);
 			}
 
+			char currentPage;
+			const char* key;
+			// Iterate through each gem type in the gemTypes map
+			for (const auto& gem : gemTypes) {
+				// Accessing the key and value of the gemTypes map
+				const std::string& _key = gem.first;
+				key = gem.first.c_str();
 
+				const GemType& value = gem.second;
 
+				// Check if the code of the hovered item matches the current gem type
+				if (strncmp(normCode, key, 3) == 0) {
+					// Create a D2PropertyStrc structure to represent the gem property
+					D2PropertyStrc itemProperty = {};
+					itemProperty.nProperty = value.rowID - 3; // Adjust the property ID
+					itemProperty.nLayer = 0;
+					itemProperty.nMin = value.chippedCount;
+					itemProperty.nMax = value.chippedCount;
 
+					// Add the gem property to the gem bag
+					diablo2::d2_common::add_property(gemBag, &itemProperty, 0);
 
+					// Play the drop sound associated with the hovered item
+					diablo2::d2_client::play_sound(record->drop_sound, nullptr, 0, 0, 0);
 
+					// Create and send a packet to the server to move the item
+					static d2_tweaks::common::item_move_cs packet;
+					packet.item_guid = g_hoverItem->guid;
+					packet.item_code = key;
+					packet.bag_guid = gemBagGuid;
+					packet.updateBag = 1;
+					packet.prop = itemProperty.nProperty;
+					packet.val = itemProperty.nMin;
+					packet.target_page = 99;
+					diablo2::d2_client::send_to_server(&packet, sizeof packet);
 
+					diablo2::d2_common::inv_remove_item(player->inventory, g_hoverItem);
 
-
-
-
+					// Clear the hovered item after processing
+					(*reinterpret_cast<diablo2::structures::unit**>(diablo2::d2_client::get_base() + 0x1158F4)) = nullptr;
+				}
+			}
 
 			if (isArmorOrWeaponCode(normCode)
 				|| record->type == 61 - 3 // jewel