Skip to content

Commit

Permalink
Add always show items feature
Browse files Browse the repository at this point in the history
  • Loading branch information
Dylan Premo committed Sep 3, 2021
1 parent 84caa65 commit 8672586
Show file tree
Hide file tree
Showing 4 changed files with 140 additions and 35 deletions.
2 changes: 1 addition & 1 deletion BH/BH.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void BH::Initialize()
SetWindowLong(D2GFX_GetHwnd(), GWL_WNDPROC, (LONG)GameWindowEvent);
});

settingsUI = new Drawing::UI("Settings", 400, 277);
settingsUI = new Drawing::UI("Settings", 400, 292);

Task::InitializeThreadPool(2);

Expand Down
163 changes: 129 additions & 34 deletions BH/Modules/Item/Item.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ Patch* viewInvPatch1 = new Patch(Call, D2CLIENT, { 0x953E2, 0x997B2 }, (int)View
Patch* viewInvPatch2 = new Patch(Call, D2CLIENT, { 0x94AB4, 0x98E84 }, (int)ViewInventoryPatch2_ASM, 6);
Patch* viewInvPatch3 = new Patch(Call, D2CLIENT, { 0x93A6F, 0x97E3F }, (int)ViewInventoryPatch3_ASM, 5);

//ported to 1.13c/d from https://github.com/jieaido/d2hackmap/blob/master/PermShowItem.cpp
Patch* permShowItems1 = new Patch(Call, D2CLIENT, { 0xC3D4E, 0x1D74E }, (int)PermShowItemsPatch1_ASM, 6);
Patch* permShowItems2 = new Patch(Call, D2CLIENT, { 0xC0E9A, 0x1A89A }, (int)PermShowItemsPatch1_ASM, 6);
Patch* permShowItems3 = new Patch(Call, D2CLIENT, { 0x59483, 0x4EA13 }, (int)PermShowItemsPatch2_ASM, 6);
Patch* permShowItems4 = new Patch(Call, D2CLIENT, { 0x5908A, 0x4E61A }, (int)PermShowItemsPatch3_ASM, 6);
Patch* permShowItems5 = new Patch(Call, D2CLIENT, { 0xA6BA3, 0x63443 }, (int)PermShowItemsPatch4_ASM, 6);

using namespace Drawing;

void Item::OnLoad() {
Expand All @@ -78,6 +85,12 @@ void Item::OnLoad() {
viewInvPatch2->Install();
viewInvPatch3->Install();

permShowItems1->Install();
permShowItems2->Install();
permShowItems3->Install();
permShowItems4->Install();
permShowItems5->Install();

itemPropertiesPatch->Install();
itemPropertyStringDamagePatch->Install();
itemPropertyStringPatch->Install();
Expand Down Expand Up @@ -111,6 +124,7 @@ void Item::LoadConfig() {
BH::config->ReadToggle("Alt Item Style", "None", true, Toggles["Alt Item Style"]);
BH::config->ReadToggle("Color Mod", "None", false, Toggles["Color Mod"]);
BH::config->ReadToggle("Shorten Item Names", "None", false, Toggles["Shorten Item Names"]);
BH::config->ReadToggle("Always Show Items", "None", false, Toggles["Always Show Items"]);
BH::config->ReadToggle("Advanced Item Display", "None", false, Toggles["Advanced Item Display"]);
BH::config->ReadToggle("Item Drop Notifications", "None", false, Toggles["Item Drop Notifications"]);
BH::config->ReadToggle("Item Close Notifications", "None", false, Toggles["Item Close Notifications"]);
Expand Down Expand Up @@ -162,6 +176,10 @@ void Item::DrawSettings() {
new Keyhook(settingsTab, keyhook_x, y+2, &Toggles["Shorten Item Names"].toggle, "");
y += 15;

new Checkhook(settingsTab, 4, y, &Toggles["Always Show Items"].state, "Always Show Items");
new Keyhook(settingsTab, keyhook_x, y + 2, &Toggles["Always Show Items"].toggle, "");
y += 15;

new Checkhook(settingsTab, 4, y, &Toggles["Always Show Item Stat Ranges"].state, "Always Show Item Stat Ranges");
new Keyhook(settingsTab, keyhook_x, y+2, &Toggles["Always Show Item Stat Ranges"].toggle, "");
y += 15;
Expand Down Expand Up @@ -223,6 +241,11 @@ void Item::OnUnload() {
viewInvPatch1->Remove();
viewInvPatch2->Remove();
viewInvPatch3->Remove();
permShowItems1->Remove();
permShowItems2->Remove();
permShowItems3->Remove();
permShowItems4->Remove();
permShowItems5->Remove();
ItemDisplay::UninitializeItemRules();
}

Expand Down Expand Up @@ -321,17 +344,17 @@ void __fastcall Item::ItemNamePatch(wchar_t *name, UnitAny *item)
}

// Some common color codes for text strings (see TextColor enum):
// ÿc; (purple)
// ÿc0 (white)
// ÿc1 (red)
// ÿc2 (green)
// ÿc3 (blue)
// ÿc4 (gold)
// ÿc5 (gray)
// ÿc6 (black)
// ÿc7 (tan)
// ÿc8 (orange)
// ÿc9 (yellow)
// ÿc; (purple)
// ÿc0 (white)
// ÿc1 (red)
// ÿc2 (green)
// ÿc3 (blue)
// ÿc4 (gold)
// ÿc5 (gray)
// ÿc6 (black)
// ÿc7 (tan)
// ÿc8 (orange)
// ÿc9 (yellow)

/* Test code to display item codes */
//string test3 = test_code;
Expand All @@ -350,12 +373,12 @@ void Item::OrigGetItemName(UnitAny *item, string &itemName, char *code)
// We will also strip ilvls from these items
if (code[0] == 't' && code[1] == 's' && code[2] == 'c') // town portal scroll
{
itemName = "ÿc2**ÿc0TP";
itemName = "ÿc2**ÿc0TP";
displayItemLevel = false;
}
else if (code[0] == 'i' && code[1] == 's' && code[2] == 'c') // identify scroll
{
itemName = "ÿc2**ÿc0ID";
itemName = "ÿc2**ÿc0ID";
displayItemLevel = false;
}
else if (code[0] == 'v' && code[1] == 'p' && code[2] == 's') // stamina potion
Expand Down Expand Up @@ -407,68 +430,68 @@ void Item::OrigGetItemName(UnitAny *item, string &itemName, char *code)
{
if (code[2] == '1')
{
itemName = "ÿc1**ÿc0Min Heal";
itemName = "ÿc1**ÿc0Min Heal";
displayItemLevel = false;
}
else if (code[2] == '2')
{
itemName = "ÿc1**ÿc0Lt Heal";
itemName = "ÿc1**ÿc0Lt Heal";
displayItemLevel = false;
}
else if (code[2] == '3')
{
itemName = "ÿc1**ÿc0Heal";
itemName = "ÿc1**ÿc0Heal";
displayItemLevel = false;
}
else if (code[2] == '4')
{
itemName = "ÿc1**ÿc0Gt Heal";
itemName = "ÿc1**ÿc0Gt Heal";
displayItemLevel = false;
}
else if (code[2] == '5')
{
itemName = "ÿc1**ÿc0Sup Heal";
itemName = "ÿc1**ÿc0Sup Heal";
displayItemLevel = false;
}
}
else if (code[0] == 'm' && code[1] == 'p') // mana potions
{
if (code[2] == '1')
{
itemName = "ÿc3**ÿc0Min Mana";
itemName = "ÿc3**ÿc0Min Mana";
displayItemLevel = false;
}
else if (code[2] == '2')
{
itemName = "ÿc3**ÿc0Lt Mana";
itemName = "ÿc3**ÿc0Lt Mana";
displayItemLevel = false;
}
else if (code[2] == '3')
{
itemName = "ÿc3**ÿc0Mana";
itemName = "ÿc3**ÿc0Mana";
displayItemLevel = false;
}
else if (code[2] == '4')
{
itemName = "ÿc3**ÿc0Gt Mana";
itemName = "ÿc3**ÿc0Gt Mana";
displayItemLevel = false;
}
else if (code[2] == '5')
{
itemName = "ÿc3**ÿc0Sup Mana";
itemName = "ÿc3**ÿc0Sup Mana";
displayItemLevel = false;
}
}
else if (code[0] == 'r' && code[1] == 'v') // rejuv potions
{
if (code[2] == 's')
{
itemName = "ÿc;**ÿc0Rejuv";
itemName = "ÿc;**ÿc0Rejuv";
displayItemLevel = false;
}
else if (code[2] == 'l')
{
itemName = "ÿc;**ÿc0Full";
itemName = "ÿc;**ÿc0Full";
displayItemLevel = false;
}
}
Expand Down Expand Up @@ -564,13 +587,13 @@ void Item::OrigGetItemName(UnitAny *item, string &itemName, char *code)
//if( (code[0] == 'g' && code[1] == 'l' ) ||
// (code[0] == 's' && code[1] == 'k' && code[2] == 'l' ) )
//{
// itemName = "ÿc:" + itemName;
// itemName = "ÿc:" + itemName;
//}
///*Perfect Gems*/
//if( (code[0] == 'g' && code[1] == 'p' ) ||
// (code[0] == 's' && code[1] == 'k' && code[2] == 'p' ) )
//{
// itemName = "ÿc<" + itemName;
// itemName = "ÿc<" + itemName;
//}
/*Ethereal*/
if( item->pItemData->dwFlags & 0x400000 )
Expand All @@ -579,41 +602,41 @@ void Item::OrigGetItemName(UnitAny *item, string &itemName, char *code)
if( (code[0] == 'u' ) ||
(code[0] == 'p' && code[1] == 'a' && code[2] >= 'b') )
{
itemName = "ÿc;" + itemName;
itemName = "ÿc;" + itemName;
}
}
/*Runes*/
if( code[0] == 'r' )
{
if( code[1] == '0' )
{
itemName = "ÿc0" + itemName;
itemName = "ÿc0" + itemName;
}
else if( code[1] == '1' )
{
if( code[2] <= '6')
{
itemName = "ÿc4" + itemName;
itemName = "ÿc4" + itemName;
}
else
{
itemName = "ÿc8" + itemName;
itemName = "ÿc8" + itemName;
}
}
else if( code[1] == '2' )
{
if( code[2] <= '2' )
{
itemName = "ÿc8" + itemName;
itemName = "ÿc8" + itemName;
}
else
{
itemName = "ÿc1" + itemName;
itemName = "ÿc1" + itemName;
}
}
else if( code[1] == '3' )
{
itemName = "ÿc1" + itemName;
itemName = "ÿc1" + itemName;
}
}
}
Expand Down Expand Up @@ -1277,3 +1300,75 @@ void __declspec(naked) ViewInventoryPatch3_ASM()
ret;
}
}

