mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00
Code Issues Releases Wiki Activity

Allies are now immune to friendly Beauty.

Browse Source
This commit is contained in:
Zeno Rogue 2019-11-29 16:06:44 +01:00
parent bd89c1b91a
commit ea16b82c30
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game.cpp
View File

@ -3956,10 +3956,10 @@ EX void moveMonster(const movei& mi) {
if(m == moFireElemental) { makeflame(cf, 20, false); if(cf->wparam < 20) cf->wparam = 20; } if(m == moFireElemental) { makeflame(cf, 20, false); if(cf->wparam < 20) cf->wparam = 20; }
bool adj = false; bool adj = false;
if(ct->cpdist == 1 && (items[itOrb37] || !nonAdjacent(cf,ct)) && markOrb(itOrbBeauty)) if(ct->cpdist == 1 && (items[itOrb37] || !nonAdjacent(cf,ct)) && markOrb(itOrbBeauty) && !isFriendly(ct))
adj = true; adj = true;
if(!adj && items[itOrbEmpathy] && items[itOrbBeauty]) { if(!adj && items[itOrbEmpathy] && items[itOrbBeauty] && !isFriendly(ct)) {
for(int i=0; i<ct->type; i++) if(ct->move(i) && isFriendly(ct->move(i))) for(int i=0; i<ct->type; i++) if(ct->move(i) && isFriendly(ct->move(i)))
adj = true, markOrb(itOrbEmpathy), markOrb(itOrbBeauty); adj = true, markOrb(itOrbEmpathy), markOrb(itOrbBeauty);
} }