Merge dev into dev-popswap

common/ages/00_default.txt

@@ -51,6 +51,8 @@ age_of_empires = {
 				NOT = { capital_scope = { superregion = iran_superregion } }
 				NOT = { capital_scope = { continent = india } }
 				NOT = { capital_scope = { superregion = arabia_superregion } }
+				NOT = { capital_scope = { superregion = suvarnabhumi_superregion } }
+				NOT = { capital_scope = { continent = china } }
 			}
 			has_discovered = 1337
 			has_discovered = 612
@@ -76,6 +78,21 @@ age_of_empires = {
 			has_discovered = 2476
 			has_discovered = 2500
 		}
+
+		obj_exploration_of_the_world_far_east = {
+			allow = {
+				OR = {
+					capital_scope = { superregion = suvarnabhumi_superregion }
+					capital_scope = { continent = china }
+				}
+			}
+			has_discovered = 4349
+			has_discovered = 4263
+			has_discovered = 4464
+			has_discovered = 4233
+			has_discovered = 4003
+			has_discovered = 4436
+		}
 
 		obj_unified_culture_group = {
 			allow = { always = yes }
@@ -1131,7 +1148,7 @@ classical_age = {
 				always = yes
 			}
 			modifier = {
-				embracement_cost = -0.25
+				embracement_cost = -0.2
 			}
 			effect = {
 				add_adm_power = 100
@@ -3039,7 +3056,7 @@ imperial_age = {
 		ab_legionnaires_imitation = {
 			allow = {
 				OR = {
-					technology_group = greek
+					technology_group = greek_techgroup
 					technology_group = diadochi
 					technology_group = caucaso_anatolian
 					technology_group = north_african

common/ai_personalities/00_ai_personalities.txt

@@ -95,6 +95,14 @@ ai_diplomat = {
 			factor = 1.25
 			NOT = { total_development = 30 }
 		}
+		modifier = {
+			factor = 2
+			religion = taoism
+		}
+		modifier = {
+			factor = 4
+			religion = mohism
+		}
 		modifier = {
 			factor = 4
 			tag = PSE
@@ -214,6 +222,10 @@ ai_militarist = {
 			factor = 1.1
 			cavalry_ideas = 1
 		}
+		modifier = {
+			factor = 0.25
+			religion = mohism
+		}
 		modifier = {
 			factor = 2.5
 			is_year = 250

common/bookmarks/JinChu_peace.txt

@@ -8,5 +8,5 @@ bookmark = {
 	country = CHU
 	country = QIN
 	country = QII
-
+    country = PSE
 }

common/bookmarks/clash_of_empires.txt

@@ -3,7 +3,6 @@ bookmark = {
 	desc = "CLASH_OF_EMPIRES_DESC"
 	date = 142.8.10
 
-	default = yes
 	center = 2476
 
 	country = BAB

common/bookmarks/for_new_players.txt

@@ -0,0 +1,15 @@
+bookmark = {
+	name = "NEW_PLAYERS_TITLE"
+	desc = "NEW_PLAYERS_DESC"
+	date = 142.8.10
+
+	default = yes
+	center = 133
+
+	country = TTQ
+	country = LYD
+	country = PNC
+	country = ASA
+	country = QII
+	country = JIN
+}

common/bookmarks/hegemony_of_jin.txt

@@ -3,7 +3,6 @@ bookmark = {
 	desc = "WAR_OF_JIN_CHU_DESC"
 	date = 142.8.10
 
-	default = yes
 	center = 4070
 
 	country = CHU

common/bookmarks/hellenic_world.txt

@@ -3,7 +3,6 @@ bookmark = {
 	desc = "THE_HELLENIC_WORLD_DESC"
 	date = 142.8.10
 
-	default = yes
 	center = 959
 
 	country = ATH

common/bookmarks/late_vedic_age.txt

@@ -3,7 +3,6 @@ bookmark = {
 	desc = "VEDIC_AGE_DESC"
 	date = 142.8.10
 
-	default = yes
 	center = 2979
 
 	country = PNC

common/bookmarks/roman_republic.txt

@@ -0,0 +1,13 @@
+bookmark = {
+	name = "ROMAN_REPUBLIC_TITLE"
+	desc = "ROMAN_REPUBLIC_DESC"
+	date = 245.1.1
+
+
+	country = ROM
+	country = SAB
+	country = CAR
+	country = MAC
+	country = ATH
+
+}

common/buildings/00_buildings.txt

@@ -586,7 +586,7 @@ small_townhall = { #year 135
 	modifier = {
 		local_state_maintenance_modifier = -0.15
 		local_autonomy = -0.05
-		local_governing_cost = -0.15
+		local_governing_cost = -0.1
 		# Popgrowth
 		local_colonial_growth = 0.1		# Urban capacity (+ absolute)
 	}
@@ -629,7 +629,7 @@ big_townhall = { #year 400
 	modifier = {
 		local_state_maintenance_modifier = -0.25
 		local_autonomy = -0.1
-		local_governing_cost = -0.25
+		local_governing_cost = -0.15
 		# Popgrowth
 		local_colonial_growth = 0.2		# Urban capacity (+ absolute)
 		allowed_num_of_manufactories = 0.1	# Upper capacity (+abs, added as extra urban)
@@ -672,7 +672,7 @@ government_palace = { #year 490
 	modifier = {
 		local_state_maintenance_modifier = -0.4
 		local_autonomy = -0.15
-		local_governing_cost = -0.4
+		local_governing_cost = -0.15
 		# Popgrowth
 		local_colonial_growth = 0.5		# Urban capacity (+ absolute)
 		allowed_num_of_manufactories = 0.2	# Upper capacity (+abs, added as extra urban)
@@ -715,7 +715,7 @@ government_district = { #year 625
 	modifier = {
 		local_state_maintenance_modifier = -0.5
 		local_autonomy = -0.2
-		local_governing_cost = -0.5
+		local_governing_cost = -0.2
 		# Popgrowth
 		local_colonial_growth = 0.8		# Urban capacity (+ absolute)
 		allowed_num_of_manufactories = 0.5	# Upper capacity (+abs, added as extra urban)
@@ -1881,7 +1881,7 @@ imperial_palace = { #year 325
 	time = 48
 
 	modifier = {
-		max_absolutism = 10
+		max_absolutism = 5
 		governing_capacity_modifier = 0.15
 		local_state_maintenance_modifier = 0.5
 		# Popgrowth
@@ -3657,6 +3657,7 @@ goldsmith = { #year 280
 lumberjack = { #year 250
 	manufactory = {
 		naval_supplies		# 2.00
+		tropical_wood		# 2.00
 	}
 
 	on_built = {

common/cb_types/00_cb_types.txt

@@ -373,6 +373,7 @@ cb_independence_war = {
 			}
 		}
 		NOT = { has_reform = minor_elamite_kingdom }
+		NOT = { is_subject_of_type = ministerial_clan }
 	}
 
 	prerequisites = {
@@ -924,7 +925,10 @@ cb_force_join_hre = {
 			treaty = po_join_empire
 		}
 		FROM = {
-			religion_group = ROOT
+			OR = {
+				culture_group = chinese_group
+				culture_group = dongyi_group
+			}
 			capital_scope = {
 				same_continent = ROOT
 				is_part_of_hre = no
@@ -1128,6 +1132,9 @@ cb_indian_subjugation = {
 			has_reform = tamil_tribe_reform
 			has_reform = tamil_crowned_king_tribal_reform
 		}
+		capital_scope = {
+            continent = india
+        }
 	}
 
 	prerequisites = {
@@ -1379,24 +1386,41 @@ cb_greek_unification = {
 #Diadochi
 
 cb_invasion_diadochi = {
-	valid_for_subject = no
+	valid_for_subject = yes
 
 	prerequisites_self = {
-		has_reform = satrap_diadochi_reform
+		OR = {
+			has_reform = satrap_diadochi_reform
+			has_reform = macedonian_regency_reform
+			tag = ATR
+			tag = PRT
+			tag = KSH
+		}
 	}
 	prerequisites = {
-		has_reform = satrap_diadochi_reform
-		FROM = {
+		OR = {
 			has_reform = satrap_diadochi_reform
-			is_neighbor_of = ROOT
+			has_reform = macedonian_regency_reform
+			tag = ATR
+			tag = PRT
+			tag = KSH
+		}
+		FROM = {
+			OR = {
+				has_reform = satrap_diadochi_reform
+				has_reform = macedonian_regency_reform
+				tag = ATR
+				tag = PRT
+				tag = KSH
+			}
 		}
 	}
 
 	attacker_disabled_po = {
 		po_become_tributary_state
 	}
 
-	war_goal = take_capital_invasion_diadochi
+	war_goal = take_capital_diadochi_invasion
 }
 
 #########################################################################
@@ -1768,7 +1792,24 @@ jinpartition_cb = {
 		po_transfer_vassals
 	}
 
-	defender_disabled_po = {
+	war_goal = jin_partition_wargoal
+}
+
+minister_field_cb = {
+	valid_for_subject = no
+
+	prerequisites = {
+		is_subject_of_type = ministerial_clan
+		FROM = { 
+			num_of_cities = 4 
+			is_subject_of_type = ministerial_clan
+		}
+		NOT = {
+			truce_with = FROM
+		}
+	}
+
+	attacker_disabled_po = {
 		po_demand_provinces
 		po_revoke_cores
 		po_release_vassals
@@ -1782,7 +1823,17 @@ jinpartition_cb = {
 		po_transfer_vassals
 	}
 
-	war_goal = jin_partition_wargoal
+	war_goal = minister_field_wargoal
+}
+
+# Punic war CB
+cb_punic_war = {
+
+	prerequisites_self = {
+		always = no
+	}
+
+	war_goal = superiority_punic
 }
 
 #cb_seize_emperor = {