1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-26 18:10:35 +00:00

Merge pull request #192 from jruderman/f1

Curse of Weakness no longer allows pushing parts of multitile monsters
This commit is contained in:
Zeno Rogue 2021-07-10 09:34:45 +02:00 committed by GitHub
commit ff40a46883
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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