//seems to force alt to be down
BOOL Item::PermShowItemsPatch1()
{
return Toggles["Always Show Items"].state || D2CLIENT_GetUIState(UI_GROUND_ITEMS);
}

//these two seem to deal w/ fixing the inv/waypoints when alt is down
BOOL Item::PermShowItemsPatch2() {
return Toggles["Always Show Items"].state && !D2CLIENT_GetUIState(UI_GROUND_ITEMS);
}

BOOL Item::PermShowItemsPatch3() {
return Toggles["Always Show Items"].state || D2CLIENT_GetUIState(UI_GROUND_ITEMS);
}


void __declspec(naked) PermShowItemsPatch1_ASM()
{
__asm {
call Item::PermShowItemsPatch1
test eax, eax
ret
}
}


void __declspec(naked) PermShowItemsPatch2_ASM()
{
__asm {
call Item::PermShowItemsPatch2
test eax, eax
je orgcode
ret
orgcode :
mov eax, dword ptr[esp + 0x20]
test eax, eax
ret
}
}


void __declspec(naked) PermShowItemsPatch3_ASM()
{
__asm {
push ebp
push esi
call Item::PermShowItemsPatch3
test eax, eax
pop esi
pop ebp
jz outcode
cmp ebp, 0x20
jge outcode
ret
outcode :
add dword ptr[esp], 0x38A //to 6FB0DD89
ret
}
}


