Merge pull request #361 from The-Grand-Combination/china-fixes

removed several inaccurate or unused chinese cultures
The-Grand-Combination · Jan 12, 2025 · 47ab7ba · 47ab7ba
2 parents ce4016c + fe102a8
commit 47ab7ba
Show file tree

Hide file tree

Showing 40 changed files with 569 additions and 718 deletions.
diff --git a/TGC Niche Submods/TGCHFMStyleCultureColors/common/cultures.txt b/TGC Niche Submods/TGCHFMStyleCultureColors/common/cultures.txt
@@ -948,39 +948,19 @@
 		}
 		han_chinese = {
 			color = { 145 30 30 }
-			first_names = { Wang Li Zhang Liu Chen Huang Liang Luo Kwong Hsia Zhu Mao Hu Liao Tan Deng Cheng Yang Gao Xie Ma Kong Dong Pan Yu }
-			last_names = { Zhao Wu Sun Ma Hu Peng Dong Ye L� Tian Jiang Wei Ting Shen Fang Jin Qiu }
-		}
-		beifaren = {
-			color = { 145 30 30 }
-			first_names = { Wang Li Zhang Liu Chen Huang Liang Luo Kwong Hsia Zhu Mao Hu Liao Tan Deng Cheng Yang Gao Xie Ma Kong Dong Pan Yu }
-			last_names = { Zhao Wu Sun Ma Hu Peng Dong Ye L� Tian Jiang Wei Ting Shen Fang Jin Qiu }
-		}
-		nanfaren = {
-			color = { 181 106 106 }
-			first_names = { Wang Li Zhang Liu Chen Huang Liang Luo Kwong Hsia Zhu Mao Hu Liao Tan Deng Cheng Yang Gao Xie Ma Kong Dong Pan Yu }
-			last_names = { Zhao Wu Sun Ma Hu Peng Dong Ye L� Tian Jiang Wei Ting Shen Fang Jin Qiu }
+			first_names = { Wang Li Zhang Liu Chen Huang Liang Luo Kwong Hsia Zhu Mao Hu Liao Tan Deng Cheng Yang Gao Xie Ma Kong Dong Pan Yu Hong Feng Shi Qiu Sun Soong Xue Wu Shu Tsai Zhen Ye Lin Shen Wong Yan Sa Hou Zheng Bing He Du Xu Qin }
+			last_names = { Zhao Wu Sun Ma Hu Peng Dong Ye L� Tian Jiang Wei Ting Shen Fang Jin Qiu Xiuquan Yunshan Xiuqing Dakai Yucheng Rengan Zicai Yongfu Fengjia Yatsen Zexu Baozhen Baochen Nai-siong Shu Fu Sen Debang Xin Nee Huiyin }
 		}
 		hanhui = {
 			color = { 255 230 230 }
 			first_names = { Wang Li Zhang Liu Chen Huang Liang Luo Kwong Hsia Zhu Mao Hu Liao Tan Deng Cheng Yang Gao Xie Ma Kong Dong Pan Yu }
 			last_names = { Zhao Wu Sun Ma Hu Peng Dong Ye L� Tian Jiang Wei Ting Shen Fang Jin Qiu }
 		}
-		hakka = {
-			color = { 89 63 24 }
-			first_names = { Hong Feng Shi Li Chen Liu Qiu Sun Soong Liao Xue Zhang Xie Wu Shu Tsai Deng Zhen Huang Ye Yang }
-			last_names = { Xiuquan Yunshan Xiuqing Dakai Yucheng Rengan Zicai Yongfu Fengjia Yatsen }
-		}
 		miao = {
 			color = { 98 67 155 }
 			first_names = { Pa Hang Mee Chay Kao Bang Zong Zoua Mai Blong Qin Shen Ka Dia Neng Kak }
 			last_names = { Thao Sao Moua Vue Her Lyfoung Pao Yang Lo Cha Congwen Zhiming Liangyu }
 		}
