moved powerup logic from player to powerup class;
tweaked player's weapon logic