mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-04 14:30:35 +00:00
Code Issues Releases Wiki Activity

Orb of Air now kills Red Raiders if separating them, instead of crashing

Browse Source
This commit is contained in:
Zeno Rogue 2020-07-29 21:56:34 +02:00
parent f34205ca6b
commit ae65a1dd5f
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
attack.cpp
View File

@ -1005,7 +1005,24 @@ EX bool attackMonster(cell *c, flagtype flags, eMonster killer) {
} }
EX void pushMonster(const movei& mi) { EX void pushMonster(const movei& mi) {
moveMonster(mi); if(mi.s->monst == moPair || isMagneticPole(mi.s)) {
cell *other = mi.s->move(mi.s->mondir);
int id = neighborId(mi.t, other);
if(id == -1) {
killMonster(mi.s, moPlayer);
killMonster(other, moPlayer);
return;
}
else {
moveMonster(mi);
if(mi.t->monst) {
mi.t->mondir = id;
other->mondir = mi.t->c.spin(id);
}
}
}
else
moveMonster(mi);
auto& cf = mi.s; auto& cf = mi.s;
auto& ct = mi.t; auto& ct = mi.t;
if(ct->monst == moBrownBug) { if(ct->monst == moBrownBug) {