Refactored collision adding/management

Use .type_ to specify static or moving, and .response_ to specify collision response
Powerup can change a player's weapon