Use victoryCardCount if kingdom card is victory card

Also separate kingdomCardCount from NumKingdomCards.