Added checks for bats and pits, even though they aren't implemented yet