Cleaned up combat with a new helper function, added new monster files