MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

When blocking with staff (only monk) also decrease durability as with a shield

Browse source
This commit is contained in:
ThomasChr 2021-11-10 20:34:54 +01:00 • committed by Anders Jenbo
commit cbda2c848d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/player.cpp
View file

@ -1326,18 +1326,18 @@ bool DoRangeAttack(int pnum)
return false;
}
void ShieldDur(int pnum)
void DamageParryItem(int pnum)
{
if (pnum != MyPlayerId) {
return;
}
if ((DWORD)pnum >= MAX_PLRS) {
app_fatal("ShieldDur: illegal player %i", pnum);
app_fatal("DamageParryItem: illegal player %i", pnum);
}
auto &player = Players[pnum];
if (player.InvBody[INVLOC_HAND_LEFT]._itype == ItemType::Shield) {
if (player.InvBody[INVLOC_HAND_LEFT]._itype == ItemType::Shield || player.InvBody[INVLOC_HAND_LEFT]._itype == ItemType::Staff) {
if (player.InvBody[INVLOC_HAND_LEFT]._iDurability == DUR_INDESTRUCTIBLE) {
return;
}
@ -1374,7 +1374,7 @@ bool DoBlock(int pnum)
ClearStateVariables(player);
if (GenerateRnd(10) == 0) {
ShieldDur(pnum);
DamageParryItem(pnum);
}
return true;
}