Improved pickup and damage logic