From 227270283f0e3c9a8849d28f3983705986c42730 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Fri, 17 Jun 2022 09:22:25 +0200 Subject: [PATCH] mimics are now affected by Empathy, and no longer can reverse slime colors by going through mirror --- complex.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/complex.cpp b/complex.cpp index f373e22b..2e1b66a8 100644 --- a/complex.cpp +++ b/complex.cpp @@ -1446,7 +1446,8 @@ EX namespace mirror { changes.ccell(c); if(!m.second.mirrored) nummirage++; auto cw2 = m.second + wstep; - if(inmirror(cw2)) cw2 = reflect(cw2); + bool thru = inmirror(cw2); + if(thru) cw2 = reflect(cw2); cell *c2 = cw2.at; changes.ccell(c2); if(c2->monst) { @@ -1464,7 +1465,11 @@ EX namespace mirror { else if(c2->wall == waSmallTree) c2->wall = waNone; if(fwd) { - if(noMirrorOn(c2) || !passable_for(moMimic, c2, c, P_MONSTER | P_MIRROR | P_MIRRORWALL)) { + if(thru && c == c2 && isAlchAny(c) && !checkflags(P_ISFRIEND | P_MONSTER | P_MIRROR | P_MIRRORWALL, P_AETHER)) { + survive = false; + continue; + } + if(noMirrorOn(c2) || !passable_for(moMimic, c2, c, P_ISFRIEND | P_MONSTER | P_MIRROR | P_MIRRORWALL)) { survive = false; continue; }