Combat stuff "done"

Villain now shoots, player can die and re-spawn.
merge