Change magic alliance number to enum, upgrades