BattlescapeGenerator: refactor addAlien(), addCivilian()

- etc.
CivilianBAIState: format
etc.