It takes discovers into account. However, there are *two* badges for trackables: one for travelbugs and one for geocoins. Which is stupid, but that's the way that BadgeGen is designed. You have them both, and the total for both badges is what it should be.