Skip to content

Fix mastery, poison length and curse rows in the stats panel #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
errolgr wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix mastery, poison length and curse rows in the stats panel #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adaf3eb
Stats panel: apply weapon masteries only with matching weapons
errolgr Oct 5, 2026
56a6fa7
Stats panel: clamp poison length to the game's 25%-200% range
errolgr Oct 5, 2026
5c11f08
Stats panel: draw the curse resist '/' in white like the other resist…
errolgr Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions BH/Constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,6 +1490,7 @@ enum TransactionTypes
#define ITEM_TYPE_MISSILE_WEAPON 47
#define ITEM_TYPE_THROWN_WEAPON 48
#define ITEM_TYPE_HAND_TO_HAND 67
#define ITEM_TYPE_ASSASSIN_MASTERY 91
#define ITEM_TYPE_TWOHANDED_MELEE_WEAPON 114
#define ITEM_TYPE_GENERAL_WEAPON 115
#define ITEM_TYPE_ONEHANDED_MELEE_WEAPON 116
Expand Down
9 changes: 6 additions & 3 deletions BH/D2Helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,10 @@ int __stdcall GetMasteryStat(UnitAny* pUnit, int nStatId, int nSkill)
break;
case STAT_CRITICALSTRIKE:
{
if (((nSkill == SKILL_ONEHANDMASTERY && D2COMMON_11034_ITEMS_CheckItemTypes(nRightSkillItemType, ITEM_TYPE_WEAPON) && !D2COMMON_11034_ITEMS_CheckItemTypes(nRightSkillItemType, ITEM_TYPE_MISSILE_WEAPON) && !D2COMMON_11034_ITEMS_CheckItemTypes(nRightSkillItemType, ITEM_TYPE_THROWN_WEAPON)) || nRightSkillItemType <= 0) ||
(nSkill == SKILL_CLAWANDDAGGERMASTERY && D2COMMON_11034_ITEMS_CheckItemTypes(nRightSkillItemType, ITEM_TYPE_HAND_TO_HAND)) ||
// Claw and Dagger Mastery: PD2's claw skills (Tiger Strike, Fists of Fire, ...) use the "asm" item type, plain melee skills (Attack) use "weap"
bool bMeleeWeaponSkill = D2COMMON_11034_ITEMS_CheckItemTypes(nRightSkillItemType, ITEM_TYPE_WEAPON) && !D2COMMON_11034_ITEMS_CheckItemTypes(nRightSkillItemType, ITEM_TYPE_MISSILE_WEAPON) && !D2COMMON_11034_ITEMS_CheckItemTypes(nRightSkillItemType, ITEM_TYPE_THROWN_WEAPON);
if (((nSkill == SKILL_ONEHANDMASTERY && bMeleeWeaponSkill) || nRightSkillItemType <= 0) ||
(nSkill == SKILL_CLAWANDDAGGERMASTERY && (bMeleeWeaponSkill || D2COMMON_11034_ITEMS_CheckItemTypes(nRightSkillItemType, ITEM_TYPE_ASSASSIN_MASTERY))) ||
(nSkill == SKILL_THROWINGMASTERY && D2COMMON_11034_ITEMS_CheckItemTypes(nRightSkillItemType, ITEM_TYPE_THROWN_WEAPON)))
{
nStatValue = D2COMMON_10786_SKILLS_EvaluateSkillFormula(pUnit, pSkillsTxt->dwPassiveCalc3, nSkill, nSkillLevel);
Expand Down Expand Up @@ -535,7 +537,8 @@ int __stdcall GetMasteryStat(UnitAny* pUnit, int nStatId, int nSkill)
}
else
{
if (nStatId == STAT_PIERCE)
// The client's stat list carries these passive stats whatever the weapon; the critical strike chance is only added above on a match
if (nStatId == STAT_CRUSHINGBLOW || nStatId == STAT_CRUSHINGBLOW_EFFICIENCY || nStatId == STAT_CRITICALSTRIKE_MULTIPLIER || nStatId == STAT_PIERCE)
{
return -nStatValue;
}
Expand Down
6 changes: 3 additions & 3 deletions BH/Drawing/Stats/StatsDisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,14 +428,14 @@ void StatsDisplay::OnDraw()
L"Poison Resist:ÿc2 %d ÿc0/ %d ÿc4Length:ÿc: %d%%",
static_cast<int>(D2COMMON_GetUnitStat(unit, STAT_POISONRESIST, 0)) + penalty,
pMax,
(100 - penalty - pLengthReduce)
100 - max(min(pLengthReduce + penalty, 75), -100)
);
Texthook::Draw(column1,
(y += 16),
None,
6,
Gold,
L"Curse Resist:ÿc8 %d /ÿc0 75 ÿc4Length:ÿc0 %d%%",
L"Curse Resist:ÿc8 %d ÿc0/ 75 ÿc4Length:ÿc0 %d%%",
static_cast<int>(min(D2COMMON_GetUnitStat(unit, STAT_CURSE_EFFECTIVENESS, 0), 75)),
static_cast<int>(max(100 - D2COMMON_GetUnitStat(unit, STAT_CURSERESISTANCE, 0), 25)));
y += 8;
Expand Down Expand Up @@ -729,7 +729,7 @@ void StatsDisplay::OnDraw()
int nCrushingBlowEfficiency = 100 + D2COMMON_GetUnitStat(unit, STAT_CRUSHINGBLOW_EFFICIENCY, 0) + GetMasteryStat(unit, STAT_CRUSHINGBLOW_EFFICIENCY, SKILL_TWOHANDMASTERY);
int nCriticalStrike = D2COMMON_GetUnitStat(unit, STAT_CRITICALSTRIKE, 0) + D2COMMON_GetUnitStat(unit, STAT_ITEM_CRITICALSTRIKE_CHANCE, 0) + GetMasteryStat(unit, STAT_CRITICALSTRIKE, SKILL_ONEHANDMASTERY) + GetMasteryStat(unit, STAT_CRITICALSTRIKE, SKILL_THROWINGMASTERY) + GetMasteryStat(unit, STAT_CRITICALSTRIKE, SKILL_CLAWANDDAGGERMASTERY);
int nCriticalStrikeMultiplier = 200 + D2COMMON_GetUnitStat(unit, STAT_CRITICALSTRIKE_MULTIPLIER, 0) + GetMasteryStat(unit, STAT_CRITICALSTRIKE_MULTIPLIER, SKILL_JAVELINANDSPEARMASTERY);
int nPierce = D2COMMON_GetUnitStat(unit, STAT_PIERCINGATTACK, 0) + D2COMMON_GetUnitStat(unit, STAT_PIERCE, 0); //+ GetMasteryStat(unit, STAT_PIERCE, SKILL_THROWINGMASTERY);
int nPierce = D2COMMON_GetUnitStat(unit, STAT_PIERCINGATTACK, 0) + D2COMMON_GetUnitStat(unit, STAT_PIERCE, 0) + GetMasteryStat(unit, STAT_PIERCE, SKILL_THROWINGMASTERY);

Texthook::Draw(column1,
(y += 16),
Expand Down
Loading