mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2026-05-31 18:02:10 +00:00
Merge branch 'master' of https://github.com/zenorogue/hyperrogue
This commit is contained in:
+5
-1
@@ -569,6 +569,10 @@ void apply_chaos() {
|
||||
if(!items[itOrbChaos] || chaos_forbidden(ca) || chaos_forbidden(cb)) return;
|
||||
if(ca && is_paired(ca->monst)) killMonster(ca, 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(cb);
|
||||
gcell coa = *ca;
|
||||
@@ -945,7 +949,7 @@ void pcmove::tell_why_impassable() {
|
||||
if(vmsg(miRESTRICTED))
|
||||
blowaway_message(c2);
|
||||
}
|
||||
else if(isAlch(c2)) {
|
||||
else if(anti_alchemy(c2, cwt.at)) {
|
||||
if(vmsg(miRESTRICTED))
|
||||
addMessage(XLAT("Wrong color!"));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user