Refactor pickups (#278)

Separated from map objects
Remove counting pickup scoring twice