Mappynappy v9

Reordered the structure of combat code