pcmove:: dont attack tree if you have flash

This commit is contained in:
Zeno Rogue 2020-03-05 22:35:58 +01:00
parent c87dc5a1f0
commit d4dfdc1a43
1 changed files with 4 additions and 2 deletions

View File

@ -716,8 +716,10 @@ bool pcmove::after_escape() {
if(forcedmovetype == fmAttack) attackable = true;
attackable = attackable && (!c2->monst || isFriendly(c2));
attackable = attackable && !nonAdjacentPlayer(cwt.at,c2);
if(attackable && fmsAttack) {
bool dont_attack = items[itOrbFlash] || items[itOrbLightning];
if(attackable && fmsAttack && !dont_attack) {
if(checkNeedMove(checkonly, true)) return false;
nextmovetype = nm ? lmAttack : lmSkip;
if(c2->wall == waSmallTree) {