1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-17 18:54:48 +00:00

shmup:: Bulls now correctly destroy walls they crash into

This commit is contained in:
Zeno Rogue 2022-11-03 19:36:09 +01:00
parent 4daacb7337
commit 774c8a9744

View File

@ -2433,10 +2433,16 @@ void moveMonster(monster *m, int delta) {
} }
else { else {
if(peace::on) { igo++; goto igo_retry; } if(peace::on) { igo++; goto igo_retry; }
if(m->type == moRagingBull && m->stunoff == CHARGING) if(m->type == moRagingBull && m->stunoff == CHARGING) {
auto old = m->base->monst;
m->base->monst = m->type;
beastcrash(c2, m->base);
if(m->base->monst != m->type) m->dead = true;
m->base->monst = old;
m->stunoff = curtime + BULLSTUN; m->stunoff = curtime + BULLSTUN;
} }
} }
}
if(direct) { if(direct) {
if((m->type == moPyroCultist || m->type == moCrystalSage) && curtime >= m->nextshot) { if((m->type == moPyroCultist || m->type == moCrystalSage) && curtime >= m->nextshot) {