-		min = {
-			color = { 76 32 200 }
-			first_names = { Lin Shen Chen Wong Yan Sa Hou Zheng Bing Wu Tan He Du Xue Xu Qin }
-			last_names = { Zexu Baozhen Baochen Nai-siong Shu Fu Sen Debang Xin Nee Huiyin }
-		}
 		zhuang = {
 			color = { 200 75 134 }
 			first_names = { Hoang Nong Le Be Van Quoc Quynh The Duc }
@@ -991,11 +971,6 @@
 			first_names = { Wang Li Zhang Liu Chen Huang Liang Luo Kwong Hsia Zhu Mao Hu Liao Tan Deng Cheng Yang Gao Xie Ma Kong Dong Pan Yu }
 			last_names = { Zhao Wu Sun Ma Hu Peng Dong Ye L� Tian Jiang Wei Ting Shen Fang Jin Qiu }
 		}
-		yue = {
-			color = { 89 34 100 }
-			first_names = { Wang Li Zhang Liu Chen Huang Liang Luo Kwong Hsia Zhu Mao Hu Liao Tan Deng Cheng Yang Gao Xie Ma Kong Dong Pan Yu }
-			last_names = { Zhao Wu Sun Ma Hu Peng Dong Ye L� Tian Jiang Wei Ting Shen Fang Jin Qiu }
-		}
 		union = CHI
 	}
 

diff --git a/TGC/common/cultures.txt b/TGC/common/cultures.txt
@@ -952,16 +952,6 @@
 			first_names = { Wang Li Zhang Liu Chen Huang Liang Luo Kwong Hsia Zhu Mao Hu Liao Tan Deng Cheng Yang Gao Xie Ma Kong Dong Pan Yu }
 			last_names = { Zhao Wu Sun Ma Hu Peng Dong Ye L� Tian Jiang Wei Ting Shen Fang Jin Qiu }
 		}
