Updates to Ship and Weapon