Add second method of tech group conversion

Data Files/Changelog.txt

@@ -358,4 +358,5 @@ Revision	Log Message
 351
 352
 353
-354		Unlanded countries inherit tech group from holder of their potential capital
+354		Unlanded countries inherit tech group from holder of their potential capital
+355		Add second method of tech group conversion

Data Files/configuration.txt

@@ -7,6 +7,13 @@ configuration =
 	CK2directory = "D:\Paradox Interactive\Crusader Kings II"
 
 
+	### Tech Options
+
+	# techGroupMethod: the method by which tech groups are determined. Options are:
+	#	"learningRate" - use the CK2 learning rate to determine tech groups
+	#	"culturalTech" - use the amount of tech gained in CK2, broken down by relious and culture groups, to determine tech. NOTE: do not use this option along with mods, as it relies heavily on default religions and cultures
+	techGroupMethod = "learningRate"
+
 
 	### Economy (base tax, manpower, and population) Options
 

Source/Configuration.cpp

@@ -33,17 +33,20 @@ Configuration::Configuration()
 
 	CK2Path		= obj[0]->getLeaf("CK2directory");
 	EU3Path		= obj[0]->getLeaf("EU3directory");
-	proxyMultiplierMethod = obj[0]->getLeaf("proxyMultiplierMethod");
-	multipleProvsMethod = obj[0]->getLeaf("multipleProvsMethod");
-	manpower		= obj[0]->getLeaf("manpower");
+
+	techGroupMethod	= obj[0]->getLeaf("techGroupMethod");
+
+	proxyMultiplierMethod	= obj[0]->getLeaf("proxyMultiplierMethod");
+	multipleProvsMethod		= obj[0]->getLeaf("multipleProvsMethod");
+	manpower						= obj[0]->getLeaf("manpower");
 	manpowerblendamount		= obj[0]->getLeaf("manpowerblendamount");
-	basetax		= obj[0]->getLeaf("basetax");
+	basetax						= obj[0]->getLeaf("basetax");
 	basetaxblendamount		= obj[0]->getLeaf("basetaxblendamount");
-	population	= obj[0]->getLeaf("population");
+	population					= obj[0]->getLeaf("population");
 	populationblendamount	= obj[0]->getLeaf("populationblendamount");
-	HRETitle		= obj[0]->getLeaf("HRETitle");
-	mergeTitles	= obj[0]->getLeaf("mergeTitles");
-	vassalScore	= obj[0]->getLeaf("vassalScore");
+	HRETitle						= obj[0]->getLeaf("HRETitle");
+	mergeTitles					= obj[0]->getLeaf("mergeTitles");
+	vassalScore					= obj[0]->getLeaf("vassalScore");
 
 	advisors				= obj[0]->getLeaf("advisors");
 	leaders				= obj[0]->getLeaf("leaders");

Source/Configuration.h

@@ -22,6 +22,11 @@ class Configuration // Singleton
 		return getInstance()->EU3Path;
 	}
 
+	static string getTechGroupMethod()
+	{
+		return getInstance()->techGroupMethod;
+	}
+
 	static string getProxyMultiplierMethod()
 	{
 		return getInstance()->proxyMultiplierMethod;
@@ -160,6 +165,9 @@ class Configuration // Singleton
 
 	string	CK2Path;
 	string	EU3Path;
+
+	string	techGroupMethod;
+
 	string	proxyMultiplierMethod;
 	string	multipleProvsMethod;
 	string	manpower;

Source/EU3World/EU3Country.cpp

@@ -732,6 +732,27 @@ void EU3Country::determineLearningScore()
 	learningScore /= numBaronies;
 }
 
+void EU3Country::determineTechScore()
+{
+	int numProvinces = 0;
+	for (vector<EU3Province*>::iterator provinceItr = provinces.begin(); provinceItr < provinces.end(); provinceItr++)
+	{
+		vector<CK2Province*> srcProvinces = (*provinceItr)->getSrcProvinces();
+		for (vector<CK2Province*>::iterator srcItr = srcProvinces.begin(); srcItr < srcProvinces.end(); srcItr++)
+		{
+			vector<double> techLevels = (*srcItr)->getTechLevels();
+			for (unsigned int i = 0; i < techLevels.size(); i++)
+			{
+				techScore += techLevels[i] / 24;
+			}
+			numProvinces++;
+		}
+	}
+
+	techScore /= numProvinces;
+}
+
+
 
 void EU3Country::addAcceptedCultures()
 {

Source/EU3World/EU3Country.h

@@ -30,6 +30,7 @@ class EU3Country
 
 		void						output(FILE*);
 		void						determineLearningScore();
+		void						determineTechScore();
 		void						addAcceptedCultures();
 		void						determineGovernment(double prestigeFactor);
 		void						determineEconomy(const cultureGroupMapping& cultureGroups, const map<string, double>& unitPrices);
@@ -61,6 +62,7 @@ class EU3Country
 		vector<EU3Province*>	getCores()					const { return cores; };
 		vector<EU3Advisor*>	getAdvisors()				const { return advisors; };
 		double					getLearningScore()		const { return learningScore; };
+		double					getTechScore()				const { return techScore; };
 		int						getAbsorbScore()			const	{ return absorbScore; };
 		string					getTag()						const { return tag; };
 		string					getGovernment()			const { return government; };
@@ -82,6 +84,7 @@ class EU3Country
 		vector<EU3Province*> cores;
 		vector<EU3Advisor*>	advisors;
 		double					learningScore;
+		double					techScore;
 		int						absorbScore;
 
 		string						tag;