From 7f636a2a7c36f518f4c9a0ab1890b9ac1b7f60d1 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Thu, 20 Aug 2020 16:21:44 +0200 Subject: [PATCH] Speed Witches are no longer incorrectly considered as threats (but Flash Witches are real\!) --- checkmove.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checkmove.cpp b/checkmove.cpp index b92626e9..473b6188 100644 --- a/checkmove.cpp +++ b/checkmove.cpp @@ -96,9 +96,11 @@ EX bool monstersnear(stalemate1& sm) { // only these monsters can attack from two spots... if(!among(c3->monst, moLancer, moWitchSpeed, moWitchFlash)) continue; + if(c3->monst == moWitchSpeed && cwt.at->land != laPower) + continue; // take logical_adjacent into account if(c3->monst != moWitchFlash) - if(!logical_adjacent(c3, c3->monst, c2) || !logical_adjacent(c2, c3->monst, c)) + if(!logical_adjacent(c3, c3->monst, c2) || !logical_adjacent(c2, c3->monst, c) || (c3->monst == moWitchSpeed && c2->land != laPower)) continue; if(elec::affected(c3)) continue; if(c3->stuntime > (sm.who == moPlayer ? 0 : 1)) continue;