void __declspec(naked) PermShowItemsPatch4_ASM()
{
__asm {
push eax
call Item::PermShowItemsPatch1
mov ecx, eax
pop eax
ret
}
}
10 changes: 10 additions & 0 deletions BH/Modules/Item/Item.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ class Item : public Module {
static BOOL __stdcall OnDamagePropertyBuild(UnitAny* pItem, DamageStats* pDmgStats, int nStat, wchar_t* wOut);
static void __stdcall OnPropertyBuild(wchar_t* wOut, int nStat, UnitAny* pItem, int nStatParam);

static BOOL PermShowItemsPatch1();
static BOOL PermShowItemsPatch2();
static BOOL PermShowItemsPatch3();

static UnitAny* GetViewUnit();

static unsigned int GetFilterLevel() { return filterLevelSetting; }
Expand All @@ -96,6 +100,12 @@ void GetItemPropertyString_Interception();
void ViewInventoryPatch1_ASM();
void ViewInventoryPatch2_ASM();
void ViewInventoryPatch3_ASM();

void PermShowItemsPatch1_ASM();
void PermShowItemsPatch2_ASM();
void PermShowItemsPatch3_ASM();
void PermShowItemsPatch4_ASM();

struct UnitItemInfo;
int CreateUnitItemInfo(UnitItemInfo *uInfo, UnitAny *item);

Expand Down
Binary file modified Release/BH.dll
View file
Binary file not shown.

0 comments on commit 8672586

Please sign in to comment.