Fix unit attacking

Think this fixes the bugs in unit attacking. I've managed to play 7-8 turns until I got wrekt by the barbarian reinforcements (Issue #39).