Merge branch 'master' of https://github.com/rderekp/The-Grand-Combo

JmanThunder · May 6, 2020 · e0733db · e0733db
2 parents 42b8b5f + 7c560cc
commit e0733db
Show file tree

Hide file tree

Showing 7 changed files with 181 additions and 180 deletions.
diff --git a/The-Grand-Combo/TGC/inventions/TGC_army_inventions.txt b/The-Grand-Combo/TGC/inventions/TGC_army_inventions.txt
@@ -850,9 +850,9 @@ clausewitzian_theory = {
 		modifier = {
 			factor = 4
 			OR = {
-				# nationalvalue = nv_might
-				# nationalvalue = nv_glory
-				# nationalvalue = nv_dominion
+				nationalvalue = nv_might
+				nationalvalue = nv_glory
+				nationalvalue = nv_dominion
 				nationalvalue = nv_autocracy
 				nationalvalue = nv_tradition
 			}
@@ -889,13 +889,13 @@ jominian_attitude = {
 			OR = {
 				nationalvalue = nv_equality
 				nationalvalue = nv_productivity
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_prosperity
+				nationalvalue = nv_unity
+				nationalvalue = nv_prosperity
 			}
 		}
 		modifier = {
 			factor = 5
-			# nationalvalue = nv_fraternity
+			nationalvalue = nv_fraternity
 			nationalvalue = nv_liberty
 		}
 	}

diff --git a/The-Grand-Combo/TGC/inventions/TGC_culture_inventions.txt b/The-Grand-Combo/TGC/inventions/TGC_culture_inventions.txt
@@ -701,10 +701,10 @@ power_of_tradition = {
 			malthusian_thought = 1
 		}
 		OR = {
-			# nationalvalue = nv_independence
-			# nationalvalue = nv_progress
-			# nationalvalue = nv_loyalty
-			# nationalvalue = nv_enlightenment
+			nationalvalue = nv_independence
+			nationalvalue = nv_progress
+			nationalvalue = nv_loyalty
+			nationalvalue = nv_enlightenment
 			nationalvalue = nv_liberty
 			nationalvalue = nv_equality
 			nationalvalue = nv_productivity
@@ -730,12 +730,12 @@ power_of_tradition = {
 		modifier = {
 			factor = -2
 			nationalvalue = nv_liberty
-			# nationalvalue = nv_independence
+			nationalvalue = nv_independence
 		}
 		modifier = {
 			factor = 5
 			nationalvalue = nv_productivity
-			# nationalvalue = nv_progress
+			nationalvalue = nv_progress
 		}
 	}
 	effect = {
@@ -804,7 +804,7 @@ anticlericalism = {
 		modifier = {
 			factor = 2
 			nationalvalue = nv_equality
-			# nationalvalue = nv_freedom
+			nationalvalue = nv_freedom
 		}
 	}
 	core_pop_consciousness_modifier = 0.03
@@ -834,8 +834,8 @@ aristocracy = {
 			OR = {
 				nationalvalue = nv_order
 				nationalvalue = nv_autocracy
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_dominion
+				nationalvalue = nv_unity
+				nationalvalue = nv_dominion
 			}
 		}
 		modifier = {
@@ -874,13 +874,13 @@ bureaucracy = {
 			OR = {
 				nationalvalue = nv_liberty
 				nationalvalue = nv_productivity
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_prosperity
+				nationalvalue = nv_unity
+				nationalvalue = nv_prosperity
 			}
 		}
 		modifier = {
 			factor = 5
-			# nationalvalue = nv_fraternity
+			nationalvalue = nv_fraternity
 			nationalvalue = nv_equality
 		}
 	}
@@ -907,8 +907,8 @@ clericalism = {
 			OR = {
 				nationalvalue = nv_order
 				nationalvalue = nv_autocracy
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_dominion
+				nationalvalue = nv_unity
+				nationalvalue = nv_dominion
 			}
 		}
 		modifier = {
@@ -944,8 +944,8 @@ establishment = {
 			OR = {
 				nationalvalue = nv_order
 				nationalvalue = nv_autocracy
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_dominion
+				nationalvalue = nv_unity
+				nationalvalue = nv_dominion
 			}
 		}
 		modifier = {
@@ -985,8 +985,8 @@ meritocracy = {
 			factor = 4
 #			OR = {
 				nationalvalue = nv_liberty
-				# nationalvalue = nv_prosperity
-				# nationalvalue = nv_glory
+				nationalvalue = nv_prosperity
+				nationalvalue = nv_glory
 #			}
 		}
 		modifier = {
@@ -1023,14 +1023,14 @@ nepotism = {
 			OR = {
 				nationalvalue = nv_order
 				nationalvalue = nv_autocracy
-				# nationalvalue = nv_might
-				# nationalvalue = nv_glory
-				# nationalvalue = nv_dominion
+				nationalvalue = nv_might
+				nationalvalue = nv_glory
+				nationalvalue = nv_dominion
 			}
 		}
 		modifier = {
 			factor = 5
-			# nationalvalue = nv_supremacy
+			nationalvalue = nv_supremacy
 			nationalvalue = nv_tradition
 		}
 	}
@@ -1057,14 +1057,14 @@ populism = {
 			OR = {
 				nationalvalue = nv_liberty
 				nationalvalue = nv_productivity
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_prosperity
+				nationalvalue = nv_unity
+				nationalvalue = nv_prosperity
 			}
 		}
 		modifier = {
 			factor = 2
 			nationalvalue = nv_equality
-			# nationalvalue = nv_fraternity
+			nationalvalue = nv_fraternity
 		}
 	}
 	social_reform_desire = 0.05
@@ -1136,14 +1136,14 @@ lenin = {
 			OR = {
 				nationalvalue = nv_order
 				nationalvalue = nv_productivity
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_prosperity
+				nationalvalue = nv_unity
+				nationalvalue = nv_prosperity
 			}
 		}
 		modifier = {
 			factor = 3
 			nationalvalue = nv_equality
-			# nationalvalue = nv_fraternity
+			nationalvalue = nv_fraternity
 		}
 		modifier = {
 			factor = -3
@@ -1195,14 +1195,14 @@ mussolini = {
 			OR = {
 				nationalvalue = nv_productivity
 				nationalvalue = nv_liberty
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_prosperity
+				nationalvalue = nv_unity
+				nationalvalue = nv_prosperity
 			}
 		}
 		modifier = {
 			factor = -3
 			nationalvalue = nv_equality
-			# nationalvalue = nv_fraternity
+			nationalvalue = nv_fraternity
 		}
 	}
 	social_reform_desire = -0.2
@@ -1239,7 +1239,7 @@ trotsky = {
 		modifier = {
 			factor = 3
 			nationalvalue = nv_equality
-			# nationalvalue = nv_fraternity
+			nationalvalue = nv_fraternity
 		}
 	}
 	social_reform_desire = 0.05

diff --git a/The-Grand-Combo/TGC/inventions/TGC_culture_inventions_removed.txt b/The-Grand-Combo/TGC/inventions/TGC_culture_inventions_removed.txt
@@ -86,30 +86,30 @@
 		# modifier = {
 			# factor = 1
 			# OR = {
-				# nationalvalue = nv_equality
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_prosperity
+				nationalvalue = nv_equality
+				nationalvalue = nv_unity
+				nationalvalue = nv_prosperity
 			# }
 		# }
 		# modifier = {
 			# factor = 2
-			# nationalvalue = nv_fraternity
+			nationalvalue = nv_fraternity
 		# }
 		# modifier = {
 			# factor = 5
 			# average_militancy = 4
 		# }
 		# modifier = {
 			# factor = 4
-			# nationalvalue = nv_enlightenment
+			nationalvalue = nv_enlightenment
 		# }
 		# modifier = {
 			# factor = 2
-			# nationalvalue = nv_loyalty
+			nationalvalue = nv_loyalty
 		# }
 		# modifier = {
 			# factor = 6
-			# nationalvalue = nv_progress
+			nationalvalue = nv_progress
 		# }
 		# modifier = {
 			# factor = -3
@@ -144,30 +144,30 @@
 		# modifier = {
 			# factor = 1
 			# OR = {
-				# nationalvalue = nv_equality
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_prosperity
+				nationalvalue = nv_equality
+				nationalvalue = nv_unity
+				nationalvalue = nv_prosperity
 			# }
 		# }
 		# modifier = {
 			# factor = 2
-			# nationalvalue = nv_fraternity
+			nationalvalue = nv_fraternity
 		# }
 		# modifier = {
 			# factor = 5
 			# average_militancy = 4
 		# }
 		# modifier = {
 			# factor = 4
-			# nationalvalue = nv_enlightenment
+			nationalvalue = nv_enlightenment
 		# }
 		# modifier = {
 			# factor = 2
-			# nationalvalue = nv_loyalty
+			nationalvalue = nv_loyalty
 		# }
 		# modifier = {
 			# factor = 6
-			# nationalvalue = nv_progress
+			nationalvalue = nv_progress
 		# }
 		# modifier = {
 			# factor = -3
@@ -206,14 +206,14 @@
 		# modifier = {
 			# factor = 1
 			# OR = {
-				# nationalvalue = nv_order
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_dominion
+				nationalvalue = nv_order
+				nationalvalue = nv_unity
+				nationalvalue = nv_dominion
 			# }
 		# }
 		# modifier = {
 			# factor = 2
-			# nationalvalue = nv_productivity
+			nationalvalue = nv_productivity
 		# }
 	# }
 	# effect = {
@@ -240,14 +240,14 @@
 		# modifier = {
 			# factor = 1
 			# OR = {
-				# nationalvalue = nv_order
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_dominion
+				nationalvalue = nv_order
+				nationalvalue = nv_unity
+				nationalvalue = nv_dominion
 			# }
 		# }
 		# modifier = {
 			# factor = 2
-			# nationalvalue = nv_productivity
+			nationalvalue = nv_productivity
 		# }
 	# }
 	# effect = {
@@ -274,15 +274,15 @@
 		# modifier = {
 			# factor = 1
 			# OR = {
-				# nationalvalue = nv_order
-				# # nationalvalue = nv_unity
-				# # nationalvalue = nv_dominion
-				# nationalvalue = nv_autocracy
+				nationalvalue = nv_order
+				# nationalvalue = nv_unity
+				# nationalvalue = nv_dominion
+				nationalvalue = nv_autocracy
 			# }
 		# }
 		# modifier = {
 			# factor = 2
-			# nationalvalue = nv_productivity
+			nationalvalue = nv_productivity
 		# }
 	# }
 	# effect = {
@@ -343,26 +343,26 @@
 		# modifier = {
 			# factor = 5
 			# OR = {
-				# nationalvalue = nv_liberty
-				# nationalvalue = nv_prosperity
-				# nationalvalue = nv_glory
+				nationalvalue = nv_liberty
+				nationalvalue = nv_prosperity
+				nationalvalue = nv_glory
 			# }
 		# }
 		# modifier = {
 			# factor = 8
-			# nationalvalue = nv_freedom
+			nationalvalue = nv_freedom
 		# }
 		# modifier = {
 			# factor = 5
 			# OR = {
-				# nationalvalue = nv_equality
-				# nationalvalue = nv_unity
-				# nationalvalue = nv_prosperity
+				nationalvalue = nv_equality
+				nationalvalue = nv_unity
+				nationalvalue = nv_prosperity
 			# }
 		# }
 		# modifier = {
 			# factor = 8
-			# nationalvalue = nv_fraternity
+			nationalvalue = nv_fraternity
 		# }
 		# modifier = {
 			# factor = -8