mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-09-18 18:14:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #175 from jruderman/flash_witch_a

Browse Source 
Flash Witches no longer avoid killing the player's allies
This commit is contained in:
Zeno Rogue
2021-07-04 09:38:56 +02:00
committed by GitHub
parent a8c6c8f240 efa1f575e9
commit 0799a5ea06
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
attack.cpp
View File

@@ -1099,6 +1099,7 @@ EX bool flashWouldKill(cell *c, flagtype extra) {
for(int u=0; u<c2->type; u++) {
cell *c3 = c2->move(u);
if(isWorm(c3)) continue; // immune to Flash
if(isFriendly(c3)) continue; // player's allies and mounts don't count
if(c3->monst == moEvilGolem) continue; // evil golems don't count
if(c3 != c && (c3->monst || isPlayerOn(c3))) {
bool b = canAttack(NULL, moWitchFlash, c3, c3->monst, AF_MAGIC | extra);