mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Curse of Weakness allows to push stunned monsters as originally designed

This commit is contained in:
Zeno Rogue 2021-05-22 01:22:03 +02:00
parent 9af73d9543
commit 8678a2f77f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
attack.cpp
View File

@ -1045,8 +1045,7 @@ EX void killFriendlyIvy() {
}
EX bool monsterPushable(cell *c2) {
if(markOrb(itCurseWeakness) && attackJustStuns(c2, 0, moPlayer))
return false;
if(markOrb(itCurseWeakness) && (c2->stuntime < 2 || attackJustStuns(c2, 0, moPlayer))) return false;
return (c2->monst != moFatGuard && !(isMetalBeast(c2->monst) && c2->stuntime < 2) && c2->monst != moTortoise && c2->monst != moTerraWarrior && c2->monst != moVizier && c2->monst != moWorldTurtle);
}

2
pcmove.cpp
View File

@ -926,7 +926,7 @@ bool pcmove::attack() {
mip = movei(c2, nullptr, NO_SPACE);
if(isStunnable(c2->monst) && c2->hitpoints > 1) {
if(items[itCurseWeakness] || (isStunnable(c2->monst) && c2->hitpoints > 1)) {
if(monsterPushable(c2))
mip = determinePush(cwt, subdir, [c2] (cell *c) { return passable(c, c2, P_BLOW); });
else