Apply change 213 to test configs

ParadoxGameConverters · Oct 27, 2012 · 38c2d5f · 38c2d5f
1 parent 1703a8c
commit 38c2d5f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/Data Files/Changelog.txt b/Data Files/Changelog.txt
@@ -215,4 +215,5 @@ Revision	Log Message
 211		Fix for gold income estimate
 212		ROTW Tech levels (European ones are completely wrong)
 213		Change economy option defaults to historical
-214		1.06 saves don't lose muslim buildings when converted by a 1.07 install
+214		1.06 saves don't lose muslim buildings when converted by a 1.07 install
+215		Apply change 213 to test configs
diff --git a/TestConfigurations/Mod/configuration.txt b/TestConfigurations/Mod/configuration.txt
@@ -6,6 +6,10 @@ configuration =
 	# Crusader Kings 2 directory: a path on your computer where Crusader Kings 2 is installed
 	CK2directory = "D:\Paradox Interactive\Crusader Kings II"
 
+
+
+	### Economy (base tax, manpower, and population) Options
+
 	# proxyMultiplierMethod: is a holding is a ruler's capital, all proxies get a multiplier. Options are:
 	#	"ones"		- the multiplier is always one (no changes)
 	#	"counting"	- counts have a multiplier of 2
@@ -16,18 +20,18 @@ configuration =
 	#			- dukes have a multiplier of 4
 	#			- kings have a multiplier of 8
 	#			- emperors have a multiplier of 16
-	proxyMultiplierMethod = "exponential"
+	proxyMultiplierMethod = "ones"
 
 	# multipleProvsMethod: if multiple CK2 provinces become one EU3 province, which method used to get all the proxies. Options are:
 	#	"sum"		- just sum all the relevant data
 	#	"average"	- get the average of all the relevant data
-	multipleProvsMethod = "sum"
+	multipleProvsMethod = "average"
 
 	# manpower: Manpower conversion method. Options are:
 	#	"historical"	- just import the manpower from the EU3 history
 	#	"converted"	- convert the manpower from the CK2 game
 	#	"blended"	- a combination of historical and converted
-	manpower = "converted"
+	manpower = "historical"
 
 	# manpowerblendamount - the amount of manpower that is historical when blended manpower is used
 	manpowerblendamount = "0.5"
@@ -36,7 +40,7 @@ configuration =
 	#	"historical"	- just import the manpower from the EU3 history
 	#	"converted"	- convert the manpower from the CK2 game
 	#	"blended"	- a combination of historical and converted
-	basetax = "converted"
+	basetax = "historical"
 
 	# basetaxblendamount - the amount of basetax that is historical when blended basetax is used
 	basetaxblendamount = "0.5"
@@ -45,7 +49,7 @@ configuration =
 	#	"historical"	- just import the manpower from the EU3 history
 	#	"converted"	- convert the manpower from the CK2 game
 	#	"blended"	- 90% of population is historical, 10% is converted
-	population = "converted"
+	population = "historical"
 
 	# populationblendamount - the amount of population that is historical when blended population is used
 	populationblendamount = "0.9"
@@ -54,6 +58,7 @@ configuration =
 	HRETitle = "e_hre"
 
 
+
 	### EU3 Options ###
 
 	# advisors setting. Options are:

diff --git a/TestConfigurations/Vanilla/configuration.txt b/TestConfigurations/Vanilla/configuration.txt
@@ -6,6 +6,10 @@ configuration =
 	# Crusader Kings 2 directory: a path on your computer where Crusader Kings 2 is installed
 	CK2directory = "D:\Paradox Interactive\Crusader Kings II"
 
+
+
+	### Economy (base tax, manpower, and population) Options
+
 	# proxyMultiplierMethod: is a holding is a ruler's capital, all proxies get a multiplier. Options are:
 	#	"ones"		- the multiplier is always one (no changes)
 	#	"counting"	- counts have a multiplier of 2
@@ -16,18 +20,18 @@ configuration =
 	#			- dukes have a multiplier of 4
 	#			- kings have a multiplier of 8
 	#			- emperors have a multiplier of 16
-	proxyMultiplierMethod = "exponential"
+	proxyMultiplierMethod = "ones"
 
 	# multipleProvsMethod: if multiple CK2 provinces become one EU3 province, which method used to get all the proxies. Options are:
 	#	"sum"		- just sum all the relevant data
 	#	"average"	- get the average of all the relevant data
-	multipleProvsMethod = "sum"
+	multipleProvsMethod = "average"
 
 	# manpower: Manpower conversion method. Options are:
 	#	"historical"	- just import the manpower from the EU3 history
 	#	"converted"	- convert the manpower from the CK2 game
 	#	"blended"	- a combination of historical and converted
-	manpower = "converted"
+	manpower = "historical"
 
 	# manpowerblendamount - the amount of manpower that is historical when blended manpower is used
 	manpowerblendamount = "0.5"
@@ -36,7 +40,7 @@ configuration =
 	#	"historical"	- just import the manpower from the EU3 history
 	#	"converted"	- convert the manpower from the CK2 game
 	#	"blended"	- a combination of historical and converted
-	basetax = "converted"
+	basetax = "historical"
 
 	# basetaxblendamount - the amount of basetax that is historical when blended basetax is used
 	basetaxblendamount = "0.5"
@@ -45,7 +49,7 @@ configuration =
 	#	"historical"	- just import the manpower from the EU3 history
 	#	"converted"	- convert the manpower from the CK2 game
 	#	"blended"	- 90% of population is historical, 10% is converted
-	population = "converted"
+	population = "historical"
 
 	# populationblendamount - the amount of population that is historical when blended population is used
 	populationblendamount = "0.9"
@@ -54,6 +58,7 @@ configuration =
 	HRETitle = "e_hre"
 
 
+
 	### EU3 Options ###
 
 	# advisors setting. Options are: