1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-30 03:50:34 +00:00

Merge pull request #277 from jruderman/chaos_trap

Orb of Chaos now destroys arrow traps
This commit is contained in:
Zeno Rogue 2021-08-04 19:11:10 +02:00 committed by GitHub
commit 4f33b4297b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -569,6 +569,10 @@ void apply_chaos() {
if(!items[itOrbChaos] || chaos_forbidden(ca) || chaos_forbidden(cb)) return; if(!items[itOrbChaos] || chaos_forbidden(ca) || chaos_forbidden(cb)) return;
if(ca && is_paired(ca->monst)) killMonster(ca, moPlayer); if(ca && is_paired(ca->monst)) killMonster(ca, moPlayer);
if(cb && is_paired(cb->monst)) killMonster(cb, moPlayer); if(cb && is_paired(cb->monst)) killMonster(cb, moPlayer);
destroyTrapsOn(ca);
destroyTrapsOn(cb);
if (ca->wall == waStone) destroyTrapsAround(ca);
if (cb->wall == waStone) destroyTrapsAround(cb);
changes.ccell(ca); changes.ccell(ca);
changes.ccell(cb); changes.ccell(cb);
gcell coa = *ca; gcell coa = *ca;