General tweaks

Collisions:
- Removed intersectX function so that pick ups can be placed above
buildings.

Collisions and PickUpsFunctions:
- Replaced twoPointPickup and pickUpSelection with all purpose
pickUpValue

Constants:
- Updated to match changes