1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-06-21 04:39:58 +00:00

Speed Witches are no longer incorrectly considered as threats (but Flash Witches are real\!)

This commit is contained in:
Zeno Rogue 2020-08-20 16:21:44 +02:00
parent a4b7819fff
commit 7f636a2a7c

View File

@ -96,9 +96,11 @@ EX bool monstersnear(stalemate1& sm) {
// only these monsters can attack from two spots...
if(!among(c3->monst, moLancer, moWitchSpeed, moWitchFlash))
continue;
if(c3->monst == moWitchSpeed && cwt.at->land != laPower)
continue;
// take logical_adjacent into account
if(c3->monst != moWitchFlash)
if(!logical_adjacent(c3, c3->monst, c2) || !logical_adjacent(c2, c3->monst, c))
if(!logical_adjacent(c3, c3->monst, c2) || !logical_adjacent(c2, c3->monst, c) || (c3->monst == moWitchSpeed && c2->land != laPower))
continue;
if(elec::affected(c3)) continue;
if(c3->stuntime > (sm.who == moPlayer ? 0 : 1)) continue;