Extractor GUI done. Working...

build/Debug/D2tweaks.log

@@ -1,2 +1,39 @@
-  loot_filter_settings_menu.cpp
+  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
   D2tweaks.vcxproj -> D:\Diablo II\MODS\ironman-dev\D2tweaks.dll

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

@@ -63,6 +63,34 @@ namespace d2_tweaks {
 				bool m_show_flawless;
 				bool m_show_perfect;
 
+				bool m_show_rough;
+				bool m_show_faded;
+				bool m_show_blemished;
+				bool m_show_cleaned;
+				bool m_show_triangle;
+				bool m_show_trangle_cut;
+				bool m_show_square;
+				bool m_show_square_cut;
+				bool m_show_regular;
+				bool m_show_regular_cut;
+				bool m_show_star;
+				bool m_show_star_cut;
+				bool m_show_imperial;
+				bool m_show_imperial_cut;
+				bool m_show_royal;
+				bool m_show_royal_cut;
+				bool m_show_spectacular;
+				bool m_show_legendary;
+				bool m_show_legendary_cut;
+
+				bool m_show_flourite;
+				bool m_show_jade;
+				bool m_show_argonite;
+				bool m_show_azurite;
+				bool m_show_sulpher;
+				bool m_show_quartz;
+				bool m_show_tiger_eye;
+
 
 				bool quality_settings[static_cast<size_t>(diablo2::structures::item_quality_t::ITEM_QUALITY_COUNT)];
 

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

@@ -4,6 +4,8 @@
 
 #include <d2tweaks/ui/menu.h>
 
+#include <chrono>  // Add this line
+
 namespace diablo2 {
 	namespace structures {
 		struct unit;
@@ -74,6 +76,35 @@ namespace d2_tweaks {
 				ui::controls::checkbox* m_show_flawless;
 				ui::controls::checkbox* m_show_perfect;
 
+				ui::controls::checkbox* m_show_flourite;
+				ui::controls::checkbox* m_show_jade;
+				ui::controls::checkbox* m_show_argonite;
+				ui::controls::checkbox* m_show_azurite;
+				ui::controls::checkbox* m_show_sulpher;
+				ui::controls::checkbox* m_show_quartz;
+				ui::controls::checkbox* m_show_tiger_eye;
+
+
+				ui::controls::checkbox* m_show_rough;
+				ui::controls::checkbox* m_show_faded;
+				ui::controls::checkbox* m_show_blemished;
+				ui::controls::checkbox* m_show_cleaned;
+				ui::controls::checkbox* m_show_triangle;
+				ui::controls::checkbox* m_show_trangle_cut;
+				ui::controls::checkbox* m_show_square;
+				ui::controls::checkbox* m_show_square_cut;
+				ui::controls::checkbox* m_show_regular;
+				ui::controls::checkbox* m_show_regular_cut;
+				ui::controls::checkbox* m_show_star;
+				ui::controls::checkbox* m_show_star_cut;
+				ui::controls::checkbox* m_show_imperial;
+				ui::controls::checkbox* m_show_imperial_cut;
+				ui::controls::checkbox* m_show_royal;
+				ui::controls::checkbox* m_show_royal_cut;
+				ui::controls::checkbox* m_show_spectacular;
+				ui::controls::checkbox* m_show_legendary;
+				ui::controls::checkbox* m_show_legendary_cut;
+
 
 
 				void(__fastcall* m_draw_dropped_items_names_original)(void*, void*);
@@ -86,11 +117,17 @@ namespace d2_tweaks {
 				void draw() override;
 			private:
 				std::string m_selected_gem;
+				
+				std::chrono::steady_clock::time_point m_last_packet_sent;
+
 				void gem_checkbox_clicked(const std::string& gem);
+				void stone_checkbox_clicked(const std::string& gem);
 
 				void register_misc_checkboxes();
 				void register_quality_checkboxes();
 
+				void extract_rune(bool value, uint32_t runeCode, uint32_t minValue, int propertyRowID);
+
 				void update_alt_only(bool value);
 				void extract_r01(bool value);
 				void extract_r02(bool value);
@@ -140,7 +177,33 @@ namespace d2_tweaks {
 				void extract_flawless(bool value);
 				void extract_perfect(bool value);
 
+				void extract_rough(bool value);
+				void extract_faded(bool value);
+				void extract_blemished(bool value);
+				void extract_cleaned(bool value);
+				void extract_triangle(bool value);
+				void extract_trangle_cut(bool value);
+				void extract_square(bool value);
+				void extract_square_cut(bool value);
+				void extract_regular(bool value);
+				void extract_regular_cut(bool value);
+				void extract_star(bool value);
+				void extract_star_cut(bool value);
+				void extract_imperial(bool value);
+				void extract_imperial_cut(bool value);
+				void extract_royal(bool value);
+				void extract_royal_cut(bool value);
+				void extract_spectacular(bool value);
+				void extract_legendary(bool value);
+				void extract_legendary_cut(bool value);
 
+				void extract_flourite(bool value);
+				void extract_jade(bool value);
+				void extract_argonite(bool value);
+				void extract_azurite(bool value);
+				void extract_sulpher(bool value);
+				void extract_quartz(bool value);
+				void extract_tiger_eye(bool value);
 
 				void update_show_gold(bool value);
 				void update_show_runes(bool value);

include/diablo2/d2common.h

@@ -946,14 +946,14 @@ namespace diablo2 {
 		UNIT_STAT_UNUSED_68 = 484,
 		UNIT_STAT_UNUSED_69 = 485,
 		UNIT_STAT_UNUSED_70 = 486,
-		UNIT_STAT_UNUSED_71 = 487,
-		UNIT_STAT_UNUSED_72 = 488,
-		UNIT_STAT_UNUSED_73 = 489,
-		UNIT_STAT_UNUSED_74 = 490,
-		UNIT_STAT_UNUSED_75 = 491,
-		UNIT_STAT_UNUSED_76 = 492,
-		UNIT_STAT_UNUSED_77 = 493,
-		UNIT_STAT_UNUSED_78 = 494,
+		UNIT_STAT_gembag_Stones_Flourite = 487,
+		UNIT_STAT_gembag_Stones_Jade = 488,
+		UNIT_STAT_gembag_Stones_Argonite = 489,
+		UNIT_STAT_gembag_Stones_Azurite = 490,
+		UNIT_STAT_gembag_Stones_Sulpher = 491,
+		UNIT_STAT_gembag_Stones_Quartz = 492,
+		UNIT_STAT_gembag_Stones_TigerEye = 493,
+		UNIT_STAT_BoH_Desc = 494,
 		UNIT_STAT_runebag_RunesE = 495,
 		UNIT_STAT_runebag_RunesF = 496,
 		UNIT_STAT_passive_sum_mastery = 497,
@@ -1050,6 +1050,5 @@ namespace diablo2 {
 		//D2Common.0x6FD576D0 (#10601)
 		// D2ItemsTxt* __stdcall DATATBLS_GetItemRecordFromItemCode(uint32_t dwCode, int* pItemId)
 		static structures::items_line* get_item_record_from_item_code(uint32_t dwCode, int* pItemId);
-
 	};
 }

include/diablo2/d2win.h

@@ -23,7 +23,7 @@ namespace diablo2 {
 		UI_COLOR_DARK_WHITE = 0xF,
 		UI_COLOR_LIGHT_GREY = 0x10,
 	};
-
+	 
 	enum ui_font_t {
 		UI_FONT_8 = 0,
 		UI_FONT_16 = 1,

src/d2tweaks/server/modules/item_move/item_move_server.cpp

@@ -73,6 +73,10 @@ bool d2_tweaks::server::modules::item_move::handle_packet(diablo2::structures::g
 	//MessageBox(NULL, bag_guid.c_str(), "Bag GUID", MB_OK | MB_ICONINFORMATION);
 
 
+	// display itemMove->iCode in a messagebox
+	std::string iCode = std::to_string(itemMove->iCode);
+	//MessageBox(NULL, iCode.c_str(), "iCode", MB_OK | MB_ICONINFORMATION);
+
 	if (itemMove->extract == 1) {
 
 		// display bag guid in a messagebox 

src/d2tweaks/ui/ui_manager.cpp

@@ -151,21 +151,7 @@ const char* ITEMS_armor_and_weapons[] = {
 	"drd", "dre", "drf", "bab", "bac", "bad", "bae", "baf", "pab", "pac",
 	"pad", "pae", "paf", "neb", "neg", "ned", "nee", "nef", "tor", "ooc",
 	"eaq", "ebq", "ib1", "ib3",
-	// stones
-	"abc", "abd", "abe", "abf", "abg", "abh", "abi", "abj", "abk", "abl",
-	"abm", "abn", "abo", "abp", "abq", "abr", "abs", "abt", "abu", "abv",
-	"abw", "abx", "aby", "abz", "ab0", "ab1", "ab2", "ab3", "ab4", "ab5",
-	"ab6", "ab7", "ab8", "ab9", "acb", "acd", "ace", "acf", "acg", "ach",
-	"aci", "acj", "ack", "acl", "acm", "acn", "aco", "acp", "acq", "acr",
-	"acs", "act", "acu", "acv", "acw", "acx", "acy", "acz", "ac0", "ac1",
-	"ac2", "ac3", "ac4", "ac5", "ac6", "ac7", "ac8", "ac9", "adb", "adc",
-	"ade", "adf", "adg", "adh", "adi", "adj", "adk", "adl", "adm", "adn",
-	"ado", "adp", "adq", "adr", "ads", "adt", "adu", "adv", "adw", "adx",
-	"ady", "adz", "ad0", "ad1", "ad2", "ad3", "ad4", "ad5", "ad6", "ad7",
-	"ad8", "ad9", "aeb", "aec", "aed", "aef", "aeg", "aeh", "aei", "aej",
-	"aek", "ael", "aem", "aen", "aeo", "aep", "aeq", "aer", "aes", "aet",
-	"aeu", "aev", "aew", "aex", "aey", "aez", "ae0", "ae1", "ae2", "ae3",
-	"ae4", "ae5", "ae6",
+
 	// demon keys/chests
 	"dkr1", "dkr2", "dkr3", "dkr4", "dkr5", "da1", "db1", "dc1"
 	// crafting items
@@ -186,6 +172,24 @@ const char* ITEMS_gems_and_runes[] = {
 	
 };
 
+const char* ITEMS_Stones[] = {
+	// stones
+	"abc", "abd", "abe", "abf", "abg", "abh", "abi", "abj", "abk", "abl",
+	"abm", "abn", "abo", "abp", "abq", "abr", "abs", "abt", "abu", "abv",
+	"abw", "abx", "aby", "abz", "ab0", "ab1", "ab2", "ab3", "ab4", "ab5",
+	"ab6", "ab7", "ab8", "ab9", "acb", "acd", "ace", "acf", "acg", "ach",
+	"aci", "acj", "ack", "acl", "acm", "acn", "aco", "acp", "acq", "acr",
+	"acs", "act", "acu", "acv", "acw", "acx", "acy", "acz", "ac0", "ac1",
+	"ac2", "ac3", "ac4", "ac5", "ac6", "ac7", "ac8", "ac9", "adb", "adc",
+	"ade", "adf", "adg", "adh", "adi", "adj", "adk", "adl", "adm", "adn",
+	"ado", "adp", "adq", "adr", "ads", "adt", "adu", "adv", "adw", "adx",
+	"ady", "adz", "ad0", "ad1", "ad2", "ad3", "ad4", "ad5", "ad6", "ad7",
+	"ad8", "ad9", "aeb", "aec", "aed", "aef", "aeg", "aeh", "aei", "aej",
+	"aek", "ael", "aem", "aen", "aeo", "aep", "aeq", "aer", "aes", "aet",
+	"aeu", "aev", "aew", "aex", "aey", "aez", "ae0", "ae1", "ae2", "ae3",
+	"ae4", "ae5", "ae6",
+};
+
 // Define a structure named GemType
 struct GemType {
 	// Comment: The number of chipped gems of this type
@@ -195,6 +199,11 @@ struct GemType {
 	int rowID;
 };
 
+// Gem/Rune Extractors
+static std::unordered_map<std::string, GemType> stoneTypes = {
+
+};
+
 // Gems/runes and their corresponding codes and properties.txt line numbers
 static std::unordered_map<std::string, GemType> gemTypes = {
 	{"gcv", {1, 382}},   // Chipped Amethyst
@@ -264,7 +273,141 @@ static std::unordered_map<std::string, GemType> gemTypes = {
 	{"r30", {243, 392}}, // Ber Rune
 	{"r31", {1, 393}},   // Jah Rune
 	{"r32", {2, 393}},   // Cham Rune
-	{"r33", {4, 393}}    // Zod Rune
+	{"r33", {4, 393}},    // Zod Rune
+	//stones
+	{"abc", {1, 351}},
+	{"abd", {2, 351}},
+	{"abe", {4, 351}},
+	{"abf", {8, 351}},
+	{"abg", {16, 351}},
+	{"abh", {32, 351}},
+	{"abi", {64, 351}},
+	{"abj", {128, 351}},
+	{"abk", {256, 351}},
+	{"abl", {512, 351}},
+	{"abm", {1024, 351}},
+	{"abn", {2048, 351}},
+	{"abo", {4096, 351}},
+	{"abp", {8192, 351}},
+	{"abq", {16384, 351}},
+	{"abr", {32768, 351}},
+	{"abs", {65536, 351}},
+	{"abt", {131072, 351}},
+	{"abu", {262144, 351}},
+	{"abv", {1, 352}},
+	{"abw", {2, 352}},
+	{"abx", {4, 352}},
+	{"aby", {8, 352}},
+	{"abz", {16, 352}},
+	{"ab0", {32, 352}},
+	{"ab1", {64, 352}},
+	{"ab2", {128, 352}},
+	{"ab3", {256, 352}},
+	{"ab4", {512, 352}},
+	{"ab5", {1024, 352}},
+	{"ab6", {2048, 352}},
+	{"ab7", {4096, 352}},
+	{"ab8", {8192, 352}},
+	{"ab9", {16384, 352}},
+	{"acb", {32768, 352}},
+	{"acd", {65536, 352}},
+	{"ace", {131072, 352}},
+	{"acf", {262144, 352}},
+	{"acg", {1, 353}},
+	{"ach", {2, 353}},
+	{"aci", {4, 353}},
+	{"acj", {8, 353}},
+	{"ack", {16, 353}},
+	{"acl", {32, 353}},
+	{"acm", {64, 353}},
+	{"acn", {128, 353}},
+	{"aco", {256, 353}},
+	{"acp", {512, 353}},
+	{"acq", {1024, 353}},
+	{"acr", {2048, 353}},
+	{"acs", {4096, 353}},
+	{"act", {8192, 353}},
+	{"acu", {16384, 353}},
+	{"acv", {32768, 353}},
+	{"acw", {65536, 353}},
+	{"acx", {131072, 353}},
+	{"acy", {262144, 353}},
+	{"acz", {1, 354}},
+	{"ac0", {2, 354}},
+	{"ac1", {4, 354}},
+	{"ac2", {8, 354}},
+	{"ac3", {16, 354}},
+	{"ac4", {32, 354}},
+	{"ac5", {64, 354}},
+	{"ac6", {128, 354}},
+	{"ac7", {256, 354}},
+	{"ac8", {512, 354}},
+	{"ac9", {1024, 354}},
+	{"adb", {2048, 354}},
+	{"adc", {4096, 354}},
+	{"ade", {8192, 354}},
+	{"adf", {16384, 354}},
+	{"adg", {32768, 354}},
+	{"adh", {65536, 354}},
+	{"adi", {131072, 354}},
+	{"adj", {262144, 354}},
+	{"adk", {1, 355}},
+	{"adl", {2, 355}},
+	{"adm", {4, 355}},
+	{"adn", {8, 355}},
+	{"ado", {16, 355}},
+	{"adp", {32, 355}},
+	{"adq", {64, 355}},
+	{"adr", {128, 355}},
+	{"ads", {256, 355}},
+	{"adt", {512, 355}},
+	{"adu", {1024, 355}},
+	{"adv", {2048, 355}},
+	{"adw", {4096, 355}},
+	{"adx", {8192, 355}},
+	{"ady", {16384, 355}},
+	{"adz", {32768, 355}},
+	{"ad0", {65536, 355}},
+	{"ad1", {131072, 355}},
+	{"ad2", {262144, 355}},
+	{"ad3", {1, 356}},
+	{"ad4", {2, 356}},
+	{"ad5", {4, 356}},
+	{"ad6", {8, 356}},
+	{"ad7", {16, 356}},
+	{"ad8", {32, 356}},
+	{"ad9", {64, 356}},
+	{"aeb", {128, 356}},
+	{"aec", {256, 356}},
+	{"aed", {512, 356}},
+	{"aef", {1024, 356}},
+	{"aeg", {2048, 356}},
+	{"aeh", {4096, 356}},
+	{"aei", {8192, 356}},
+	{"aej", {16384, 356}},
+	{"aek", {32768, 356}},
+	{"ael", {65536, 356}},
+	{"aem", {131072, 356}},
+	{"aen", {262144, 356}},
+	{"aeo", {1, 357}},
+	{"aep", {2, 357}},
+	{"aeq", {4, 357}},
+	{"aer", {8, 357}},
+	{"aes", {16, 357}},
+	{"aet", {32, 357}},
+	{"aeu", {64, 357}},
+	{"aev", {128, 357}},
+	{"aew", {256, 357}},
+	{"aex", {512, 357}},
+	{"aey", {1024, 357}},
+	{"aez", {2048, 357}},
+	{"ae0", {4096, 357}},
+	{"ae1", {8192, 357}},
+	{"ae2", {16384, 357}},
+	{"ae3", {32768, 357}},
+	{"ae4", {65536, 357}},
+	{"ae5", {131072, 357}},
+	{"ae6", {262144, 357}},
 };
 
 // Gem/Rune Extractors
@@ -359,6 +502,16 @@ bool isArmorOrWeaponCode(const char* normCode) {
 	return false;
 }
 
+bool isStoneCode(const char* normCode) {
+	// Iterate over the gemRuneCodes array and check if normCode matches any of the codes
+	for (const auto& code : ITEMS_Stones) {
+		if (strncmp(normCode, code, 3) == 0) {
+			return true;
+		}
+	}
+	return false;
+}
+
 LRESULT d2_tweaks::ui::ui_manager::wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 	static auto& instance = singleton<ui_manager>::instance();