Improved TNT pickup randomisation