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

Raiders take pseudohept into account

This commit is contained in:
Zeno Rogue 2018-05-04 12:41:36 +02:00
parent 1c07230f88
commit 4bf892442f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game.cpp
View File

@ -851,13 +851,13 @@ bool passable_for(eMonster m, cell *w, cell *from, flagtype extra) {
if(extra & P_ONPLAYER) {
if(isPlayerOn(w)) return true;
}
return !ctof(w) && passable(w, from, extra);
return !pseudohept(w) && passable(w, from, extra);
}
if(m == moAltDemon) {
if(extra & P_ONPLAYER) {
if(isPlayerOn(w)) return true;
}
return (!w || !from || w==from || ctof(w) || ctof(from)) && passable(w, from, extra);
return (!w || !from || w==from || pseudohept(w) || pseudohept(from)) && passable(w, from, extra);
}
if(m == moMonk) {
if(extra & P_ONPLAYER) {

2
landgen.cpp
View File

@ -97,7 +97,7 @@ bool out_ruin(cell *c) {
eMonster genRuinMonster(cell *c) {
eMonster m = pick(moHexDemon, moHexDemon, moHexDemon, moAltDemon, moAltDemon, moMonk, moMonk, moSkeleton, moSkeleton, moCrusher);
if(m == moHexDemon && ctof(c))
if(m == moHexDemon && pseudohept(c))
return genRuinMonster(c);
if(m == moMonk) {
if(c->item) return genRuinMonster(c);