Fixed issue where combat was generated on load instead of when combat was entered

fixes #143