crossbow:: no more mimics attacking in melee, or swinging at mirrors
This commit is contained in:
parent
b84e751d96
commit
c91dc341ae
|
@ -1457,7 +1457,7 @@ EX namespace mirror {
|
||||||
if(c2->monst) {
|
if(c2->monst) {
|
||||||
c->monst = moMimic;
|
c->monst = moMimic;
|
||||||
eMonster m2 = c2->monst;
|
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);
|
attackMonster(c2, AF_NORMAL | AF_MSG, moMimic);
|
||||||
if(!fwd) produceGhost(c2, m2, moMimic);
|
if(!fwd) produceGhost(c2, m2, moMimic);
|
||||||
sideAttack(c, m.second.spin, m2, 0);
|
sideAttack(c, m.second.spin, m2, 0);
|
||||||
|
|
|
@ -913,7 +913,7 @@ bool pcmove::after_escape() {
|
||||||
c2->wall == waBigTree ||
|
c2->wall == waBigTree ||
|
||||||
c2->wall == waSmallTree ||
|
c2->wall == waSmallTree ||
|
||||||
(c2->wall == waShrub && items[itOrbSlaying]) ||
|
(c2->wall == waShrub && items[itOrbSlaying]) ||
|
||||||
c2->wall == waMirrorWall;
|
(c2->wall == waMirrorWall && !bow::crossbow_mode());
|
||||||
if(attackable && markOrb(itOrbAether) && c2->wall != waMirrorWall)
|
if(attackable && markOrb(itOrbAether) && c2->wall != waMirrorWall)
|
||||||
attackable = false;
|
attackable = false;
|
||||||
bool nm; nm = attackable;
|
bool nm; nm = attackable;
|
||||||
|
@ -952,7 +952,7 @@ bool pcmove::after_escape() {
|
||||||
c2->wall = waSmallTree;
|
c2->wall = waSmallTree;
|
||||||
return swing();
|
return swing();
|
||||||
}
|
}
|
||||||
if(!peace::on) {
|
if(!peace::on && !bow::crossbow_mode()) {
|
||||||
if(c2->wall == waMirrorWall)
|
if(c2->wall == waMirrorWall)
|
||||||
addMessage(XLAT("You swing your sword at the mirror."));
|
addMessage(XLAT("You swing your sword at the mirror."));
|
||||||
else if(c2->wall)
|
else if(c2->wall)
|
||||||
|
|
Loading…
Reference in New Issue