It would be nice if there was a way that, if a monster/townsperson is non-hostile, the game would swap places with them without having to do two prompts ("do you want to attack? No. "do you want to swap places?" Yes.). I realise this would require another way to force the character to attack a non-hostile, but I think that situations where you're going to be swapping with non-hostiles are far more common than ones where you're going to be attacking. Maybe have it that when you hold shift while walking it triggers the prompts (both against hostiles and non-hostiles, in the event that you have the swap with hostile monsters ability), and otherwise it does swap on non-hostile and attack on hostile.