2025-12-14 04:00:59

src/common/ai_strategy/BFL.txt

@@ -100,6 +100,26 @@ BFL_unit_production_at_strong = {
 	}
 }
 
+BFL_sad_neizan = {
+    allowed = {
+		original_tag = BFL
+	}
+	enable = {
+		tag = BFL
+		has_government = communism
+		SAD = {
+			not = { has_government = fascism }
+			has_civil_war = yes
+		}
+	}
+	ai_strategy = {
+		type = send_volunteers_desire	#志愿军
+		id = "SAD"			
+		value = 300
+	}
+
+}
+
 BFL_unit_production_air = {
     allowed = {
 		original_tag = BFL

src/common/ai_strategy/BYG.txt

@@ -29,6 +29,11 @@ BYG_start_tianjiang = {
 		id = armor
 		value = 800
 	}
+	ai_strategy = {
+		type = equipment_production_factor	#装备倾向
+		id = armor			
+		value = 200
+	}
 	ai_strategy = {
 		type = role_ratio	#模板倾向
 		id = marines
@@ -1140,7 +1145,7 @@ BYG_dont_do_so_many_naval_1942 = {
 
 	enable = {
 		is_historical_focus_on = yes
-		date < 1941.8.1
+		date < 1941.5.1
 	}
 	abort_when_not_enabled = yes
 	ai_strategy = {
@@ -1276,7 +1281,7 @@ BYG_take_out_italy_boost = {
 		is_historical_focus_on = yes
 	}
 	enable = {
-		date > 1942.6.1
+		date > 1941.5.1
 		SAD = {
 			surrender_progress < 0.2
 		}
@@ -1298,7 +1303,7 @@ BYG_take_out_italy_boost = {
 	ai_strategy = {
 		type = invasion_unit_request
 		area = italy
-		value = 3
+		value = 10
 	}
 
 	ai_strategy = {
@@ -1312,6 +1317,24 @@ BYG_take_out_italy_boost = {
 		id = normandy_landing_zone
 		value = -100
 	}
+
+	ai_strategy = {
+		type = naval_convoy_raid_region
+		id = 68
+		value = 400
+	}
+
+	ai_strategy = {
+		type = naval_convoy_raid_region
+		id = 169
+		value = 400
+	}
+
+	ai_strategy = {
+		type = naval_convoy_raid_region
+		id = 29
+		value = 400
+	}
 }
 
 BYG_d_day_boost = {
@@ -1320,7 +1343,7 @@ BYG_d_day_boost = {
 	}
 	enable = {
 		has_war_with = TIX 
-		date > 1942.9.1
+		date > 1941.9.1
 		SAD = {
 			surrender_progress > 0.2
 		}
@@ -1361,11 +1384,11 @@ BYG_torch_boost = {
 	enable = {
 		country_exists = WEX 
 		has_war_with = TIX
-		date > 1942.5.1
+		date > 1941.5.1
 	}
 	abort = {
 		OR = {
-			date > 1943.9.1 # if we haven't succeeded by now, maybe try somewhere else
+			date > 1942.9.1 # if we haven't succeeded by now, maybe try somewhere else
 			461 = { is_controlled_by_ROOT_or_ally = yes }
 			459 = { is_controlled_by_ROOT_or_ally = yes }
 		}
@@ -1391,7 +1414,7 @@ BYG_torch_boost = {
 	ai_strategy = {
 		type = front_unit_request
 		area = torch_landing_zone
-		value = 1
+		value = 2
 	}
 	ai_strategy = {
 		type = prepare_for_war
@@ -1403,6 +1426,16 @@ BYG_torch_boost = {
 		id = WEX
 		value = 200
 	}
+	ai_strategy = {
+		type = naval_convoy_raid_region
+		id = 47
+		value = 400
+	}
+	ai_strategy = {
+		type = naval_convoy_raid_region
+		id = 48
+		value = 400
+	}
 }
 
 BYG_save_india = { # in the case where japan has beaten china and is moving on india we should step up
@@ -2007,4 +2040,26 @@ BYG_dominate_the_home_islands = {
 		id = home_islands_control_zone
 		value = 100
 	}
+}
+
+BYG_baohu_SAD = {
+	allowed = {
+		original_tag = BYG
+	}
+	enable = {
+		is_in_faction_with = SAD
+		has_war_with = TIX
+		date > 1941.1.1
+	}
+	abort_when_not_enabled = yes
+	ai_strategy = {
+		type = force_defend_ally_borders
+		id = "SAD"
+		value = 5000
+	}
+	ai_strategy = {
+		type = force_defend_ally_borders
+		value = 2000
+		target = mainland_europe
+	}
 }

src/common/ai_strategy/HUJ.txt

@@ -719,18 +719,22 @@ HUJ_war_with_sad = {
 	ai_strategy = {
 		type = invade		#入侵
 		id = "SAD"			
-		value = 100
+		value = 200
 	}
 	ai_strategy = {
 		type = conquer		#征服
 		id = "SAD"			
-		value = 100
+		value = 200
+	}
+	ai_strategy = {
+		type = front_armor_score #部署坦克
+		id = SAD
+		value = 300
 	}
-	
 	ai_strategy = {
 		type = front_unit_request #前线部队
 		tag = SAD
-		value = 200 # lets put more units, should be safe
+		value = 500 # lets put more units, should be safe
 	}
 }
 
@@ -1275,6 +1279,24 @@ HUJ_dengluqidong_sad = {
 		value = 20
 	}
 
+	ai_strategy = {
+		type = naval_convoy_raid_region
+		id = 68
+		value = 400
+	}
+
+	ai_strategy = {
+		type = naval_convoy_raid_region
+		id = 169
+		value = 400
+	}
+
+	ai_strategy = {
+		type = naval_convoy_raid_region
+		id = 29
+		value = 400
+	}
+
 }
 
 HUJ_dengguanbi_tix= {
@@ -1328,7 +1350,7 @@ HUJ_dengguanbi_wex= {
 	}
 	enable = {
 		has_war_with = WEX
-		date < 1942.6.1
+		date < 1941.6.1
 		is_historical_focus_on = yes
 		WEX = { is_ai = yes }
 	}
@@ -1349,7 +1371,7 @@ HUJ_dengluqidong_wex = {
 	enable = {
 		has_war_with = WEX
 		OR = {
-		date > 1942.6.1
+		date > 1941.6.1
 		WEX = { is_ai = no }
 		}
 		OR = {
@@ -1423,7 +1445,7 @@ HUJ_protect_poland_against_germany = {
 # lets make sure the allies dont overcommit to invasions early on
 HUJ_ALLIES_careful_with_early_invasions = {
 	enable = {
-		date < 1941.6.1
+		date < 1941.5.1
 		NOT = { original_tag = BYG }
 
 		OR = {
@@ -1443,7 +1465,7 @@ HUJ_ALLIES_careful_with_early_invasions = {
 				has_war_with = TIX
 				surrender_progress > 0.2
 			}
-			date > 1941.6.1
+			date > 1941.5.1
 		}
 	}
 
@@ -1483,7 +1505,7 @@ HUJ_BYG_careful_with_early_invasions = { #Same as above, alter in tandem
 	allowed = { original_tag = BYG }  # TODO this strategy seems bugged
 
 	enable = {
-		date < 1941.6.1
+		date < 1941.5.1
 
 		OR = {
 			is_in_faction_with = HUJ # anyone in allies
@@ -1502,7 +1524,7 @@ HUJ_BYG_careful_with_early_invasions = { #Same as above, alter in tandem
 				has_war_with = TIX
 				surrender_progress > 0.2
 			}
-			date > 1941.6.1
+			date > 1941.5.1
 		}
 	}
 
@@ -2922,3 +2944,25 @@ HUJ_develop_mediterranean_supremacy = {
 		value = 80
 	}
 }
+
+HUJ_baohu_SAD = {
+	allowed = {
+		original_tag = HUJ
+	}
+	enable = {
+		is_in_faction_with = SAD
+		has_war_with = TIX
+		date > 1941.1.1
+	}
+	abort_when_not_enabled = yes
+	ai_strategy = {
+		type = force_defend_ally_borders
+		id = "SAD"
+		value = 5000
+	}
+	ai_strategy = {
+		type = force_defend_ally_borders
+		value = 2000
+		target = mainland_europe
+	}
+}

src/common/ai_strategy/TIX.txt

@@ -531,6 +531,26 @@ TIX_start = {
 
 }
 
+TIX_sad_neizan = {
+    allowed = {
+		original_tag = TIX
+	}
+	enable = {
+		tag = TIX
+		has_government = fascism
+		SAD = {
+			not = { has_government = fascism }
+			has_civil_war = yes
+		}
+	}
+	ai_strategy = {
+		type = send_volunteers_desire	#志愿军
+		id = "D04"			
+		value = 300
+	}
+
+}
+
 TIX_bubangzhusading = {
     allowed = {
 			original_tag = TIX
@@ -1339,6 +1359,9 @@ TIX_dont_help_SAD_in_africa_after_SAD_control_Cairo = {
 		is_in_faction_with = SAD
 		SAD = { controls_state = 2 }
 		country_exists = BFL
+		SAD = {
+			has_government = fascism
+		}
 	}
 	abort_when_not_enabled = yes
 	ai_strategy = {
@@ -3007,4 +3030,51 @@ TIX_dont_help_IRQ = {
 		value = 5000
 		id = "IRQ"
 	}
+}
+
+TIX_war_with_SAD = {
+    allowed = {
+		original_tag = TIX
+	}
+	enable = {
+		has_war_with = SAD
+		SAD = {
+			has_capitulated = no
+			not = { has_government = fascism }
+		}
+	}
+	abort = {
+	    SAD = { has_capitulated = yes }
+	}
+	
+	ai_strategy = {
+		type = front_armor_score #部署坦克
+		id = SAD
+		value = 200
+	}
+	
+	ai_strategy = {
+		type = antagonize
+		id = "SAD"			
+		value = 200
+	}
+	
+	ai_strategy = {
+		type = prepare_for_war
+		id = "SAD"
+		value = 200
+	}
+	
+	ai_strategy = {
+		type = conquer
+		id = "SAD"			
+		value = 200
+	}
+	
+	ai_strategy = {
+		type = front_unit_request
+		tag = SAD		
+		value = 200
+	}
+
 }

src/common/ai_strategy_plans/az_byg_focusplan.txt

@@ -58,23 +58,24 @@ BYG_historical = {
 		BYG_xueshujiaoliu #49
 		#1940
 		BYG_baiyingzhanzhengbu #70 
-		BYG_wujiaodalou #49
-		BYG_haijunyidengren #70
-		BYG_kongmujiqun #49
-		BYG_dachujihua #70
-		BYG_jianlikongjun #49
-		#1941
-		BYG_zhanluekongjun #49
-		BYG_kongdixietong #70
-		BYG_zhanluepohuai #70
-		BYG_lianbangdeyingxiong#35
-		BYG_zongtongqinshangzhen#49
-		#1942
 		BYG_lujungaigeyantao #70
 		BYG_baiyingjungongchang #49
 		BYG_motuohuafangan #35
 		BYG_zhancheguilai #35
 		BYG_xiandaishandianzhan #70
+		BYG_manhadunjihua #满足就点
+		#1941
+		BYG_lianbangdeyingxiong#35
+		BYG_zongtongqinshangzhen#49
+		BYG_jianlikongjun #49
+		BYG_zhanluekongjun #49
+		BYG_kongdixietong #70
+		BYG_zhanluepohuai #70
+		#1942
+		BYG_wujiaodalou #49
+		BYG_haijunyidengren #70
+		BYG_kongmujiqun #49
+		BYG_dachujihua #70
 		BYG_zhanliebiandui #35
 		BYG_zhongdianfanghu #49
 		BYG_xinshichuanjiadan #35

src/common/ai_strategy_plans/az_chy_focusplan.txt

@@ -167,6 +167,10 @@ CHY_historical = {
 		CHY_navalbomb1 #
 		CHY_navalbomb2 #
 		CHY_chichengkongzhan #
+		CHY_hechisezhongzhouhezuo #
+		CHY_ziligenshen #
+		CHY_feilvbin #
+		CHY_malaixiya #
 		CHY_feijiyanjiu #
 		CHY_kongzhanbuff #
 		CHY_dafeijiyanjiu #
@@ -178,12 +182,8 @@ CHY_historical = {
 		CHY_wuzangbuilding #
 		CHY_wuqibuilding #
 		CHY_daofengbuilding #
-		CHY_hechisezhongzhouhezuo #
 		CHY_qiantin #
 		CHY_qiantin_buff #
-		CHY_feilvbin #
-		CHY_malaixiya #
-		CHY_ziligenshen #
 		#1942~
 		CHY_xiaohuashenliguoshi #
 		CHY_dongbeikuangchankaijue #

src/common/bop/SAD.txt

@@ -104,5 +104,112 @@ SAD_balance = {
 			}
 		}
 	}	
-		
+	side = {
+		id = SAD_right_side2
+		icon = GFX_bop_ITA_democratic_improved_side
+		range = {
+			id = SAD_yihuizhudao
+			min = 0.3
+			max = 0.7
+			modifier = {
+				political_power_gain = 0.5
+				stability_factor = 0.1
+				stability_weekly = 0.001
+				trade_opinion_factor = 0.1
+				drift_defence_factor = 0.1
+			}
+		}
+		range = {
+			id = SAD_yihuiweizhu
+			min = 0.7
+			max = 0.95
+			modifier = {
+				political_power_gain = 0.5
+				stability_factor = 0.2
+				stability_weekly = 0.002
+				trade_opinion_factor = 0.2
+				drift_defence_factor = 0.3
+			}
+		}
+		range = {
+			id = SAD_xiaochuyiji
+			min = 0.95
+			max = 1
+			modifier = {
+				political_power_gain = 0.25
+				stability_factor = 0.3
+				stability_weekly = 0.003
+				trade_opinion_factor = 0.3
+				drift_defence_factor = 0.5
+			}
+			on_activate = {
+				if = {
+					limit = {
+						has_government = communism
+					}
+					country_event = az_tianjiang.422
+				}
+			}
+		}
+	}
+	side = {
+		id = SAD_left_side2
+		icon = GFX_bop_ITA_communism_improved_side
+		range = {
+			id = SAD_zuoyiyanlunzhanjushangfeng
+			min = -0.7
+			max = -0.3
+			modifier = {
+				political_power_gain = 0.5
+				war_support_factor = 0.15
+				war_support_weekly = 0.001
+				army_core_attack_factor = 0.1
+				army_core_defence_factor = 0.1
+			}
+			on_activate = {
+				
+			}
+			on_deactivate = {
+				
+			}
+		}
+		range = {
+			id = SAD_zuopairenshizhanlingyihui
+			min = -0.95
+			max = -0.7
+			modifier = {
+				political_power_gain = 0.5
+				war_support_factor = 0.3
+				war_support_weekly = 0.005
+				army_core_attack_factor = 0.2
+				army_core_defence_factor = 0.2
+			}
+			on_activate = {
+				
+			}
+			on_deactivate = {
+				
+			}
+		}
+		range = {
+			id = SAD_yihuichongzu
+			min = -1.0
+			max = -0.95
+			modifier = {
+				political_power_gain = 0.5
+				war_support_factor = 0.5
+				war_support_weekly = 0.01
+				army_core_attack_factor = 0.3
+				army_core_defence_factor = 0.3
+			}
+			on_activate = {
+				if = {
+					limit = {
+						has_government = democratic
+					}
+					country_event = az_tianjiang.421
+				}
+			}
+		}
+	}
 }

src/common/characters/az_SAD_characters.txt

@@ -1190,7 +1190,7 @@ characters={
 		}	
 	}
 	SAD_diguo_sci = {
-		name = SAD_abuluqi
+		name = SAD_diguo
 		portraits={
 			army = {
 				large="gfx/leaders/SAD/diguo.png"

src/common/countries/cosmetic.txt

@@ -1,3 +1,8 @@
+SAD_neizhan = {
+	color = rgb { 60 179 113 }
+	color_ui = rgb { 60 179 113 }
+}
+
 HUJ_nvpu_communism = {
 	color = rgb { 176 48 96 }
 	color_ui = rgb { 176 48 96 }

src/common/country_leader/az_psh_traits.txt

@@ -148,6 +148,16 @@ leader_traits = {
 		command_power_gain_mult = 0.5
 		drift_defence_factor = 1.5
 	}
+	#共和之魂
+	trait_psh_sadgonghezihun = { 
+		random = no
+		surrender_limit = 0.1
+		research_speed_factor = 0.25
+		opinion_gain_monthly_factor = 2
+		trade_opinion_factor = 5
+		local_resources_factor = 0.25
+		drift_defence_factor = 3
+	}
 	#华服的圣骑士
 	trait_psh_huafudeshengqishi = { 
 		random = no
@@ -386,7 +396,7 @@ leader_traits = {
 	#铁血意志
 	txyz_ex = {
 		random = no
-		surrender_limit = 0.25
+		surrender_limit = 0.2
 		army_core_attack_factor = 0.5
 		army_core_defence_factor = 0.5
 		army_org_factor = 0.15
@@ -963,4 +973,44 @@ leader_traits = {
 		air_accidents = -0.2
 		air_weather_penalty = -0.2
 	}
+	#不被辜负的期待
+	trait_bubeigufudeqidai = {
+		random = no
+		party_popularity_stability_factor = 0.1
+		war_stability_factor = 0.2
+		industrial_capacity_factory = 0.15
+		army_attack_against_minor_factor = 0.2
+		army_defence_against_minor_factor = 0.2
+		army_core_attack_factor = 0.3
+		army_core_defence_factor = 0.3
+	}
+	trait_bubeigufudeqidai_2 = {
+		random = no
+		party_popularity_stability_factor = 0.3
+		war_stability_factor = 0.4
+		industrial_capacity_factory = 0.3
+		army_attack_against_minor_factor = 0.3
+		army_defence_against_minor_factor = 0.3
+		army_core_attack_factor = 0.5
+		army_core_defence_factor = 0.5
+	}
+	trait_bubeigufudeqidai_3 = {
+		random = no
+		party_popularity_stability_factor = 0.5
+		war_stability_factor = 0.5
+		industrial_capacity_factory = 0.5
+		army_attack_against_minor_factor = 0.5
+		army_defence_against_minor_factor = 0.5
+		army_core_attack_factor = 0.8
+		army_core_defence_factor = 0.8
+	}
+	#粉碎帝国
+	trait_fensuidiguo = {
+		random = no
+		consumer_goods_factor = -0.15
+		production_factory_max_efficiency_factor = 0.1
+		production_factory_start_efficiency_factor = 0.05
+		army_core_attack_factor = 0.5
+		army_core_defence_factor = 0.5
+	}
 }

src/common/decisions/categories/tianjiang_decision_categories.txt

@@ -233,4 +233,10 @@ AZ_meizhoutiaozhan_jyz = {
 		shijianniangguojia_trigger = yes
 	}
 	priority = 20000
+}
+SAD_panbianzhe_jyz = {
+	allowed = {
+		original_tag = SAD
+	}
+	priority = 100
 }

src/common/decisions/tianjiang_decision.txt

@@ -8227,6 +8227,10 @@ SAD_quanlipingheng = {
 		icon = generic_arrest
 		cost = 50
 		available = {
+			OR = {
+				has_government = fascism
+				has_government = neutrality
+			}
 		}
 		days_re_enable = 120
 		fire_only_once = no
@@ -8244,6 +8248,10 @@ SAD_quanlipingheng = {
 		icon = generic_assassination
 		cost = 50
 		available = {
+			OR = {
+				has_government = fascism
+				has_government = neutrality
+			}
 		}
 		days_re_enable = 120
 		fire_only_once = no
@@ -8300,6 +8308,10 @@ SAD_quanlipingheng = {
 		icon = ger_reichskommissariats
 		cost = 50
 		available = {
+			OR = {
+				has_government = fascism
+				has_government = neutrality
+			}
 		}
 		modifier = {
 			fascism_drift = 0.1
@@ -8321,6 +8333,8 @@ SAD_quanlipingheng = {
 		icon = eng_install_government
 		cost = 50
 		available = {
+			not = { has_government = communism }
+			not = { has_country_flag = sad_yugcdjiemeng_flag }
 		}
 		modifier = {
 			neutrality_drift = 0.2
@@ -8338,6 +8352,57 @@ SAD_quanlipingheng = {
 			factor = 0
 		}
 	}
+	SAD_zhichidayihui = {
+		icon = gre_investment_decisions
+		cost = 50
+		available = {
+			OR = {
+				has_government = democratic
+				has_government = communism
+			}
+		}
+		modifier = {
+			democratic_drift = 0.1
+		}
+		days_remove = 90
+		days_re_enable = 240
+		fire_only_once = no
+		complete_effect = {
+			add_power_balance_value = {
+				id = SAD_balance
+				value = 0.25
+			}
+		}
+		ai_will_do = {
+			factor = 0
+		}
+	}
+	SAD_zhichisadinggongchanlianmeng = {
+		icon = eng_blackshirt_march
+		cost = 50
+		available = {
+			OR = {
+				has_government = democratic
+				has_government = communism
+			}
+			has_country_flag = sad_yugcdjiemeng_flag
+		}
+		modifier = {
+			communism_drift = 0.2
+		}
+		days_remove = 90
+		days_re_enable = 240
+		fire_only_once = no
+		complete_effect = {
+			add_power_balance_value = {
+				id = SAD_balance
+				value = -0.25
+			}
+		}
+		ai_will_do = {
+			factor = 0
+		}
+	}
 	SAD_aiquanlipingheng = {
 		cost = 0
 		visible = {
@@ -8369,9 +8434,10 @@ SAD_quanlipingheng = {
 		}
 		days_remove = 180
 		modifier = {
-			industrial_capacity_factory = 0.3
-			industrial_capacity_dockyard = 0.3
+			industrial_capacity_factory = 0.5
+			industrial_capacity_dockyard = 0.5
 			production_speed_arms_factory_factor = 0.3
+			production_speed_dockyard_factor = 0.3
 		}
 		ai_will_do = {
 			factor = 100
@@ -8422,6 +8488,9 @@ SAD_sadaisaizhanzheng = {
 				}
 			}
 		}
+		cancel_trigger = {
+			has_completed_focus = SAD_afeilijiazhichi
+		}
 		days_mission_timeout = 180
 		is_good = no
 		complete_effect = {
@@ -9339,6 +9408,17 @@ ALL_luxianzhinan = {
 			country_event = az_tianjiang.266
 		}
 	}
+	SAD_luxian = {
+		visible = {
+			original_tag = SAD
+		}
+		available = {
+			is_ai = no
+		}
+		complete_effect = {
+			country_event = az_tianjiang.437
+		}
+	}
 	BYG_qiye_jbsj_jy = {
 		visible = {
 			original_tag = BYG
@@ -10291,7 +10371,13 @@ SAD_gonggulingxiuquanwei_renwu = {
 			}
 		}
 		available = {
-			has_completed_focus = SAD_zaifeizhoudeshengli
+			OR = {
+				has_completed_focus = SAD_zaifeizhoudeshengli
+				has_completed_focus = SAD_afeilijiazhichi
+			}
+		}
+		cancel_trigger = {
+			not = { has_government = fascism }
 		}
 		days_mission_timeout = 120
 		is_good = no
@@ -10319,6 +10405,9 @@ SAD_gonggulingxiuquanwei_renwu = {
 		available = {
 			has_completed_focus = SAD_zhengfuneidedaqingxi
 		}
+		cancel_trigger = {
+			not = { has_government = fascism }
+		}
 		days_mission_timeout = 365
 		is_good = no
 		timeout_effect = {
@@ -11175,6 +11264,37 @@ HUJ_zhanzhengdezhongjie = {
 			}
 		}
 	}
+	kongzhisad_jueyi = {
+		name = kongzhiita_jueyi
+		icon = generic_political_address
+		available = {
+			date > 1941.1.1
+			tag = HUJ
+			controls_state = 126
+			surrender_progress < 0.3
+			is_faction_leader = yes
+			is_in_faction_with = SAD
+			SAD = {
+				is_ai = yes
+				has_civil_war = yes
+			}
+		}
+		visible = {
+			tag = HUJ
+			country_exists = SAD
+			date > 1940.6.1
+		}
+		ai_will_do = {
+			factor = 0
+		}
+		fire_only_once = yes
+		complete_effect = {
+			set_autonomy = {
+				target = SAD
+				autonomy_state = autonomy_supervised_state
+			}
+		}
+	}
 	gansheirq_jueyi = {
 		icon = generic_political_address
 		available = {
@@ -15682,6 +15802,8 @@ AZ_chaowu_jyz = {
 		}
 		
 		complete_effect = {
+			#set_politics = { ruling_party = democratic }
+			#mark_focus_tree_layout_dirty = yes
 			#set_country_flag = az_beilunyinqing_on
 			#clr_country_flag = BYG_lizipao_lengquezhong
 			#every_state = {
@@ -16075,4 +16197,64 @@ AZ_meizhoutiaozhan_jyz = {
 			}
 		}
 	}
+}
+
+SAD_panbianzhe_jyz = {
+	SAD_panbianzhe_jy = {
+		icon = eng_puppet_usa
+		available = {
+			OR = {
+				has_idea = SAD_lingxiuquanwei_3
+				has_completed_focus = SAD_chongzhudiguorongguang
+			}
+		}
+		visible = {
+			has_completed_focus = SAD_anliuyongdong
+			not = { has_country_flag = sad_panluanzhongzhi }
+		}
+		ai_will_do = {
+			factor = 100
+			modifier = {
+				is_historical_focus_on = yes
+				factor = 0
+			}
+		}
+		fire_only_once = yes
+		complete_effect = {
+			custom_effect_tooltip = sad_panluanzhongzhi_tips
+			set_country_flag = sad_panluanzhongzhi
+			add_to_variable = {
+				var = az_mimoujincheng
+				value = -100
+			}
+		}
+	}
+	SAD_jiangdimimoujincheng_jy = {
+		icon = generic_arrest
+		cost = 1000
+		available = {
+			is_puppet = no
+			has_civil_war = no
+			OR = {
+				has_government = fascism
+				has_government = neutrality
+			}
+		}
+		visible = {
+			has_completed_focus = SAD_anliuyongdong
+			not = { has_country_flag = sad_panluanzhongzhi }
+		}
+		ai_will_do = {
+			factor = 0
+		}
+		complete_effect = {
+			custom_effect_tooltip = SAD_jiangdimimoujincheng_jy_tips
+			add_to_variable = {
+				var = az_mimoujincheng
+				value = -20
+			}
+		}
+	}
+
+
 }

src/common/dynamic_modifiers/YUW_dynamic_modifiers.txt

@@ -257,3 +257,21 @@ YUW_sesefushi_state = {
 	state_resources_factor = 0.3
 }
 
+SAD_manjiuzizhiqu_state = {
+	enable = { 
+		always = yes
+	}
+	icon = GFX_modifiers_PRC_urban_development
+	remove_trigger = {
+		not = {
+			country_exists = SAD
+		}
+	}
+	local_building_slots_factor = 0.15
+	local_manpower = -0.25
+	state_production_speed_buildings_factor = 0.2
+	enemy_operative_detection_chance_over_occupied_tag = 0.5
+	enemy_intel_network_gain_factor_over_occupied_tag = -0.5
+	state_resources_factor = 0.25
+}
+

src/common/ideas/chy_new1.txt

@@ -706,12 +706,12 @@ ideas = {
 			}
 			targeted_modifier = {
 				tag = DOH
-				attack_bonus_against = -0.1
-				defense_bonus_against = -0.1
-				breakthrough_bonus_against = -0.1
+				attack_bonus_against = -0.3
+				defense_bonus_against = -0.3
+				breakthrough_bonus_against = -0.3
 			}
 			modifier = {
-				#supply_consumption_factor = 0.25
+				supply_consumption_factor = 0.15
 				resistance_growth = 2
 			}
 		}

src/common/ideas/doh.txt

@@ -655,7 +655,7 @@ ideas = {
 			}
 			targeted_modifier = {
 				tag = CHY
-				defense_bonus_against = 0.5
+				defense_bonus_against = 0.3
 			}
 			modifier = {
 				army_core_defence_factor = 1

src/common/ideas/sad.txt

@@ -59,11 +59,11 @@ ideas = {
 			modifier = {
 				
 				refit_speed = 0.1
-				repair_speed_factor = 0.15
-				consumer_goods_factor = -0.1
+				repair_speed_factor = 0.25
+				consumer_goods_factor = -0.15
 				navy_max_range_factor = 0.1
-				production_speed_dockyard_factor = 0.05
-				trade_opinion_factor = 0.15
+				production_speed_dockyard_factor = 0.1
+				trade_opinion_factor = 0.25
 			}
 		}
 		SAD_fbdzf = {
@@ -230,7 +230,7 @@ ideas = {
 		SAD_sddrg = {
 			picture = SPA_la_division_azul
 			allowed_civil_war = {
-				always = yes
+				has_government = fascism
 			}
 	
 			modifier = {
@@ -348,8 +348,8 @@ ideas = {
 			modifier = {
 				trade_opinion_factor = -0.1
 				opinion_gain_monthly_factor = -0.25
-				industrial_capacity_dockyard = 0.05
-				consumer_goods_factor = -0.15
+				industrial_capacity_dockyard = 0.1
+				consumer_goods_factor = -0.25
 			}
 		}
 		SAD_lsdfw = {
@@ -455,13 +455,13 @@ ideas = {
 			}
 	
 			modifier = {
-				experience_gain_army_factor = 0.15
-				experience_gain_army_unit_factor = 0.15
-				army_attack_factor = 0.2
-				army_defence_factor = 0.2
-				special_forces_attack_factor = 0.3
-				special_forces_defence_factor = 0.3
-				training_time_army_factor = 0.3
+				experience_gain_army_factor = 0.25
+				experience_gain_army_unit_factor = 0.25
+				army_attack_factor = 0.3
+				army_defence_factor = 0.3
+				special_forces_attack_factor = 0.5
+				special_forces_defence_factor = 0.5
+				training_time_army_factor = 0.1
 			}
 		}
 		SAD_gmzwd = {
@@ -471,8 +471,8 @@ ideas = {
 			}
 	
 			modifier = {
-				army_core_attack_factor = 0.6
-				army_core_defence_factor = 0.6
+				army_core_attack_factor = 1
+				army_core_defence_factor = 1
 				conscription = 0.025
 				required_garrison_factor = -0.35
 				training_time_army_factor = -0.25
@@ -485,8 +485,8 @@ ideas = {
 			}
 	
 			modifier = {
-				army_armor_attack_factor = 0.15
-				army_armor_defence_factor = 0.15
+				army_armor_attack_factor = 0.2
+				army_armor_defence_factor = 0.2
 				
 			}
 		}
@@ -554,12 +554,12 @@ ideas = {
 					instant = yes
 				}
 				heavy_tank_chassis = {
-					reliability_factor = 0.03
-					armor_value = 0.08
+					reliability_factor = 0.05
+					armor_value = 0.12
 					instant = yes
 				}
 				super_heavy_tank_chassis = {
-					reliability_factor = 0.03
+					reliability_factor = 0.05
 					armor_value = 0.15
 					instant = yes
 				}
@@ -604,7 +604,10 @@ ideas = {
 		SAD_gtty = {
 			picture = vittoria_mutilata
 			allowed_civil_war = {
-				always = yes
+				OR = {
+					has_government = fascism
+					has_government = neutrality
+				}
 			}
 			modifier = {
 				local_resources_factor = 0.1
@@ -645,6 +648,140 @@ ideas = {
 				navy_max_range_factor = 0.1
 			}
 		}
+		SAD_tjlld = {
+			picture = ITA_il_sol_dell_avvenire_ns
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				army_strength_factor = 0.05
+				industrial_capacity_factory = 0.1
+				industrial_capacity_dockyard = 0.1
+				army_attack_against_major_factor = 0.2
+				army_defence_against_major_factor = 0.2
+			}
+		}
+		SAD_zybs = {
+			picture = generic_women_in_the_army
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				org_loss_when_moving = -0.2
+				army_attack_factor = 0.1
+				army_defence_factor = 0.1
+				production_factory_efficiency_gain_factor = 0.1
+				army_attack_against_major_factor = 0.1
+				army_defence_against_major_factor = 0.1
+			}
+		}
+		SAD_tjjsll = {
+			picture = AUS_austromarxism
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				consumer_goods_expected_value = -0.1
+				industrial_capacity_factory = 0.3
+				war_support_factor = 0.5
+				war_support_weekly = 0.01
+				army_core_attack_factor = 0.5
+				army_core_defence_factor = 0.5
+			}
+		}
+		SAD_saddyh = {
+			picture = CHL_the_Hacienda_inquilinaje_system
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				stability_factor = 0.5
+				line_change_production_efficiency_factor = 0.5
+				production_factory_max_efficiency_factor = 0.5
+				production_factory_efficiency_gain_factor = 0.5
+				industrial_capacity_dockyard = 0.5
+			}
+		}
+		SAD_saddyh_small = {
+			name = SAD_saddyh
+			picture = CHL_the_Hacienda_inquilinaje_system
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				stability_factor = 0.3
+				line_change_production_efficiency_factor = 0.3
+				production_factory_max_efficiency_factor = 0.3
+				production_factory_efficiency_gain_factor = 0.3
+				industrial_capacity_dockyard = 0.3
+			}
+		}
+		SAD_saddyh_small2 = {
+			name = SAD_saddyh
+			picture = CHL_the_Hacienda_inquilinaje_system
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				stability_factor = 0.1
+				line_change_production_efficiency_factor = 0.1
+				production_factory_max_efficiency_factor = 0.1
+				production_factory_efficiency_gain_factor = 0.1
+				industrial_capacity_dockyard = 0.1
+			}
+		}
+		SAD_zzsd = {
+			picture = RAJ_independence_movement
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				army_core_attack_factor = 0.5
+				army_core_defence_factor = 0.5
+				army_attack_factor = 0.3
+				army_defence_factor = 0.3
+			}
+		}
+		SAD_cjgj = {
+			picture = PER_unification_initiative_idea
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				production_speed_buildings_factor = 0.5
+				production_cost_industrial_complex_factor = -0.25
+				consumer_goods_expected_value = -0.05
+				consumer_goods_factor = -0.5
+				industry_free_repair_factor = 1
+				industry_repair_factor = 1
+			}
+		}
+		SAD_hryx = {
+			picture = ITA_il_sol_dell_avvenire_ns
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				army_org_factor = 0.1
+				army_attack_against_major_factor = 0.2
+				army_defence_against_major_factor = 0.2
+				breakthrough_factor = 0.1
+			}
+		}
+		SAD_nzrq = {
+			picture = RAJ_independence_movement
+			allowed_civil_war = {
+				always = yes
+			}
+			cancel = {
+				has_civil_war = no
+			}
+			modifier = {
+				army_core_attack_factor = 1
+				army_core_defence_factor = 1
+				breakthrough_factor = 2
+			}
+		}
 	}
 
 	political_advisor = {

src/common/ideas/tianjiang.txt

@@ -2078,7 +2078,10 @@ ideas = {
 		SAD_cbdzh_idea = {
 			picture = ITA_regia_marina_3
 			allowed_civil_war = {
-				always = yes
+				OR = {
+					has_government = fascism
+					has_government = neutrality
+				}
 			}
 			modifier = {
 				max_command_power = 50
@@ -2092,7 +2095,7 @@ ideas = {
 		SAD_wyhdtz = {
 			picture = ITA_italian_irredentism
 			allowed_civil_war = {
-				always = yes
+				has_government = fascism
 			}
 			modifier = {
 				offensive_war_stability_factor = 0.5
@@ -2104,7 +2107,10 @@ ideas = {
 		SAD_ylyzkql = {
 			picture = ITA_italian_irredentism
 			allowed_civil_war = {
-				always = yes
+				OR = {
+					has_government = fascism
+					has_government = neutrality
+				}
 			}
 			modifier = {
 				political_advisor_cost_factor = -0.5
@@ -2120,7 +2126,7 @@ ideas = {
 		SAD_meilizhiguo_idea = {
 			picture = ITA_shadow_of_mussolini
 			allowed_civil_war = {
-				always = yes
+				has_government = fascism
 			}
 			modifier = {
 				party_popularity_stability_factor = 0.15
@@ -2144,7 +2150,7 @@ ideas = {
 		SAD_mxsdjq_idea = {
 			picture = ITA_new_roman_empire_ns
 			allowed_civil_war = {
-				always = yes
+				has_government = fascism
 			}
 			modifier = {
 				production_factory_max_efficiency_factor = 0.3
@@ -2158,7 +2164,7 @@ ideas = {
 		SAD_weiyouyuxue_idea = {
 			picture = ITA_regio_esercito_3
 			allowed_civil_war = {
-				always = yes
+				has_government = fascism
 			}
 			modifier = {
 				consumer_goods_factor = -0.15
@@ -2211,7 +2217,10 @@ ideas = {
 		SAD_jiaotiaozhishang_idea = {
 			picture = ITA_papal_state_ns
 			allowed_civil_war = {
-				always = yes
+				OR = {
+					has_government = fascism
+					has_government = neutrality
+				}
 			}
 			modifier = {
 				resistance_target = -0.45
@@ -2223,7 +2232,10 @@ ideas = {
 		SAD_jinghuamanjiu_idea = {
 			picture = hol_depillarization
 			allowed_civil_war = {
-				always = yes
+				OR = {
+					has_government = fascism
+					has_government = neutrality
+				}
 			}
 			modifier = {
 				army_org_factor = 0.4
@@ -2236,7 +2248,7 @@ ideas = {
 		SAD_xindegangling_idea = {
 			picture = generic_political_support
 			allowed_civil_war = {
-				always = yes
+				has_government = fascism
 			}
 			modifier = {
 				party_popularity_stability_factor = 0.2
@@ -2248,7 +2260,7 @@ ideas = {
 		SAD_zhimindizhengbing_idea = {
 			picture = generic_women_in_the_army
 			allowed_civil_war = {
-				always = yes
+				has_government = fascism
 			}
 			modifier = {
 				non_core_manpower = 0.35
@@ -3047,12 +3059,12 @@ ideas = {
 				}
 			}
 			modifier = {
-				stability_factor = -0.2
-				war_support_factor = -0.2
+				stability_factor = -0.3
+				war_support_factor = -0.3
 				political_power_cost = 0.25
 				command_power_gain_mult = -0.2
-				army_core_attack_factor = -0.1
-				army_core_defence_factor = -0.1
+				army_core_attack_factor = -0.5
+				army_core_defence_factor = -0.5
 			}
 			
 		}
@@ -3072,8 +3084,8 @@ ideas = {
 			}
 			modifier = {
 				command_power_gain_mult = -0.1
-				army_core_attack_factor = 0.05
-				army_core_defence_factor = 0.05
+				army_core_attack_factor = 0.1
+				army_core_defence_factor = 0.1
 			}
 			
 		}
@@ -3093,11 +3105,13 @@ ideas = {
 			}
 			modifier = {
 				stability_factor = 0.1
-				war_support_factor = 0.2
+				war_support_factor = 0.1
 				political_power_cost = -0.25
 				command_power_gain_mult = 0.1
-				army_core_attack_factor = 0.15
-				army_core_defence_factor = 0.15
+				army_core_attack_factor = 0.3
+				army_core_defence_factor = 0.3
+				army_attack_factor = 0.1
+				army_defence_factor = 0.1
 			}
 			
 		}

src/common/national_focus/byg_focus.txt

@@ -3420,7 +3420,7 @@ focus_tree = {
 				target = BRA
 				autonomy_state = autonomy_dominion
 			}
-			add_faction_influence_ratio = 0.1
+			add_faction_influence_ratio = 0.02
 		}
 	}
 	focus = {
@@ -7049,7 +7049,7 @@ focus_tree = {
 			FOCUS_FILTER_HISTORICAL
 		}
 		completion_reward = {
-			add_faction_influence_ratio = 0.1
+			add_faction_influence_ratio = 0.03
 			custom_effect_tooltip = jiesuoluorijueyi_tip
 			add_breakthrough_progress = {
 				specialization = specialization_nuclear
@@ -7198,7 +7198,7 @@ focus_tree = {
 			factor = 100
 		}
 		completion_reward = {
-			add_faction_influence_ratio = 0.25
+			add_faction_influence_ratio = 0.1
 			every_other_country = {
 				limit = {
 					is_in_faction_with = BYG
@@ -7241,7 +7241,6 @@ focus_tree = {
 			set_faction_leader = yes
 			add_political_power = 200
 			add_war_support = 0.2
-			add_faction_influence_ratio = 0.1
 		}
 	}
 
@@ -7468,7 +7467,7 @@ focus_tree = {
 					country_event = az_tianjiang.337
 				}
 			}
-			add_faction_influence_ratio = 0.05
+			add_faction_influence_ratio = 0.02
 		}
 	}
 
@@ -7500,7 +7499,7 @@ focus_tree = {
 				}
 				add_ideas = BYG_zhkyry
 			}
-			add_faction_influence_ratio = 0.05
+			add_faction_influence_ratio = 0.02
 		}
 	}
 
@@ -7552,7 +7551,7 @@ focus_tree = {
 			WEX = {
 				country_event = az_tianjiang.343
 			}
-			add_faction_influence_ratio = 0.1
+			add_faction_influence_ratio = 0.05
 		}
 	}
 
@@ -7582,7 +7581,7 @@ focus_tree = {
 		}
 		completion_reward = {
 			custom_effect_tooltip = BYG_qiangxiandian_tips
-			add_faction_influence_ratio = 0.05
+			add_faction_influence_ratio = 0.01
 			BRA = {
 				set_cosmetic_tag = BRA_united_states_of_south_america_cos_tag
 				annex_country = { target = URG transfer_troops = yes }
@@ -7640,7 +7639,6 @@ focus_tree = {
 		}
 		completion_reward = {
 			custom_effect_tooltip = BYG_qiangxiandian_tips
-			add_faction_influence_ratio = 0.05
 			annex_country = { target = PAN transfer_troops = yes }
 			set_autonomy = {
 				target = MEX
@@ -7767,7 +7765,7 @@ focus_tree = {
 				add_stability = 0.1
 				add_popularity = { ideology = communism popularity = -0.2 }
 			}
-			add_faction_influence_ratio = 0.05
+			add_faction_influence_ratio = 0.01
 		}
 	}
 
@@ -7806,7 +7804,7 @@ focus_tree = {
 				navy_experience = 50
 				air_experience = 50
 			}
-			add_faction_influence_ratio = 0.05
+			add_faction_influence_ratio = 0.01
 		}
 	}
 
@@ -7860,7 +7858,7 @@ focus_tree = {
 					}
 				}
 			}
-			add_faction_influence_ratio = 0.2
+			add_faction_influence_ratio = 0.05
 		}
 	}
 
@@ -7889,7 +7887,7 @@ focus_tree = {
 		}
 		completion_reward = {
 			add_political_power = 100
-			add_faction_influence_ratio = 0.1
+			add_faction_influence_ratio = 0.02
 			HUJ = {
 				add_offsite_building = { type = industrial_complex level = 20 }
 				add_offsite_building = { type = arms_factory level = 20 }

src/common/national_focus/huangjia.txt

@@ -3175,7 +3175,7 @@ focus_tree = {
 				id = SWE
 				value = 200
 			}
-			add_faction_influence_ratio = 0.05
+			add_faction_influence_ratio = 0.01
 		}
 	}
 	focus = {
@@ -3283,6 +3283,31 @@ focus_tree = {
 					province = 1155
 				}
 			}
+			452 = {
+				add_building_construction = {
+					type = naval_base
+					level = 3
+					instant_build = yes
+					province = 10061
+				}
+				add_building_construction = {
+					type = naval_base
+					level = 2
+					instant_build = yes
+					province = 9989
+				}
+			}
+			447 = {
+				add_building_construction = {
+					type = supply_node
+					level = 1
+					instant_build = yes
+					province = 1071
+				}
+			}
+			build_railway = {
+				path = { 4076 1071 10061 9989 }
+			}
 		}
 	}
 	focus = {
@@ -3535,7 +3560,7 @@ focus_tree = {
 					category = naval_equipment
 				}
 			}
-			add_faction_influence_ratio = 0.05
+			add_faction_influence_ratio = 0.02
 		}
 	}
 	focus = {
@@ -3578,7 +3603,7 @@ focus_tree = {
 					level = 2
 				}
 			}
-			add_faction_influence_ratio = 0.05
+			add_faction_influence_ratio = 0.02
 		}
 	}
 	focus = {

src/common/national_focus/tiexue.txt

@@ -4074,6 +4074,9 @@ focus_tree = {
 						SAD = {
 							is_ai = no
 						}
+						SAD = {
+							has_completed_focus = SAD_baohuaodili
+						}
 					}
 				}
 				add_named_threat = {
@@ -7377,12 +7380,27 @@ focus_tree = {
 		}
 		completion_reward = {
 			guojishengyu_down_10 = yes
-			add_named_threat = {
-				threat = 10
-				name = "奥地利危机"
-			}
-			AUS = {
-				country_event = az_tianjiang.310
+			if = {
+				limit = {
+					SAD = {
+						has_completed_focus = SAD_baohuaodili
+					}
+				}
+				add_named_threat = {
+						threat = 10
+						name = "奥地利危机"
+				}
+				SAD = {
+					country_event = az_tianjiang.145
+				}
+			}else = {
+				add_named_threat = {
+					threat = 10
+					name = "奥地利危机"
+				}
+				AUS = {
+					country_event = az_tianjiang.310
+				}
 			}
 			effect_tooltip = {
 					custom_effect_tooltip = if_they_accept_tt
@@ -9129,26 +9147,12 @@ focus_tree = {
 		}
 		completion_reward = {
 			guojishengyu_down_10 = yes
-			if = {
-				limit = {
-					is_ai = no
-				}
-				add_named_threat = {
-					threat = 10
-					name = "奥地利危机"
-				}
-				SAD = {
-					country_event = az_tianjiang.145
-				}
+			add_named_threat = {
+				threat = 10
+				name = "奥地利危机"
 			}
-			else = {
-				add_named_threat = {
-					threat = 10
-					name = "吞并奥地利"
-				}
-				AUS = {
-					country_event = az_tianjiang.2
-				}
+			SAD = {
+				country_event = az_tianjiang.145
 			}
 			effect_tooltip = {
 					custom_effect_tooltip = if_they_accept_tt

src/common/national_focus/yuanwei_free.txt

@@ -471,7 +471,7 @@ focus_tree = {
 			set_cosmetic_tag = YUW_yuwjg
 			set_country_flag = YUW_huiguibentu
 			country_event = az_tianjiang.279
-			add_faction_influence_ratio = 0.25
+			add_faction_influence_ratio = 0.1
 		}
 	}
 	

src/common/on_actions/az_on_actions.txt

@@ -1,5 +1,13 @@
 on_actions = {
 	on_startup = { 
+		effect = {
+			every_country = {
+				set_technology = {
+					az_jianniangguo_tech = 1
+					popup = no
+				}
+			}
+		}
 		effect = { 
 			#开局音效
 			CHY = {
@@ -204,16 +212,6 @@ on_actions = {
 			}
 		} 
 	}
-	on_startup = {
-		effect = {
-			every_country = {
-				set_technology = {
-					az_jianniangguo_tech = 1
-					popup = no
-				}
-			}
-		}
-	}
 	on_monthly  = {
 		effect = {
 
@@ -261,55 +259,6 @@ on_actions = {
 					
 			}
 		}
-	}
-	on_puppet = {
-		effect = {
-			if = {
-				limit = {
-					AND = {
-						ROOT = {
-							shijianniangguojia_trigger = yes
-							NOT = { has_country_flag = jianniangyibeifuhuo }
-						}
-						FROM = {
-							shijianniangguojia_trigger = yes
-						}
-					}
-				}
-
-				FROM = {
-					country_event = getzhg_event.11
-				}
-				
-			}
-		}
-	}
-	on_annex = {
-		effect = {
-			if = {
-				limit = {
-					AND = {
-						FROM = {
-							shijianniangguojia_trigger = yes
-							NOT = { has_country_flag = jianniangyibeifuhuo }
-						}
-						ROOT = {
-							shijianniangguojia_trigger = yes
-						}
-					}
-				}
-
-				ROOT = {
-	
-					country_event = getzhg_event.1101
-				}
-			
-				
-					
-			}
-		}
-	}
-	on_capitulation = {
 		effect = {
 			if = {
 				limit = {
@@ -334,56 +283,6 @@ on_actions = {
 					
 			}
 		}
-	}
-	on_annex = {
-		effect = {
-			if = {
-				limit = {
-					has_global_flag = modoption_fengkuangai_on
-					AND = {
-						FROM = {
-							NOT = { has_country_flag = beilueduo }
-							shijianniangguojia_trigger = yes
-						}
-						ROOT = {
-							is_ai = no
-						}
-					}
-				}
-				
-				ROOT = {
-					country_event = { id = azevent.78 hours = 2 }
-				}
-				
-					
-			}
-		}
-	}
-	on_puppet = {
-		effect = {
-			if = {
-				limit = {
-					has_global_flag = modoption_fengkuangai_on
-					ROOT = {
-						NOT = { has_country_flag = beilueduo }
-						shijianniangguojia_trigger = yes
-					}
-					FROM = {
-						is_ai = no
-					}
-				}
-				ROOT = {
-					set_country_flag = beilueduo 
-				}
-				FROM = {
-					country_event = { id = azevent.78 hours = 2 }
-				}
-				
-					
-			}
-		}
-	}
-	on_capitulation = {
 		effect = {
 			if = {
 				limit = {
@@ -528,6 +427,48 @@ on_actions = {
 		}
 	}
 	on_puppet = {
+		effect = {
+			if = {
+				limit = {
+					AND = {
+						ROOT = {
+							shijianniangguojia_trigger = yes
+							NOT = { has_country_flag = jianniangyibeifuhuo }
+						}
+						FROM = {
+							shijianniangguojia_trigger = yes
+						}
+					}
+				}
+
+				FROM = {
+					country_event = getzhg_event.11
+				}
+				
+			}
+		}
+		effect = {
+			if = {
+				limit = {
+					has_global_flag = modoption_fengkuangai_on
+					ROOT = {
+						NOT = { has_country_flag = beilueduo }
+						shijianniangguojia_trigger = yes
+					}
+					FROM = {
+						is_ai = no
+					}
+				}
+				ROOT = {
+					set_country_flag = beilueduo 
+				}
+				FROM = {
+					country_event = { id = azevent.78 hours = 2 }
+				}
+				
+					
+			}
+		}
 		effect = {
 			if = {
 				limit = {
@@ -663,6 +604,53 @@ on_actions = {
 			}
 		}
 	}
+	on_annex = {
+		effect = {
+			if = {
+				limit = {
+					AND = {
+						FROM = {
+							shijianniangguojia_trigger = yes
+							NOT = { has_country_flag = jianniangyibeifuhuo }
+						}
+						ROOT = {
+							shijianniangguojia_trigger = yes
+						}
+					}
+				}
+
+				ROOT = {
+	
+					country_event = getzhg_event.1101
+				}
+			
+				
+					
+			}
+		}
+		effect = {
+			if = {
+				limit = {
+					has_global_flag = modoption_fengkuangai_on
+					AND = {
+						FROM = {
+							NOT = { has_country_flag = beilueduo }
+							shijianniangguojia_trigger = yes
+						}
+						ROOT = {
+							is_ai = no
+						}
+					}
+				}
+				
+				ROOT = {
+					country_event = { id = azevent.78 hours = 2 }
+				}
+				
+					
+			}
+		}
+	}
 	on_unit_leader_level_up = {
 		effect = {
 			#驱逐

src/common/on_actions/az_waring_on_actions.txt

@@ -1,5 +1,77 @@
 on_actions = {
 	on_startup = {
+		effect = {
+			SIR = {
+				country_event = az_tianjiang.324
+			}
+			BLI = {
+				country_event = az_tianjiang.324
+			}
+			CHY = {
+				country_event = az_tianjiang.324
+			}
+		}
+		effect = {
+			SHO = {
+				country_event = az_tianjiang.357
+			}
+			BOW = {
+				country_event = az_tianjiang.357
+			}
+			HOL = {
+				country_event = az_tianjiang.357
+			}
+		}
+		effect = {
+			every_country = {
+				limit = {
+					is_ai = no
+				}
+				#country_event = az_tianjiang.389
+				activate_mission = AZ_meizhoutiaozhan_jy_time
+			}
+		}
+		effect = {
+			every_country = {
+				limit = {
+					OR = {
+						tag = BYG
+						tag = HUJ
+						tag = TIX
+						tag = SAD
+						tag = BFL
+						tag = YUW
+						tag = DOH
+						tag = CHY
+						tag = BLI
+						tag = SIR
+						tag = DH1
+					}
+					is_ai = no
+				}
+				add_ideas = az_meitanzuobi
+			}
+		}
+		effect = {
+			every_country = {
+				limit = {
+					OR = {
+						tag = BYG
+						tag = HUJ
+						tag = TIX
+						tag = SAD
+						tag = BFL
+						tag = YUW
+						tag = DOH
+						tag = CHY
+						tag = BLI
+						tag = SIR
+					}
+					is_ai = yes
+				}
+				add_ideas = az_aimeitanzuobi
+			}
+		}
 		effect = {
 			CAN = {
 				#retire_country_leader = yes
@@ -220,287 +292,6 @@ on_actions = {
 			}
 		}
 	}
-	on_startup = {
-		effect = {
-			SIR = {
-				country_event = az_tianjiang.324
-			}
-			BLI = {
-				country_event = az_tianjiang.324
-			}
-			CHY = {
-				country_event = az_tianjiang.324
-			}
-		}
-	}
-	on_startup = {
-		effect = {
-			every_country = {
-				limit = {
-					OR = {
-						tag = BYG
-						tag = HUJ
-						tag = TIX
-						tag = SAD
-						tag = BFL
-						tag = YUW
-						tag = DOH
-						tag = CHY
-						tag = BLI
-						tag = SIR
-					}
-					is_ai = yes
-				}
-				add_ideas = az_aimeitanzuobi
-			}
-		}
-	}
-	on_startup = {
-		effect = {
-			every_country = {
-				limit = {
-					OR = {
-						tag = BYG
-						tag = HUJ
-						tag = TIX
-						tag = SAD
-						tag = BFL
-						tag = YUW
-						tag = DOH
-						tag = CHY
-						tag = BLI
-						tag = SIR
-						tag = DH1
-					}
-					is_ai = no
-				}
-				add_ideas = az_meitanzuobi
-			}
-		}
-	}
-	on_startup = {
-		effect = {
-			SHO = {
-				country_event = az_tianjiang.357
-			}
-			BOW = {
-				country_event = az_tianjiang.357
-			}
-			HOL = {
-				country_event = az_tianjiang.357
-			}
-		}
-	}
-	on_startup = {
-		effect = {
-			every_country = {
-				limit = {
-					is_ai = no
-				}
-				#country_event = az_tianjiang.389
-				activate_mission = AZ_meizhoutiaozhan_jy_time
-			}
-		}
-	}
-	on_capitulation = { 
-		effect = {
-	if = {
-				limit = { 
-					date > 1941.6.1
-					tag = TIX
-					has_government = fascism
-					is_puppet = no
-					not = { controls_state = 64 }
-					not = { country_exists = WEX }
-					has_global_flag = yaertahuiyi_chenggong
-					has_war_with = BFL
-					has_war_with = BYG
-					has_war_with = HUJ
-					BFL = {
-					surrender_progress < 0.4
-					}
-					HUJ = {
-					surrender_progress < 0.4
-					}
-					BYG = {
-					surrender_progress < 0.1
-					}
-				}	
-				set_global_flag = yaertahuiyi_chenggong_shishi
-				white_peace = { 
-					tag = HUJ
-				}
-				white_peace = { 
-					tag = BYG
-				}
-				white_peace = { 
-					tag = BFL
-				}
-				white_peace = { 
-					tag = YUW
-				}
-				white_peace = { 
-					tag = SAD
-				}
-				set_cosmetic_tag = TIX
-				TIX = {
-				add_country_leader_role = {
-				Character = TIX_z23
-				Promote_leader = yes
-				Country_leader = {
-					ideology = leninism
-					expire = "2000.1.1.1"
-					traits = {
-						jjdxxs
-						}
-					}
-				}
-				}
-		retire_character = TIX_xipeiershangjiang
-		release_on_controlled = CZE
-		release_on_controlled = AUS
-		release_on_controlled = NOR
-		release_on_controlled = DEN
-		release_on_controlled = HOL
-		release_on_controlled = BEL
-		release_on_controlled = LUX
-		CZE = {
-		annex_country = { target = SLO transfer_troops = no }
-		transfer_state = 73
-		transfer_state = 664
-		}
-		POL = {
-		transfer_state = 5
-		transfer_state = 63
-		transfer_state = 68
-		transfer_state = 66
-		transfer_state = 67
-		transfer_state = 85
-		transfer_state = 86
-		transfer_state = 807
-		transfer_state = 87
-		transfer_state = 98
-		transfer_state = 10
-		transfer_state = 762
-		transfer_state = 90
-		transfer_state = 88
-		transfer_state = 92
-		transfer_state = 97
-		add_state_core = 5
-		add_state_core = 63
-		add_state_core = 68
-		add_state_core = 66
-		add_state_core = 67
-		}
-		GER = {
-		#set_cosmetic_tag = XTIX
-		recruit_character = TIX_xipeiershangjiang
-		add_country_leader_role = {
-			character = TIX_xipeiershangjiang
-			promote_leader = yes
-			country_leader = {
-				expire = "4999.1.1"
-				ideology = liberalism
-				traits = {
-						
-				}
-			}
-			}
-		set_capital = { state = 51 }
-		transfer_state = 59
-		transfer_state = 55
-		transfer_state = 56
-		transfer_state = 57
-		transfer_state = 51
-		transfer_state = 42
-		transfer_state = 54
-		transfer_state = 50
-		transfer_state = 52
-		transfer_state = 53
-		transfer_state = 58
-		transfer_state = 909
-		transfer_state = 978
-		add_state_core = 58
-		add_state_core = 59
-		add_state_core = 55
-		add_state_core = 56
-		add_state_core = 57
-		add_state_core = 51
-		add_state_core = 42
-		add_state_core = 54
-		add_state_core = 50
-		add_state_core = 52
-		add_state_core = 53
-		add_state_core = 909
-		add_state_core = 978
-		}
-		51 = {
-		set_demilitarized_zone = yes
-		}
-		42 = {
-		set_demilitarized_zone = yes
-		}
-		BFL = {
-		country_event = { id = az_tianjiang.413 days = 1 }
-		#annex_country = { target = FIN transfer_troops = no }
-		annex_country = { target = UKR transfer_troops = no }
-		annex_country = { target = LAT transfer_troops = no }
-		annex_country = { target = EST transfer_troops = no }
-		annex_country = { target = BLR transfer_troops = no }
-		annex_country = { target = AZR transfer_troops = no }
-		annex_country = { target = GEO transfer_troops = no }
-		annex_country = { target = LIT transfer_troops = no }
-		transfer_state = 188
-		transfer_state = 763
-		transfer_state = 78
-		transfer_state = 80
-		transfer_state = 766
-		add_state_core = 763
-		set_autonomy = {
-			target = TIX
-			autonomy_state = autonomy_integrated_puppet
-		}
-		set_autonomy = {
-			target = POL
-			autonomy_state = autonomy_integrated_puppet
-		}
-		set_autonomy = {
-			target = CZE
-			autonomy_state = autonomy_integrated_puppet
-		}
-		set_autonomy = {
-			target = HUN
-			autonomy_state = autonomy_integrated_puppet
-		}
-		set_autonomy = {
-			target = ROM
-			autonomy_state = autonomy_integrated_puppet
-		}
-		}
-		set_province_name = { id = 6332 name = "萨悠斯格勒" }
-		BYG = {
-		set_autonomy = {
-			target = GER
-			autonomy_state = autonomy_integrated_puppet
-		}
-		}
-		DEN = {
-		set_cosmetic_tag = DEN
-		add_popularity = { ideology = democratic popularity = 0.3 }
-		set_politics = {
-			ruling_party = democratic
-		}
-		}
-		GER = {
-		add_popularity = { ideology = democratic popularity = 0.75 }
-		load_oob = GER_1939_nsb
-		}
-		add_popularity = { ideology = communism popularity = 0.75 }
-		news_event = { id = az_tianjiang.89 days = 1}
-		country_event = { id = az_tianjiang.414 days = 1 }
-	} 
-		}
-	}
 	on_capitulation = {
 		effect = {
 			if = {
@@ -511,6 +302,78 @@ on_actions = {
 				complete_national_focus = YUW_48
 			}
 		}
+		effect = {
+			if = {
+				limit = {
+					original_tag = SAD
+					has_civil_war = yes
+					has_government = fascism
+					is_in_faction_with = TIX
+					not = { tag = SAD }
+				}
+				SAD = {
+					annex_country = { target = PREV transfer_troops = no }
+				}
+			}
+		}
+		effect = {
+			if = {
+				limit = { 
+					ROOT = {
+						tag = TIX
+						is_puppet = no
+						has_government = fascism
+						has_global_flag = yaertahuiyi_chenggong
+						not = { has_global_flag = yaertahuiyi_chenggong_shishi }
+						not = { country_exists = WEX }
+						not = { controls_state = 64 }
+						has_war_with = BFL
+						has_war_with = BYG
+						has_war_with = HUJ
+					}
+					FROM = {
+						OR = {
+							tag = BFL
+							tag = HUJ
+							tag = BYG
+							tag = YUW
+							tag = SAD
+						}
+					}
+				}	
+				yaertahuiyi_effects = yes
+			} 
+		}
+	}
+	on_weekly_TIX = { 
+		effect = {
+			if = {
+				limit = { 
+					tag = TIX
+					date > 1941.6.1
+					surrender_progress > 0.7
+					has_government = fascism
+					is_puppet = no
+					not = { has_global_flag = yaertahuiyi_chenggong_shishi }
+					#not = { controls_state = 64 }
+					not = { country_exists = WEX }
+					has_global_flag = yaertahuiyi_chenggong
+					has_war_with = BFL
+					has_war_with = BYG
+					has_war_with = HUJ
+					BFL = {
+						surrender_progress < 0.4
+					}
+					HUJ = {
+						surrender_progress < 0.4
+					}
+					BYG = {
+						surrender_progress < 0.1
+					}
+				}
+				yaertahuiyi_effects = yes
+			}
+		}
 	}
 	on_monthly_DOH = { 
 		effect = {

src/common/on_actions/azshipgirl_on_actions.txt

@@ -63,7 +63,6 @@ on_actions = {
 			}
 		} 
 	}
-
 	on_declare_war = { 
 		effect = { 
 			if = { 
@@ -83,9 +82,7 @@ on_actions = {
 					set_country_flag = CHY_xuanzhan_DOH
 				}
 			}
-		} 
-	}
-	on_declare_war = { 
+		}
 		effect = { 
 			if = { 
 				limit = { 
@@ -105,8 +102,6 @@ on_actions = {
 				}
 			}
 		} 
-	}
-	on_declare_war = { 
 		effect = { 
 			if = { 
 				limit = { 
@@ -125,7 +120,7 @@ on_actions = {
 				}
 			}
 		} 
-	}	
+	}
 	on_annex = {
 		effect = { 
 			if = {

src/common/opinion_modifiers/az_opinion_modifiers.txt

@@ -67,4 +67,7 @@ opinion_modifiers = {
 		value = 40
 	}
 	BFL_sold_planes = { value = 25 months = 36 decay = 1 }
+	SAD_mulinzhengce_op = {
+		value = 40
+	}
 }

src/common/scripted_effects/az_tianjiang_scripted_effects.txt

@@ -0,0 +1,187 @@
+yaertahuiyi_effects = {
+	set_global_flag = yaertahuiyi_chenggong_shishi
+				white_peace = { 
+					tag = HUJ
+				}
+				white_peace = { 
+					tag = BYG
+				}
+				white_peace = { 
+					tag = BFL
+				}
+				white_peace = { 
+					tag = YUW
+				}
+				white_peace = { 
+					tag = SAD
+				}
+				set_cosmetic_tag = TIX
+				TIX = {
+				add_country_leader_role = {
+				Character = TIX_z23
+				Promote_leader = yes
+				Country_leader = {
+					ideology = leninism
+					expire = "2000.1.1.1"
+					traits = {
+						jjdxxs
+						}
+					}
+				}
+				}
+				TIX_xipeiershangjiang = {
+					set_nationality = GER
+				}
+				retire_character = TIX_xipeiershangjiang
+				release_on_controlled = CZE
+				release_on_controlled = AUS
+				release_on_controlled = NOR
+				release_on_controlled = DEN
+				release_on_controlled = HOL
+				release_on_controlled = BEL
+				release_on_controlled = LUX
+				CZE = {
+					annex_country = { target = SLO transfer_troops = no }
+					transfer_state = 73
+					transfer_state = 664
+				}
+				POL = {
+				transfer_state = 5
+				transfer_state = 63
+				transfer_state = 68
+				transfer_state = 66
+				transfer_state = 67
+				transfer_state = 85
+				transfer_state = 86
+				transfer_state = 807
+				transfer_state = 87
+				transfer_state = 98
+				transfer_state = 10
+				transfer_state = 762
+				transfer_state = 90
+				transfer_state = 88
+				transfer_state = 92
+				transfer_state = 97
+				add_state_core = 5
+				add_state_core = 63
+				add_state_core = 68
+				add_state_core = 66
+				add_state_core = 67
+				}
+				GER = {
+					#set_cosmetic_tag = XTIX
+					set_capital = { state = 51 }
+					transfer_state = 59
+					transfer_state = 55
+					transfer_state = 56
+					transfer_state = 57
+					transfer_state = 51
+					transfer_state = 42
+					transfer_state = 54
+					transfer_state = 50
+					transfer_state = 52
+					transfer_state = 53
+					transfer_state = 58
+					transfer_state = 909
+					transfer_state = 978
+					add_state_core = 58
+					add_state_core = 59
+					add_state_core = 55
+					add_state_core = 56
+					add_state_core = 57
+					add_state_core = 51
+					add_state_core = 42
+					add_state_core = 54
+					add_state_core = 50
+					add_state_core = 52
+					add_state_core = 53
+					add_state_core = 909
+					add_state_core = 978
+					recruit_character = TIX_xipeiershangjiang
+					add_country_leader_role = {
+						character = TIX_xipeiershangjiang
+						promote_leader = yes
+						country_leader = {
+							expire = "4999.1.1"
+							ideology = liberalism
+							traits = {
+
+							}
+						}
+					}
+				}
+				51 = {
+					set_demilitarized_zone = yes
+				}
+				42 = {
+					set_demilitarized_zone = yes
+				}
+				BFL = {
+					country_event = { id = az_tianjiang.413 days = 1 }
+					annex_country = { target = UKR transfer_troops = no }
+					annex_country = { target = LAT transfer_troops = no }
+					annex_country = { target = EST transfer_troops = no }
+					annex_country = { target = BLR transfer_troops = no }
+					annex_country = { target = AZR transfer_troops = no }
+					annex_country = { target = GEO transfer_troops = no }
+					annex_country = { target = LIT transfer_troops = no }
+					transfer_state = 188
+					transfer_state = 763
+					transfer_state = 78
+					transfer_state = 80
+					transfer_state = 766
+					add_state_core = 763
+					set_autonomy = {
+						target = TIX
+						autonomy_state = autonomy_integrated_puppet
+					}
+					set_autonomy = {
+						target = POL
+						autonomy_state = autonomy_integrated_puppet
+					}
+					set_autonomy = {
+						target = CZE
+						autonomy_state = autonomy_integrated_puppet
+					}
+					set_autonomy = {
+						target = HUN
+						autonomy_state = autonomy_integrated_puppet
+					}
+					set_autonomy = {
+						target = ROM
+						autonomy_state = autonomy_integrated_puppet
+					}
+				}
+				set_province_name = { id = 6332 name = "萨悠斯格勒" }
+				BYG = {
+					set_autonomy = {
+						target = GER
+						autonomy_state = autonomy_integrated_puppet
+					}
+				}
+				DEN = {
+					set_cosmetic_tag = DEN
+					add_popularity = { ideology = democratic popularity = 0.3 }
+					set_politics = {
+						ruling_party = democratic
+					}
+				}
+				GER = {
+					add_popularity = { ideology = democratic popularity = 0.75 }
+					load_oob = GER_1939_nsb
+				}
+				add_popularity = { ideology = communism popularity = 0.75 }
+				news_event = { id = az_tianjiang.89 days = 1}
+				country_event = { id = az_tianjiang.414 days = 1 }
+				random_other_country = {
+					limit = {
+						original_tag = SAD
+						has_government = fascism
+						not = { tag = SAD }
+						is_in_faction_with = TIX
+					}
+					SAD = {
+						annex_country = { target = PREV transfer_troops = no }
+					}
+				}
+}

src/common/scripted_localisation/az_sad_localisation.txt

@@ -0,0 +1,113 @@
+defined_text = {
+	name = SAD_diguohaijundajian
+	text = {
+		trigger = {
+			original_tag = SAD
+			OR = {
+				has_government = fascism
+				has_government = neutrality
+			}
+		}
+		localization_key = "帝国海军大建"
+	}
+	text = {
+		trigger = {
+			original_tag = SAD
+			OR = {
+				has_government = democratic
+				has_government = communism
+			}
+		}
+		localization_key = "共和国海军大建" 
+	}
+}
+
+defined_text = {
+	name = SAD_qudiweiyuanhui
+	text = {
+		trigger = {
+			original_tag = SAD
+			OR = {
+				has_government = fascism
+				has_government = neutrality
+			}
+		}
+		localization_key = "取缔委员会"
+	}
+	text = {
+		trigger = {
+			original_tag = SAD
+			OR = {
+				has_government = democratic
+				has_government = communism
+			}
+		}
+		localization_key = "取缔大议会" 
+	}
+}
+
+defined_text = {
+	name = SAD_qudiweiyuanhuidesc
+	text = {
+		trigger = {
+			original_tag = SAD
+			OR = {
+				has_government = fascism
+				has_government = neutrality
+			}
+		}
+		localization_key = "利托里奥委员会如今已经失去了权利，我们现在只需立法就可以消灭这个组织。"
+	}
+	text = {
+		trigger = {
+			original_tag = SAD
+			OR = {
+				has_government = democratic
+				has_government = communism
+			}
+		}
+		localization_key = "共和国大议会如今只是一个摆设，我们现在只需立法就可以消灭这个组织。" 
+	}
+}
+
+defined_text = { #
+	name = Getsadpanluandu
+	text = {
+		trigger = {
+			original_tag = SAD
+			check_variable = { var = az_mimoujincheng value = 100 compare = greater_than_or_equals }
+		}
+		localization_key = sadpld_jigao
+	}
+	text = {
+		trigger = {
+			original_tag = SAD
+			check_variable = { var = az_mimoujincheng value = 80 compare = greater_than_or_equals }
+			check_variable = { var = az_mimoujincheng value = 100 compare = less_than }
+		}
+		localization_key = sadpld_jiaogao
+	}
+	text = {
+		trigger = {
+			original_tag = SAD
+			check_variable = { var = az_mimoujincheng value = 40 compare = greater_than_or_equals }
+			check_variable = { var = az_mimoujincheng value = 80 compare = less_than }
+		}
+		localization_key = sadpld_gao
+	}
+	text = {
+		trigger = {
+			original_tag = SAD
+			check_variable = { var = az_mimoujincheng value = 0 compare = greater_than_or_equals }
+			check_variable = { var = az_mimoujincheng value = 40 compare = less_than }
+		}
+		localization_key = sadpld_di
+	}
+	text = {
+		trigger = {
+			original_tag = SAD
+			check_variable = { var = az_mimoujincheng value = 0 compare = less_than }
+		}
+		localization_key = sadpld_jidi
+	}
+}

src/common/unit_leader/az_traits.txt

@@ -770,4 +770,14 @@ leader_traits = {
 			factor = 0
 		}
 	}
+	SAD_buzhongjianniang = { 
+		type = all
+		trait_type = personality_trait
+		modifier = {
+			
+		}
+		new_commander_weight = {
+			factor = 0
+		}
+	}
 }