Better ammo type switching that works