Have checks for upgrades in the same order as checks for weapons purchases.

This fixes ‘not enough funds’ when the item is actually unavailable.