hash/d2tweaks-rnd2k
1
0
Fork 0
mirror of https://gitlab.com/hashborgir/d2tweaks-rnd2k.git synced 2024-11-30 04:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
Hash Borgir 2024-05-06 23:45:45 -06:00
parent 408aee62c1
commit 9719a540df
9 changed files with 6 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/d2tweaks/client/modules/loot_filter/loot_filter_settings.h
View File

@ -94,7 +94,6 @@ namespace d2_tweaks {
bool m_show_rejuv_potion;
bool m_show_full_rejuv_potion;
bool quality_settings[static_cast<size_t>(diablo2::structures::item_quality_t::ITEM_QUALITY_COUNT)];
char reserved[1004];

4
include/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.h
View File

@ -84,7 +84,6 @@ namespace d2_tweaks {
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;
@ -117,7 +116,7 @@ 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);
@ -198,7 +197,6 @@ namespace d2_tweaks {
void extract_rejuv_potion(bool value);
void extract_full_rejuv_potion(bool value);
//void extract_flourite(bool value);
//void extract_jade(bool value);
//void extract_argonite(bool value);

1
include/d2tweaks/common/protocol.h
View File

@ -249,7 +249,6 @@ namespace d2_tweaks {
bool extract;
uint32_t iCode;
item_move_cs() : item_guid(0), target_page(0) {
message_type = MESSAGE_TYPE_ITEM_MOVE;
}

1
include/diablo2/d2game.h
View File

@ -55,6 +55,5 @@ namespace diablo2 {
static int32_t __fastcall D2GAME_Transmogrify_6FC4A660(structures::game* pGame, structures::unit* pPlayer, structures::unit* pItem);
static diablo2::structures::unit* __fastcall diablo2::d2_game::QUESTS_CreateItem(diablo2::structures::game* pGame, diablo2::structures::unit* pPlayer, uint32_t dwCode, int32_t nLevel, uint8_t nQuality, int32_t bDroppable);
};
}

2
include/diablo2/d2win.h
View File

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

103
src/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.cpp
View File

@ -387,13 +387,13 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::register_misc_checkb
if (m_show_rejuv_potion) {
m_show_rejuv_potion->set_state(loot_filter_settings::get().m_show_rejuv_potion);
m_show_rejuv_potion->set_on_click(std::bind(&loot_filter_settings_menu::extract_rejuv_potion,
this, std::placeholders::_1));
this, std::placeholders::_1));
}
if (m_show_full_rejuv_potion) {
m_show_full_rejuv_potion->set_state(loot_filter_settings::get().m_show_full_rejuv_potion);
m_show_full_rejuv_potion->set_on_click(std::bind(&loot_filter_settings_menu::extract_full_rejuv_potion,
this, std::placeholders::_1));
this, std::placeholders::_1));
}
}
@ -922,7 +922,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_full_rejuv_p
}
}
// gems extraction functions
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_amethyst(bool value) {}
@ -945,12 +944,9 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_topaz(bool v
// Implementation goes here
}
// stones
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_rough(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -991,7 +987,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_rough(bool v
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -1036,10 +1031,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_rough(bool v
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_faded(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -1080,8 +1072,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_faded(bool v
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -1126,10 +1116,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_faded(bool v
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_blemished(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -1170,9 +1157,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_blemished(bo
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -1217,10 +1201,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_blemished(bo
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_cleaned(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -1261,8 +1242,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_cleaned(bool
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -1307,10 +1286,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_cleaned(bool
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_triangle(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -1351,8 +1327,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_triangle(boo
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -1397,10 +1371,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_triangle(boo
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_trangle_cut(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -1441,8 +1412,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_trangle_cut(
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -1487,10 +1456,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_trangle_cut(
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_square(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -1531,7 +1497,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_square(bool
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -1576,10 +1541,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_square(bool
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_square_cut(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -1620,8 +1582,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_square_cut(b
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -1666,10 +1626,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_square_cut(b
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_regular(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -1710,8 +1667,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_regular(bool
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -1756,10 +1711,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_regular(bool
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_regular_cut(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -1800,7 +1752,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_regular_cut(
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -1845,10 +1796,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_regular_cut(
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_star(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -1889,8 +1837,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_star(bool va
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -1935,10 +1881,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_star(bool va
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_star_cut(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -1979,8 +1922,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_star_cut(boo
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -2025,10 +1966,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_star_cut(boo
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_imperial(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -2069,8 +2007,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_imperial(boo
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -2115,10 +2051,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_imperial(boo
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_imperial_cut(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -2159,8 +2092,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_imperial_cut
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -2205,10 +2136,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_imperial_cut
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_royal(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -2249,8 +2177,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_royal(bool v
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -2295,10 +2221,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_royal(bool v
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_royal_cut(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -2339,8 +2262,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_royal_cut(bo
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -2385,10 +2306,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_royal_cut(bo
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_spectacular(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -2429,8 +2347,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_spectacular(
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -2475,10 +2391,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_spectacular(
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_legendary(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -2519,8 +2432,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_legendary(bo
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -2565,10 +2476,7 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_legendary(bo
}
}
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_legendary_cut(bool value) {
uint32_t gemCode = 0;
int gemPropRowID = 0;
diablo2::unit_stats_t stat;
@ -2609,8 +2517,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_legendary_cu
stat = diablo2::UNIT_STAT_gembag_Stones_TigerEye;
}
loot_filter_settings::get().m_show_rough = value;
auto player = diablo2::d2_client::get_local_player();
auto inventory = player->inventory;
@ -2655,8 +2561,6 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_legendary_cu
}
}
// qualities extraction functions
void d2_tweaks::client::modules::loot_filter_settings_menu::extract_chipped(bool value) {
@ -4312,11 +4216,8 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_r33(bool val
// End Rune Extraction Functions
// Rejuv Potions
void d2_tweaks::client::modules::loot_filter_settings_menu::update_show_gold(bool value) {
loot_filter_settings::get().show_gold = value;
loot_filter_settings::get().save(diablo2::d2_client::get_local_player_name());

5
src/d2tweaks/server/modules/item_move/item_move_server.cpp
View File

@ -72,14 +72,12 @@ bool d2_tweaks::server::modules::item_move::handle_packet(diablo2::structures::g
bag_guid = std::to_string(itemMove->bag_guid);
//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
// display bag guid in a messagebox
std::string bag_guid = std::to_string(itemMove->bag_guid);
//MessageBox(NULL, bag_guid.c_str(), "Bag GUID", MB_OK | MB_ICONINFORMATION);
@ -104,7 +102,6 @@ bool d2_tweaks::server::modules::item_move::handle_packet(diablo2::structures::g
diablo2::d2_game::D2GAME_Transmogrify_6FC4A660(game, player, item);
diablo2::d2_game::QUESTS_CreateItem(game, player, reverseDWORD('gfv '), 1, diablo2::structures::ITEMQUAL_NORMAL, true);
}
else {
D2PropertyStrc itemProperty = {};

1
src/d2tweaks/ui/ui_manager.cpp
View File

@ -1141,7 +1141,6 @@ LRESULT d2_tweaks::ui::ui_manager::wnd_proc(HWND hWnd, UINT msg, WPARAM wParam,
diablo2::structures::unit* box{};
diablo2::structures::unit* harvester{};
// get the gembag item
for (auto item = player->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);

4
src/diablo2/d2game.cpp
View File

@ -157,6 +157,4 @@ int32_t __fastcall diablo2::d2_game::D2GAME_Transmogrify_6FC4A660(diablo2::struc
diablo2::structures::unit* __fastcall diablo2::d2_game::QUESTS_CreateItem(diablo2::structures::game* pGame, diablo2::structures::unit* pPlayer, uint32_t dwCode, int32_t nLevel, uint8_t nQuality, int32_t bDroppable) {
static wrap_func_fast< diablo2::structures::unit* (diablo2::structures::game*, diablo2::structures::unit*, uint32_t, int32_t, uint8_t, int32_t)>QUESTS_CreateItem(0x65DF0, get_base());
return QUESTS_CreateItem(pGame, pPlayer, dwCode, nLevel, nQuality, bDroppable);
}
}