mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

crossbow:: no more mimics attacking in melee, or swinging at mirrors

This commit is contained in:
Zeno Rogue 2023-10-29 09:21:49 +01:00
parent b84e751d96
commit c91dc341ae
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
complex.cpp
View File

@ -1457,7 +1457,7 @@ EX namespace mirror {
if(c2->monst) {
c->monst = moMimic;
eMonster m2 = c2->monst;
if(!peace::on && canAttack(c,moMimic,c2,m2, 0)) {
if(!peace::on && !bow::crossbow_mode() && canAttack(c,moMimic,c2,m2, 0)) {
attackMonster(c2, AF_NORMAL | AF_MSG, moMimic);
if(!fwd) produceGhost(c2, m2, moMimic);
sideAttack(c, m.second.spin, m2, 0);

4
pcmove.cpp
View File

@ -913,7 +913,7 @@ bool pcmove::after_escape() {
c2->wall == waBigTree ||
c2->wall == waSmallTree ||
(c2->wall == waShrub && items[itOrbSlaying]) ||
c2->wall == waMirrorWall;
(c2->wall == waMirrorWall && !bow::crossbow_mode());
if(attackable && markOrb(itOrbAether) && c2->wall != waMirrorWall)
attackable = false;
bool nm; nm = attackable;
@ -952,7 +952,7 @@ bool pcmove::after_escape() {
c2->wall = waSmallTree;
return swing();
}
if(!peace::on) {
if(!peace::on && !bow::crossbow_mode()) {
if(c2->wall == waMirrorWall)
addMessage(XLAT("You swing your sword at the mirror."));
else if(c2->wall)