Mappynappy v5

Cleaning up combat code, fixing bugs