-		beifaren = {
-			color = { 145 30 30 }
-			first_names = { Wang Li Zhang Liu Chen Huang Liang Luo Kwong Hsia Zhu Mao Hu Liao Tan Deng Cheng Yang Gao Xie Ma Kong Dong Pan Yu }
-			last_names = { Zhao Wu Sun Ma Hu Peng Dong Ye L� Tian Jiang Wei Ting Shen Fang Jin Qiu }
-		}
-		nanfaren = {
-			color = { 181 106 106 }
-			first_names = { Wang Li Zhang Liu Chen Huang Liang Luo Kwong Hsia Zhu Mao Hu Liao Tan Deng Cheng Yang Gao Xie Ma Kong Dong Pan Yu }
-			last_names = { Zhao Wu Sun Ma Hu Peng Dong Ye L� Tian Jiang Wei Ting Shen Fang Jin Qiu }
-		}
 		hanhui = {
 			color = { 255 230 230 }
 			first_names = { Wang Li Zhang Liu Chen Huang Liang Luo Kwong Hsia Zhu Mao Hu Liao Tan Deng Cheng Yang Gao Xie Ma Kong Dong Pan Yu }

diff --git a/TGC/common/pop_types.txt b/TGC/common/pop_types.txt
@@ -2026,7 +2026,6 @@ emigration_chance = {
 				has_country_flag = ibadi_country
 				has_country_flag = mahayana_country
 				has_country_flag = shinto_country
-				primary_culture = hakka
 				is_culture_group = east_slavic
 			}
 			NOT = { has_country_flag = preparations_to_kill }

diff --git a/TGC/decisions/00_Setup.txt b/TGC/decisions/00_Setup.txt
@@ -3211,8 +3211,6 @@ political_decisions = {
 								primary_culture = manchu
 								primary_culture = korean
 								primary_culture = mongol
-								primary_culture = hakka
-								primary_culture = yue
 								primary_culture = yi
 								primary_culture = hanhui
 								primary_culture = malay

diff --git a/TGC/decisions/Colonisation-Asia.txt b/TGC/decisions/Colonisation-Asia.txt
@@ -86,7 +86,6 @@ political_decisions = {
 			}
 			random_owned = { limit = { is_core = INO any_pop = { has_pop_culture = malay } } INO = { add_accepted_culture = malay } }
 			random_owned = { limit = { is_core = INO any_pop = { has_pop_culture = moluccan } } INO = { add_accepted_culture = moluccan } }
-			random_owned = { limit = { is_core = INO any_pop = { has_pop_culture = yue } } INO = { add_accepted_culture = yue } }
 			random_owned = { limit = { is_core = INO any_pop = { has_pop_culture = melanesian } } INO = { add_accepted_culture = melanesian } }
 			random_owned = { limit = { owner = { primary_culture = dutch } } INO = { add_accepted_culture = dutch government = colonial_company } } # TODO VOC
 		}

diff --git a/TGC/decisions/ENG.txt b/TGC/decisions/ENG.txt
@@ -1578,7 +1578,7 @@ political_decisions = {
 					add_core = MLY
 				}
 				change_tag = MLY
-				add_accepted_culture = yue
+				add_accepted_culture = han_chinese
 				random_owned = {
 					limit = { province_id = 1387 }
 					owner = { capital = 1387 }

diff --git a/TGC/decisions/UncivFlavor.txt b/TGC/decisions/UncivFlavor.txt
@@ -1691,11 +1691,8 @@ political_decisions = {
 			prestige = 40
 			add_accepted_culture = han_chinese
 			add_accepted_culture = manchu
-			add_accepted_culture = hakka
 			add_accepted_culture = miao
-			add_accepted_culture = min
 			add_accepted_culture = zhuang
-			add_accepted_culture = yue
 			add_accepted_culture = yi
 			add_accepted_culture = hanhui
 			CHI = {
@@ -1903,11 +1900,8 @@ political_decisions = {
 			clr_global_flag = warlord_era_has_begun
 			add_accepted_culture = han_chinese
 			add_accepted_culture = manchu
-			add_accepted_culture = hakka
 			add_accepted_culture = miao
-			add_accepted_culture = min
 			add_accepted_culture = zhuang
-			add_accepted_culture = yue
 			add_accepted_culture = yi
 			add_accepted_culture = hanhui
 			prestige = 40
@@ -2276,11 +2270,8 @@ political_decisions = {
 			clr_global_flag = warlord_era_has_begun
 			add_accepted_culture = han_chinese
 			add_accepted_culture = manchu
-			add_accepted_culture = hakka
 			add_accepted_culture = miao
-			add_accepted_culture = min
 			add_accepted_culture = zhuang
-			add_accepted_culture = yue
 			add_accepted_culture = yi
 			add_accepted_culture = hanhui
 			prestige = 40

diff --git a/TGC/events/China.txt b/TGC/events/China.txt
@@ -6133,16 +6133,24 @@ country_event = {
 			remove_core = FJN
 		}
 		2406 = {
-				remove_core = FJN
-				add_core = TAI
+			remove_core = FJN
+			add_core = TAI
 		}
 		2681 = {
 			remove_core = FJN
 			add_core = TAI
 		}
-		any_pop = {
-			limit = { has_pop_culture = min }
-			militancy = 4
+
+		any_owned_province = {
+			limit = {
+				is_core = TAI
+			}
+			any_pop = {
+				limit = {
+					has_pop_culture = han_chinese
+				}
+				militancy = 4
+			}
 		}
 	}
 }
@@ -6247,7 +6255,6 @@ country_event = {
 		capital = 2681
 		money = 100000
 		leadership = 40
-		add_accepted_culture = min
 		random_country = {
 			limit = {
 				war_with = THIS
@@ -9304,7 +9311,6 @@ country_event = {
 				OR = {
 					has_pop_culture = han_chinese
 					has_pop_culture = zhuang
-					has_pop_culture = yue
 					has_pop_religion = sunni
 					has_pop_religion = protestant
 				}
@@ -9332,7 +9338,6 @@ country_event = {
 					OR = {
 						has_pop_culture = han_chinese
 						has_pop_culture = zhuang
-						has_pop_culture = yue
 						has_pop_religion = sunni
 						has_pop_religion = protestant
 					}
@@ -9534,7 +9539,6 @@ country_event = {
 				OR = {
 					has_pop_culture = han_chinese
 					has_pop_culture = zhuang
-					has_pop_culture = yue
 					has_pop_religion = sunni
 					has_pop_religion = protestant
 				}
@@ -9562,7 +9566,6 @@ country_event = {
 					OR = {
 						has_pop_culture = han_chinese
 						has_pop_culture = zhuang
-						has_pop_culture = yue
 						has_pop_religion = sunni
 						has_pop_religion = protestant
 					}
@@ -11318,7 +11321,6 @@ country_event = {
 			money = 100000
 			leadership = 40
 			primary_culture = THIS
-			add_accepted_culture = min
 		}
 		any_country = {
 			limit = { war_with = TAI }
@@ -11328,7 +11330,7 @@ country_event = {
 	}
 }
 
-#Qing Defeat in the Taiping Rebellion
+#Qing Defeat in the Taiping Rebellion  #DEVNOTE: This makes literally zero sense; there is no way *Taiwan* is a Qing stronghold in like 1860 -pixelaes
 country_event = {
 	id = 160027
 	title = "EVTNAME160026" #Retreat to Formosa
@@ -11413,7 +11415,6 @@ country_event = {
 			capital = 2681
 			money = 100000
 			leadership = 40
-			add_accepted_culture = min
 			add_accepted_culture = han_chinese
 			remove_country_modifier = uncivilized_isolationism
 		}

diff --git a/TGC/events/CivilizationAndGunBoats.txt b/TGC/events/CivilizationAndGunBoats.txt
@@ -4225,25 +4225,25 @@ province_event = {
 	fire_only_once = yes
 
 	immediate = {
-		1493 = { any_pop = { limit = { type = serfs culture = yue } move_pop = 1496 } }
-		1493 = { any_pop = { limit = { type = bureaucrats culture = yue } move_pop = 1496 } }
+		1493 = { any_pop = { limit = { type = serfs culture = han_chinese } move_pop = 1496 } }
+		1493 = { any_pop = { limit = { type = bureaucrats culture = han_chinese } move_pop = 1496 } }
 		random_list = {
-			40 = { 1497 = { any_pop = { limit = { type = artisans culture = yue } move_pop = 1496 } } }
-			20 = { 1497 = { any_pop = { limit = { type = soldiers culture = yue } move_pop = 1496 } } }
-			40 = { 1497 = { any_pop = { limit = { type = bureaucrats culture = yue } move_pop = 1496 } } }
+			40 = { 1497 = { any_pop = { limit = { type = artisans culture = han_chinese } move_pop = 1496 } } }
+			20 = { 1497 = { any_pop = { limit = { type = soldiers culture = han_chinese } move_pop = 1496 } } }
+			40 = { 1497 = { any_pop = { limit = { type = bureaucrats culture = han_chinese } move_pop = 1496 } } }
 		}
 	}
 
 	option = {
 		name = "EVTOPTA90956"
 
 		serfs = {
-			limit = { has_pop_culture = yue }
+			limit = { has_pop_culture = han_chinese }
 			pop_type = labourers
 			reduce_pop = 0.9
 		}
 		any_pop = {
-			limit = { culture = hakka }
+			limit = { culture = han_chinese }
 			reduce_pop = 2.5
 		}
 	}

diff --git a/TGC/events/East Indies.txt b/TGC/events/East Indies.txt
@@ -1631,23 +1631,23 @@ country_event = {
 		1385 = {
 			life_rating = 5
 			change_province_name = "Johor Bahru"
-			any_pop = { limit = { has_pop_culture = yue } reduce_pop = 1.7 }
+			any_pop = { limit = { has_pop_culture = han_chinese } reduce_pop = 1.7 }
 			add_province_modifier = { name = recently_built_city duration = 365 }
 		}
 
 		1387 = {
 			life_rating = 5
 			change_province_name = "Kuala Lumpur"
 			trade_goods = precious_metal
-			any_pop = { limit = { has_pop_culture = yue } reduce_pop = 1.5 }
+			any_pop = { limit = { has_pop_culture = han_chinese } reduce_pop = 1.5 }
 			add_province_modifier = { name = recently_built_city duration = 1080 }
 		}
 
 		1390 = {
 			life_rating = 5
 			trade_goods = precious_metal
 			change_province_name = "Kuala Lipis"
-			any_pop = { limit = { has_pop_culture = yue } reduce_pop = 1.7 }
+			any_pop = { limit = { has_pop_culture = han_chinese } reduce_pop = 1.7 }
 			add_province_modifier = { name = recently_built_city duration = 365 }
 		}
 	}
@@ -1680,14 +1680,14 @@ country_event = {
 		sphere_owner = { diplomatic_influence = { who = THIS value = -400 } country_event = 956582 }
 		any_country = { release_vassal = THIS }
 		PRK = { all_core = { remove_core = JOH } }
-		2575 = { any_pop = { limit = { has_pop_culture = yue } reduce_pop = 1.5 } }
+		2575 = { any_pop = { limit = { has_pop_culture = han_chinese } reduce_pop = 1.5 } }
 		any_greater_power = { diplomatic_influence = { who = THIS value = -200 } }
 		ai_chance = { factor = 100 }
 	}
 
 	option = {
 		name = "EVTOPTB956581"
-		2575 = { any_pop = { limit = { has_pop_culture = yue } reduce_pop = 1.5 } }
+		2575 = { any_pop = { limit = { has_pop_culture = han_chinese } reduce_pop = 1.5 } }
 		ai_chance = { factor = 0 }
 	}
 }
@@ -1906,7 +1906,7 @@ province_event = {
 					location = {
 						is_core = LAN
 					}
-					culture = hakka
+					culture = han_chinese
 					strata = poor
 				}
 				reduce_pop = 0.8
@@ -1925,7 +1925,7 @@ province_event = {
 					location = {
 						is_core = LAN
 					}
-					culture = hakka
+					culture = han_chinese
 					strata = rich
 				}
 				move_pop = 1384
@@ -1936,7 +1936,7 @@ province_event = {
 					location = {
 						is_core = LAN
 					}
-					culture = hakka
+					culture = han_chinese
 					strata = middle
 				}
 				move_pop = 1385

diff --git a/TGC/history/countries/ATJ - Atjeh.txt b/TGC/history/countries/ATJ - Atjeh.txt
@@ -1,6 +1,6 @@
 capital = 1405
 primary_culture = malay
-culture = yue
+culture = han_chinese
 religion = sunni
 government = absolute_monarchy
 plurality = 19

diff --git a/TGC/history/countries/BRU - Brunei.txt b/TGC/history/countries/BRU - Brunei.txt
@@ -1,6 +1,6 @@
 capital = 1393
 primary_culture = malay
-culture = yue
+culture = han_chinese
 religion = sunni
 government = absolute_monarchy
 plurality = 19

diff --git a/TGC/history/countries/CHI - China.txt b/TGC/history/countries/CHI - China.txt
@@ -1,11 +1,8 @@
 capital = 1616
 primary_culture = han_chinese
 culture = manchu
-culture = hakka
 culture = miao
-culture = min
 culture = zhuang
-culture = yue
 culture = yi
 culture = hanhui
 religion = confucian

diff --git a/TGC/history/countries/FJN - Fujian.txt b/TGC/history/countries/FJN - Fujian.txt
@@ -1,6 +1,5 @@
 capital = 1482
-primary_culture = min
-culture = han_chinese
+primary_culture = han_chinese
 religion = mahayana
 government = absolute_monarchy
 plurality = 19

diff --git a/TGC/history/countries/GNG - Guangdong.txt b/TGC/history/countries/GNG - Guangdong.txt
@@ -1,7 +1,5 @@
 capital = 1493
-primary_culture = yue
-culture = han_chinese
-culture = hakka
+primary_culture = han_chinese
 religion = mahayana
 government = absolute_monarchy
 plurality = 18

diff --git a/TGC/history/countries/GXI - Guangxi Clique.txt b/TGC/history/countries/GXI - Guangxi Clique.txt
@@ -1,6 +1,5 @@
 capital = 1502
 primary_culture = zhuang
-culture = yue
 culture = han_chinese
 religion = mahayana
 government = absolute_monarchy

diff --git a/TGC/history/countries/HQJ - Black Flag.txt b/TGC/history/countries/HQJ - Black Flag.txt
@@ -1,6 +1,6 @@
 capital = 1502
 primary_culture = zhuang
-culture = yue
+culture = han_chinese
 culture = vietnamese
 religion = mahayana
 government = colonial_company