Updated map so hopefully running MapWriter isn't important
Changed default combat flag to true