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:
commit
4f33b4297b
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user