Moved updatedUpgrades to gainGold method, continued combat work