Updated resource calculation and added all resource calc factors to nation class.