Fix findNextTarget

HF #358 for you very pleasure.

BattleScenario is default for easier verification.