2024-11-16 20:00:50

src/common/characters/az_BFL_characters.txt

@@ -1075,4 +1075,67 @@ characters={
 			coordination_skill = 5
 		}
 	}
+
+	#scientists
+	BFL_kuersike_sci = {
+		name = BFL_kuersike
+		portraits={
+			army = {
+				large="gfx/leaders/BFL/kuersike.png"
+				small="gfx/interface/ideas/idea_kuersike.png"
+			}
+		}		
+		scientist = {
+			traits = { scientist_trait_nuclear_warfare_expert scientist_trait_gifted_engineer }
+			skills = {
+				specialization_nuclear = 2
+			}
+		}
+	}
+	BFL_fuluosiluofu_sci = {
+		name = BFL_fuluosiluofu
+		portraits={
+			army = {
+				large="gfx/leaders/BFL/fuluosiluofu.png"
+				small="gfx/interface/ideas/idea_fuluosiluofu.png"
+			}
+		}
+
+		scientist = {
+			traits = { scientist_trait_armored_specialist scientist_trait_genius }
+			skills = {
+				specialization_land = 3
+			}
+		}
+	}
+	BFL_qikaluofu_sci = {
+		name = BFL_qikaluofu
+		portraits={
+			army = {
+				large="gfx/leaders/BFL/qikaluofu.png"
+				small="gfx/interface/ideas/idea_qikaluofu.png"
+			}
+		}	
+		scientist = {
+			traits = { scientist_trait_surface_ship_specialist scientist_trait_bright }
+			skills = {
+				specialization_naval = 2
+			}
+		}
+	}
+	BFL_naximofu_sci = {
+		name = BFL_naximofu
+		portraits={
+			army = {
+				large="gfx/leaders/BFL/naximofu.png"
+				small="gfx/interface/ideas/idea_tashigan.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_rocketry_specialist scientist_trait_bombs_expert scientist_trait_fast_learner }
+			skills = {
+				specialization_air = 1
+			}
+		}	
+	}
 }

src/common/characters/az_BLI_characters.txt

@@ -739,4 +739,67 @@ characters={
 			}
 		}
 	}
+
+	#scientists
+	BLI_huangjinbuli_sci = {
+		name = BLI_huangjinbuli
+		portraits={
+			army = {
+				large="gfx/leaders/BLI/huangjinbuli.png"
+				small="gfx/interface/ideas/idea_huangjinbuli.png"
+			}
+		}	
+		scientist = {
+			traits = { scientist_trait_nuclear_power_expert scientist_trait_resourceful }
+			skills = {
+				specialization_nuclear = 2
+			}
+		}
+	}
+	BLI_baoduoliuhua_sci = {
+		name = BLI_baoduoliuhua
+		portraits={
+			army = {
+				large="gfx/leaders/BLI/baoduoliuhua.png"
+				small="gfx/interface/ideas/idea_baoduoliuhua.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_artillery_specialist scientist_trait_fast_learner }
+			skills = {
+				specialization_land = 1
+			}
+		}
+	}
+	BLI_laisha_sci = {
+		name = BLI_laisha
+		portraits={
+			army = {
+				large="gfx/leaders/BLI/laisha.png"
+				small="gfx/interface/ideas/idea_laisha.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_surface_ship_specialist scientist_trait_submarine_specialist scientist_trait_genius }
+			skills = {
+				specialization_naval = 3
+			}
+		}
+	}
+	BLI_keluodiya_sci = {
+		name = BLI_keluodiya
+		portraits={
+			army = {
+				large="gfx/leaders/BLI/keluodiya.png"
+				small="gfx/interface/ideas/idea_keluodiya.png"
+			}
+		}
+	
+		scientist = {
+			traits = { scientist_trait_jet_expert scientist_trait_electronics_specialist scientist_trait_brilliant_theorist }
+			skills = {
+				specialization_air = 2
+			}
+		}	
+	}
 }

src/common/characters/az_BYG_characters.txt

@@ -2080,4 +2080,67 @@ characters={
 			logistics_skill = 1
 		}
 	}
+
+        #scientists
+	BYG_hailunna_sci = {
+		name = BYG_hailunna
+		portraits={
+			army = {
+				large="gfx/leaders/BYG/hailunna.png"
+				small="gfx/interface/ideas/idea_hailunna.png"
+			}
+		}		
+		scientist = {
+			traits = { scientist_trait_nuclear_specialist scientist_trait_nuclear_power_expert scientist_trait_genius }
+			skills = {
+				specialization_nuclear = 3
+			}
+		}
+	}
+	BYG_xingzuo_sci = {
+		name = BYG_xingzuo
+		portraits={
+			army = {
+				large="gfx/leaders/BYG/xingzuo.png"
+				small="gfx/interface/ideas/idea_xingzuo.png"
+			}
+		}
+
+		scientist = {
+			traits = { scientist_trait_artillery_specialist scientist_trait_bright }
+			skills = {
+				specialization_land = 2
+			}
+		}
+	}
+	BYG_linuo_sci = {
+		name = BYG_linuo
+		portraits={
+			army = {
+				large="gfx/leaders/BYG/linuo.png"
+				small="gfx/interface/ideas/idea_linuo.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_surface_ship_specialist scientist_trait_gifted_engineer }
+			skills = {
+				specialization_naval = 3
+			}
+		}
+	}
+	BYG_qiershazhi_sci = {
+		name = BYG_qiershazhi
+		portraits={
+			army = {
+				large="gfx/leaders/BYG/qiershazhi.png"
+				small="gfx/interface/ideas/idea_qiershazhi.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_rocketry_specialist scientist_trait_guidance_systems_expert scientist_trait_electronics_specialist scientist_trait_brilliant_theorist }
+			skills = {
+				specialization_air = 2
+			}
+		}	
+	}
 }

src/common/characters/az_CHY_characters.txt

@@ -1348,8 +1348,8 @@ characters={
 			skill = 2
 			attack_skill = 2
 			defense_skill = 2
-			planning_skill = 2
-			logistics_skill = 1
+			maneuvering_skill = 2
+			coordination_skill = 1
 		}	
 	}
 	CHY_haifeng = {
@@ -1372,8 +1372,8 @@ characters={
 			skill = 2
 			attack_skill = 2
 			defense_skill = 1
-			planning_skill = 2
-			logistics_skill = 2
+			maneuvering_skill = 2
+			coordination_skill = 2
 		}	
 	}
 	CHY_gecheng = {
@@ -1629,7 +1629,7 @@ characters={
 					is_ai = no
 				}
 			}
-			traits = { hangmu_army organizer logistics inflexible_strategist }
+			traits = { hangmu_army organizer inflexible_strategist }
 			skill = 3
 			attack_skill = 3
 			defense_skill = 3
@@ -1677,7 +1677,7 @@ characters={
 					is_ai = no
 				}
 			}
-			traits = { zhanlie_army media_personality reckless }
+			traits = { zhanlie_army media_personality }
 			skill = 2
 			attack_skill = 2
 			defense_skill = 1
@@ -1749,7 +1749,7 @@ characters={
 					is_ai = no
 				}
 			}
-			traits = { xunyang_army cautious }
+			traits = { xunyang_army trait_cautious }
 			skill = 3
 			attack_skill = 2
 			defense_skill = 4
@@ -1916,4 +1916,82 @@ characters={
 			logistics_skill = 3
 		}	
 	}
+	#scientists
+	CHY_mingshi_sci = {
+		name = CHY_mingshi
+		portraits={
+			army = {
+				large="gfx/leaders/CHY/mingshi.png"
+				small="gfx/interface/ideas/idea_mingshi.png"
+			}
+		}
+		
+		scientist = {
+			traits = { scientist_trait_nuclear_specialist scientist_trait_resourceful }
+			skills = {
+				specialization_nuclear = 1
+			}
+		}
+	}
+	CHY_lingbo_sci = {
+		name = CHY_lingbo
+		portraits={
+			army = {
+				large="gfx/leaders/CHY/lingbo.png"
+				small="gfx/interface/ideas/idea_lingbo.png"
+			}
+		}
+
+		scientist = {
+			traits = { scientist_trait_artillery_specialist scientist_trait_fast_learner }
+			skills = {
+				specialization_land = 1
+			}
+		}
+	}
+	CHY_xizhang_sci = {
+		name = CHY_xizhang
+		portraits={
+			army = {
+				large="gfx/leaders/CHY/xizhang.png"
+				small="gfx/interface/ideas/idea_xizhang.png"
+			}
+		}	
+		scientist = {
+			traits = { scientist_trait_submarine_specialist scientist_trait_bright }
+			skills = {
+				specialization_naval = 2
+			}
+		}
+	}
+	CHY_shentong_sci = {
+		name = CHY_shentong
+		portraits={
+			army = {
+				large="gfx/leaders/CHY/shentong.png"
+				small="gfx/interface/ideas/idea_shentong.png"
+			}
+		}	
+		scientist = {
+			traits = { scientist_trait_surface_ship_specialist scientist_trait_genius }
+			skills = {
+				specialization_naval = 3
+			}
+		}	
+	}
+	CHY_xinnong_sci = {
+		name = CHY_xinnong
+		portraits={
+			army = {
+				large="gfx/leaders/CHY/xinnong.png"
+				small="gfx/interface/ideas/idea_xinnong.png"
+			}
+		}		
+		scientist = {
+			traits = { scientist_trait_aircraft_specialist scientist_trait_jet_expert scientist_trait_genius }
+			skills = {
+				specialization_air = 3
+			}
+		}	
+	}
 }

src/common/characters/az_DOH_characters.txt

@@ -1281,4 +1281,68 @@ characters={
 			}
 		}
 	}
+
+	#scientists
+	DOH_dingan_sci = {
+		name = DOH_dingan
+		portraits = { 
+			army = {
+				large="gfx/leaders/DOH/dingan.png"
+				small="gfx/interface/ideas/idea_dingan.png"
+			} 
+		}	
+		scientist = {
+			traits = { scientist_trait_nuclear_specialist scientist_trait_fast_learner }
+			skills = {
+				specialization_nuclear = 1
+			}
+		}
+	}
+	DOH_jian_sci = {
+		name = DOH_jian
+		portraits = { 
+			army = {
+				large="gfx/leaders/DOH/jian.png"
+				small="gfx/interface/ideas/idea_jian.png"
+			} 
+		}
+	
+
+		scientist = {
+			traits = { scientist_trait_artillery_specialist scientist_trait_genius }
+			skills = {
+				specialization_land = 3
+			}
+		}
+	}
+	DOH_huajia_sci = {
+		name = DOH_huajia
+		portraits = { 
+			army = {
+				large="gfx/leaders/DOH/huajia.png"
+				small="gfx/interface/ideas/idea_huajia.png"
+			} 
+		}
+		scientist = {
+			traits = { scientist_trait_surface_ship_specialist scientist_trait_gifted_engineer }
+			skills = {
+				specialization_naval = 1
+			}
+		}
+	}
+	DOH_zhenhai_sci = {
+		name = DOH_zhenhai
+		portraits = { 
+			army = {
+				large="gfx/leaders/DOH/zhenhai.png"
+				small="gfx/interface/ideas/idea_zhenhai.png"
+			} 
+		}
+		scientist = {
+			traits = { scientist_trait_rocketry_specialist scientist_trait_guidance_systems_expert scientist_trait_brilliant_theorist }
+			skills = {
+				specialization_air = 1
+			}
+		}	
+	}
 }

src/common/characters/az_HUJ_characters.txt

@@ -1434,4 +1434,67 @@ characters={
 			logistics_skill = 3
 		}
 	}
+
+	#scientists
+	HUJ_chaijun_sci = {
+		name = HUJ_chaijun
+		portraits={
+			army = {
+				large="gfx/leaders/HUJ/chaijun.png"
+				small="gfx/interface/ideas/idea_chaijun.png"
+			}
+		}		
+		scientist = {
+			traits = { scientist_trait_nuclear_specialist scientist_trait_schrodingers_trait }
+			skills = {
+				specialization_nuclear = 2
+			}
+		}
+	}
+	HUJ_dujiaoshou_sci = {
+		name = HUJ_dujiaoshou
+		portraits={
+			army = {
+				large="gfx/leaders/HUJ/dujiaoshou.png"
+				small="gfx/interface/ideas/idea_dujiaoshou.png"
+			}
+		}
+
+		scientist = {
+			traits = { scientist_trait_artillery_specialist scientist_trait_resourceful }
+			skills = {
+				specialization_land = 1
+			}
+		}
+	}
+	HUJ_yingxianzuo_sci = {
+		name = HUJ_yingxianzuo
+		portraits={
+			army = {
+				large="gfx/leaders/HUJ/yingxianzuo.png"
+				small="gfx/interface/ideas/idea_yingxianzuo.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_surface_ship_specialist scientist_trait_genius }
+			skills = {
+				specialization_naval = 3
+			}
+		}
+	}
+	HUJ_aerbien_sci = {
+		name = HUJ_aerbien
+		portraits={
+			army = {
+				large="gfx/leaders/HUJ/aerbien.png"
+				small="gfx/interface/ideas/idea_aerbien.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_aircraft_specialist scientist_trait_bombs_expert scientist_trait_electronics_specialist scientist_trait_bright }
+			skills = {
+				specialization_air = 3
+			}
+		}	
+	}
 }

src/common/characters/az_SAD_characters.txt

@@ -931,7 +931,6 @@ characters={
 		portraits={
 			army = {
 				large="gfx/leaders/SAD/nabulesi.png"
-				#small="gfx/interface/ideas/idea_boerzhanuo.png"
 			}
 		}
 		corps_commander = {
@@ -950,4 +949,81 @@ characters={
 			logistics_skill = 5
 		}
 	}
+
+	#scientists
+	SAD_xibeifeng_sci = {
+		name = SAD_xibeifeng
+		portraits={
+			army = {
+				large="gfx/leaders/SAD/xibeifeng.png"
+				small="gfx/interface/ideas/idea_xibeifeng.png"
+			}
+		}		
+		scientist = {
+			traits = { scientist_trait_nuclear_specialist scientist_trait_bright }
+			skills = {
+				specialization_nuclear = 2
+			}
+		}
+	}
+	SAD_boerzhanuo_sci = {
+		name = SAD_boerzhanuo
+		portraits={
+			army = {
+				large="gfx/leaders/SAD/boerzhanuo.png"
+			}
+		}
+	
+		scientist = {
+			traits = { scientist_trait_artillery_specialist scientist_trait_fast_learner }
+			skills = {
+				specialization_land = 1
+			}
+		}
+	}
+	SAD_daleike_sci = {
+		name = SAD_daleike
+		portraits={
+			army = {
+				large="gfx/leaders/SAD/daleike.png"
+				small="gfx/interface/ideas/idea_daleike.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_surface_ship_specialist scientist_trait_gifted_engineer }
+			skills = {
+				specialization_naval = 2
+			}
+		}
+	}
+	SAD_abuluqi_sci = {
+		name = SAD_abuluqi
+		portraits={
+			army = {
+				large="gfx/leaders/SAD/abuluqi.png"
+				small="gfx/interface/ideas/idea_abuluqi.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_bombs_expert scientist_trait_resourceful }
+			skills = {
+				specialization_air = 1
+			}
+		}	
+	}
+	SAD_diguo_sci = {
+		name = SAD_abuluqi
+		portraits={
+			army = {
+				large="gfx/leaders/SAD/diguo.png"
+				small="gfx/interface/ideas/idea_diguo.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_rocketry_specialist scientist_trait_aircraft_specialist scientist_trait_genius }
+			skills = {
+				specialization_air = 3
+			}
+		}	
+	}
 }

src/common/characters/az_SIR_characters.txt

@@ -373,7 +373,7 @@ characters={
 		}
 	}
 	SIR_ceshizhe = {
-		name = SIR_ceshizhe
+		name = SR1_ceshizhe
 		portraits={
 			army = {
 				large="gfx/leaders/SIR/ceshizhe.png"
@@ -441,4 +441,67 @@ characters={
 			}
 		}
 	}
+
+	#scientists
+	SIR_sairenjiaojisi_sci = {
+		name = SIR_sairenjiaojisi
+		portraits={
+			army = {
+				large="gfx/leaders/SIR/youlingsha.png"
+				small="gfx/interface/ideas/idea_youlingsha.png"
+			}
+		}		
+		scientist = {
+			traits = { scientist_trait_nuclear_specialist scientist_trait_gifted_engineer }
+			skills = {
+				specialization_nuclear = 2
+			}
+		}
+	}
+	SR1_guanchazhe_sci = {
+		name = SIR_guanchazhe
+		portraits={
+			army = {
+				large="gfx/leaders/SIR/guanchazhe.png"
+				small="gfx/interface/ideas/idea_guanchazhe.png"
+			}
+		}
+
+		scientist = {
+			traits = { scientist_trait_armored_specialist scientist_trait_fast_learner }
+			skills = {
+				specialization_land = 1
+			}
+		}
+	}
+	SIR_jinghuazhe_sci = {
+		name = SIR_jinghuazhe
+		portraits={
+			army = {
+				large="gfx/leaders/SIR/jinghuazhe.png"
+				small="gfx/interface/ideas/idea_jinghuazhe.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_surface_ship_specialist scientist_trait_gifted_engineer }
+			skills = {
+				specialization_naval = 2
+			}
+		}
+	}
+	SIR_ceshizhe_sci = {
+		name = SR1_ceshizhe
+		portraits={
+			army = {
+				large="gfx/leaders/SIR/ceshizhe.png"
+				small="gfx/interface/ideas/idea_ceshizhe.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_electronics_specialist scientist_trait_jet_expert scientist_trait_brilliant_theorist }
+			skills = {
+				specialization_air = 2
+			}
+		}	
+	}
 }

src/common/characters/az_TIX_characters.txt

@@ -1646,4 +1646,67 @@ characters={
 			logistics_skill = 2
 		}
 	}
+
+	#scientists
+	TIX_kelong_sci = {
+		name = TIX_kelong
+		portraits={
+			army = {
+				large="gfx/leaders/TIX/kelong.png"
+				small="gfx/interface/ideas/idea_kelong.png"
+			}
+		}		
+		scientist = {
+			traits = { scientist_trait_nuclear_specialist scientist_trait_brilliant_theorist }
+			skills = {
+				specialization_nuclear = 2
+			}
+		}
+	}
+	TIX_huteng_sci = {
+		name = TIX_huteng
+		portraits={
+			army = {
+				large="gfx/leaders/TIX/huteng.png"
+				small="gfx/interface/ideas/idea_huteng.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_armored_specialist scientist_trait_bright }
+			skills = {
+				specialization_land = 3
+			}
+		}
+	}
+	TIX_aogusite_sci = {
+		name = TIX_aogusite
+		portraits={
+			army = {
+				large="gfx/leaders/TIX/aogusite.png"
+				small="gfx/interface/ideas/idea_aogusite.png"
+			}
+		}	
+		scientist = {
+			traits = { scientist_trait_surface_ship_specialist scientist_trait_submarine_specialist scientist_trait_gifted_engineer }
+			skills = {
+				specialization_naval = 2
+			}
+		}
+	}
+	TIX_bide_sci = {
+		name = TIX_bide
+		portraits={
+			army = {
+				large="gfx/leaders/TIX/bide.png"
+				small="gfx/interface/ideas/idea_bide.png"
+			}
+		}
+	
+		scientist = {
+			traits = { scientist_trait_rocketry_specialist scientist_trait_helicopter_expert scientist_trait_genius }
+			skills = {
+				specialization_air = 3
+			}
+		}	
+	}
 }

src/common/characters/az_YUW_characters.txt

@@ -315,7 +315,6 @@ characters={
 				large="gfx/leaders/YUW/beiyaen.png"
 				small="gfx/interface/ideas/idea_beiyaen.png"
 			}
-
 		}
 
 		corps_commander = {
@@ -608,7 +607,6 @@ characters={
 				large="gfx/leaders/YUW/jiasikenie.png"
 				small="gfx/interface/ideas/idea_jiasikenie.png"
 			}
-
 		}
 		advisor = {
 			cost = 100
@@ -1441,4 +1439,67 @@ characters={
 			logistics_skill = 2
 		}
 	}
+
+	#scientists
+	YUW_sitelasibao_sci = {
+		name = YUW_sitelasibao
+		portraits={
+			army = {
+				large="gfx/leaders/YUW/sitelasibao.png"
+				small="gfx/interface/ideas/idea_buleisite.png"
+			}
+		}		
+		scientist = {
+			traits = { scientist_trait_nuclear_power_expert scientist_trait_bright }
+			skills = {
+				specialization_nuclear = 1
+			}
+		}
+	}
+	YUW_jiasikenie_sci = {
+		name = YUW_jiasikenie
+		portraits={
+			army = {
+				large="gfx/leaders/YUW/jiasikenie.png"
+				small="gfx/interface/ideas/idea_jiasikenie.png"
+			}
+		}
+
+		scientist = {
+			traits = { scientist_trait_artillery_specialist scientist_trait_brilliant_theorist }
+			skills = {
+				specialization_land = 3
+			}
+		}
+	}
+	YUW_aersasi_sci = {
+		name = YUW_aersasi
+		portraits={
+			army = {
+				large="gfx/leaders/YUW/aersasi.png"
+				small="gfx/interface/ideas/idea_aersasi.png"
+			}
+		}	
+		scientist = {
+			traits = { scientist_trait_surface_ship_specialist scientist_trait_gifted_engineer }
+			skills = {
+				specialization_naval = 2
+			}
+		}
+	}
+	YUW_beiyaen_sci = {
+		name = YUW_beiyaen
+		portraits={
+			army = {
+				large="gfx/leaders/YUW/beiyaen.png"
+				small="gfx/interface/ideas/idea_beiyaen.png"
+			}
+		}
+		scientist = {
+			traits = { scientist_trait_electronics_specialist scientist_trait_bombs_expert scientist_trait_bright }
+			skills = {
+				specialization_air = 2
+			}
+		}	
+	}
 }

src/common/decisions/tianjiang_aizuobi_decisions.txt

@@ -1511,6 +1511,7 @@ tianjiang_aizuobi = {
 			tag = CHY
 			is_ai = yes
 			date > 1936.2.1
+			is_special_project_completed = sp:sp_naval_super_heavy_battleship
 		}
 		visible = {
 			tag = CHY

src/common/ideas/yuw.txt

@@ -1,5 +1,15 @@
 ideas = {
 	country = {
+		YUW_yuanweilujunfangshouweizhu_idea = {
+			picture = FRA_fortification_focus
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				bunker_max_level_terrain_limit = 4
+				coastal_bunker_max_level_terrain_limit = 4
+			}
+		}
 		YUW_zhandourengzaijuxu_idea = {
 			picture = SWE_neither_death_nor_dishonor
 			allowed_civil_war = {

src/common/names/az_names.txt

@@ -111,195 +111,260 @@ default = {
 		可可奈尔
 	}
 	callsigns = { "淑惠阿姨" "杰哥" "阿伟" "超勇" "帅比" "笨比" "猪比" "伞兵" "彪子" "睿智" "憨憨" "金轮" "大司马" "芜湖起飞" "神魔恋" "燕双鹰" "伊势" "塔塔开" "优妮控" }
+	
 }
 DOH = {
 	male = {
 		names = {
-			赵
-			钱
-			孙
 			李
-			周
-			吴
-			郑
-			王
-			冯
-			陈
-			褚
-			卫
-			蒋
+			夏
+			云
+			林
+			涂山
+			华
+			白
+			方
+			叶
+			唐
 			沈
-			韩
-			杨
-			朱
+			苏
+			上官
 			秦
-			尤
-			许
-			何
-			吕
-			施
-			张
+			杨
+			姬
+			欧阳
+			孙
+			姜
 		}
 	}
 	female = {
 		names = {
-			赵
-			钱
-			孙
 			李
-			周
-			吴
-			郑
-			王
-			冯
-			陈
-			褚
-			卫
-			蒋
+			夏
+			云
+			林
+			涂山
+			华
+			白
+			方
+			叶
+			唐
 			沈
-			韩
-			杨
-			朱
+			苏
+			上官
 			秦
-			尤
-			许
-			何
-			吕
-			施
-			张
+			杨
+			姬
+			欧阳
+			孙
+			姜
 		}
 	}
 	surnames = {
-		初蝶
-		嘉然
-		玉茗
-		冬梅
-		巧夏
-		水生
-		倾瑶
-		笑川
-		惜灵
-		宝庆
-		白山
-		翠曼
-		梦槐
-		忆丹
-		黄武
-		永泰
-		海露
-		怀萍
-		洁
-		向卉
-		波波
-		显庆
-		景
-		芷
-		迎蓉
-		莹莹
-		逸
-		傲旋
-		寻凝
-		凌瑶
-		凝安
-		访烟
-		如彤
-		小乐
-		延熹
+		清歌
+		梦寻
+		秋染
+		易安
+		饮冰
+
+		长安
+		洛阳
+		金陵
+		开封
+		安阳
+		商都
+		云中
+
+		茉莉
+		龙井
+		雀舌
+		祁红
+		普洱
+
+		立春
+		雨水
+		惊蛰
+		春分
+		清明
+		谷雨
+		立夏
+		小满
+		芒种
+		夏至
+		小暑
+		大暑
+		立秋
+		处暑
+		白露
+		秋分
+		寒露
+		霜降
+		立冬
+		小雪
+		大雪
+		冬至
+		小寒
+		大寒
+
+		龙骧
+		虎威
+		海昭
+		海震
+		飞鸿
+		南琛 
+		保宁
+		保民
+		郢荆
+		湍济
+		海容
+		海安
+		镇东
+		镇西
+		镇南
+		镇北
+		镇中
+		镇边
+		定远
+		镇远
+		经远
+		来远
+		致远
+		靖远
+		济远
+		平远
+		驭远
+	}
+	operation = { 
+		154 = {
+			"折樱"
+		}
 	}
 }
 DH1 = {
 	male = {
 		names = {
-			赵
-			钱
-			孙
 			李
-			周
-			吴
-			郑
-			王
-			冯
-			陈
-			褚
-			卫
-			蒋
+			夏
+			云
+			林
+			涂山
+			华
+			白
+			方
+			叶
+			唐
 			沈
-			韩
-			杨
-			朱
+			苏
+			上官
 			秦
-			尤
-			许
-			何
-			吕
-			施
-			张
+			杨
+			姬
+			欧阳
+			孙
+			姜
 		}
 	}
 	female = {
 		names = {
-			赵
-			钱
-			孙
 			李
-			周
-			吴
-			郑
-			王
-			冯
-			陈
-			褚
-			卫
-			蒋
+			夏
+			云
+			林
+			涂山
+			华
+			白
+			方
+			叶
+			唐
 			沈
-			韩
-			杨
-			朱
+			苏
+			上官
 			秦
-			尤
-			许
-			何
-			吕
-			施
-			张
+			杨
+			姬
+			欧阳
+			孙
+			姜
 		}
 	}
 	surnames = {
-		初蝶
-		嘉然
-		玉茗
-		冬梅
-		巧夏
-		水生
-		倾瑶
-		笑川
-		惜灵
-		宝庆
-		白山
-		翠曼
-		梦槐
-		忆丹
-		黄武
-		永泰
-		海露
-		怀萍
-		洁
-		向卉
-		波波
-		显庆
-		景
-		芷
-		迎蓉
-		莹莹
-		逸
-		傲旋
-		寻凝
-		凌瑶
-		凝安
-		访烟
-		如彤
-		小乐
-		延熹
+		清歌
+		梦寻
+		秋染
+		易安
+		饮冰
+
+		长安
+		洛阳
+		金陵
+		开封
+		安阳
+		商都
+		云中
+
+		茉莉
+		龙井
+		雀舌
+		祁红
+		普洱
+
+		立春
+		雨水
+		惊蛰
+		春分
+		清明
+		谷雨
+		立夏
+		小满
+		芒种
+		夏至
+		小暑
+		大暑
+		立秋
+		处暑
+		白露
+		秋分
+		寒露
+		霜降
+		立冬
+		小雪
+		大雪
+		冬至
+		小寒
+		大寒
+
+		龙骧
+		虎威
+		海昭
+		海震
+		飞鸿
+		南琛 
+		保宁
+		保民
+		郢荆
+		湍济
+		海容
+		海安
+		镇东
+		镇西
+		镇南
+		镇北
+		镇中
+		镇边
+		定远
+		镇远
+		经远
+		来远
+		致远
+		靖远
+		济远
+		平远
+		驭远
+	}
+	operation = { 
+		154 = {
+			"折樱"
+		}
 	}
 }
 CHY = {

src/common/national_focus/beifanglianhe.txt

@@ -3818,7 +3818,7 @@
 					}
 					NOT = { has_war_with = ROOT }
 				}
-				add_opinion_modifier = { target = SOV modifier = SOV_anti_fascist_policies_good } 
+				add_opinion_modifier = { target = BFL modifier = SOV_anti_fascist_policies_good } 
 			}
 
 			every_other_country = {
@@ -3826,7 +3826,7 @@
 					is_major = yes
 					has_government = fascism
 				}
-				add_opinion_modifier = { target = SOV modifier = SOV_anti_fascist_policies_bad } 
+				add_opinion_modifier = { target = BFL modifier = SOV_anti_fascist_policies_bad } 
 			}
 		}
 	}
@@ -3866,7 +3866,7 @@
 					}
 					NOT = { has_war_with = ROOT }
 				}
-				add_opinion_modifier = { target = SOV modifier = SOV_anti_capitalist_policies_good } 
+				add_opinion_modifier = { target = BFL modifier = SOV_anti_capitalist_policies_good } 
 			}
 
 			every_other_country = {
@@ -3874,7 +3874,7 @@
 					is_major = yes
 					has_government = democratic
 				}
-				add_opinion_modifier = { target = SOV modifier = SOV_anti_capitalist_policies_bad } 
+				add_opinion_modifier = { target = BFL modifier = SOV_anti_capitalist_policies_bad } 
 			}
 		}
 	}

src/common/national_focus/sad_focus.txt

@@ -2738,6 +2738,13 @@ focus_tree = {
 				}
 				add_core_of = SAD
 			}
+			effect_tooltip = {
+				custom_effect_tooltip = if_they_accept_tt
+				annex_country = { target = ALB transfer_troops = no }
+
+				custom_effect_tooltip = if_they_refuse_tt
+				create_wargoal = { target = ALB type = take_state_focus }
+			}
 		}
 	}
 	focus = {
@@ -3614,6 +3621,16 @@ focus_tree = {
 				}
 			}
 			custom_effect_tooltip = sad_swiyuwganshekenenggao
+			effect_tooltip = {
+					custom_effect_tooltip = if_they_accept_tt
+					transfer_state = 846
+					add_stability = 0.1
+					add_war_support = 0.1
+					add_political_power = 50
+
+					custom_effect_tooltip = if_they_refuse_tt
+					declare_war_on = { target = YUW type = annex_everything }
+			}
 		}
 	}
 	focus = {

src/common/national_focus/tiexue.txt

@@ -6817,7 +6817,7 @@ focus_tree = {
 			focus = TIX_xuanchengchisediguo
 		}
 		relative_position_id = TIX_xuanchengchisediguo
-		cost = 5
+		cost = 8
 		allow_branch = {
 			has_global_flag = MOD_azurlane_tianjiangjianniang
 		}
@@ -6890,7 +6890,7 @@ focus_tree = {
 			focus = TIX_xuanchengchisediguo
 		}
 		relative_position_id = TIX_xuanchengchisediguo
-		cost = 5
+		cost = 8
 		allow_branch = {
 			has_global_flag = MOD_azurlane_tianjiangjianniang
 		}
@@ -6945,7 +6945,7 @@ focus_tree = {
 			focus = TIX_xuanchengchisediguo
 		}
 		relative_position_id = TIX_xuanchengchisediguo
-		cost = 5
+		cost = 8
 		allow_branch = {
 			has_global_flag = MOD_azurlane_tianjiangjianniang
 		}
@@ -7010,7 +7010,7 @@ focus_tree = {
 			focus = TIX_dongfangshengcunkongjian
 		}
 		relative_position_id = TIX_beifangzuihoutongdie
-		cost = 5
+		cost = 8
 		allow_branch = {
 			has_global_flag = MOD_azurlane_tianjiangjianniang
 		}
@@ -7052,7 +7052,38 @@ focus_tree = {
 			factor = 50
 		}
 		completion_reward = {
-			
+			add_ai_strategy = {
+				type = alliance
+				id = "SAD"			
+				value = 500
+			}
+			add_ai_strategy = {
+				type = befriend
+				id = SAD
+				value = 200
+			}
+			add_opinion_modifier = { target = SAD modifier = SOV_anti_capitalist_policies_good } 
+		SAD = {
+			add_ai_strategy = {
+				type = befriend
+				id = TIX			
+				value = 200
+			}
+			add_ai_strategy = {
+				type = alliance
+				id = "TIX"			
+				value = 500
+			}
+			add_opinion_modifier = { target = TIX modifier = SOV_anti_capitalist_policies_good } 
+		}
+		if = {
+		limit = {
+		SAD = { is_ai = yes  }
+		}
+		TIX = {
+			add_to_faction = SAD
+		}
+		}
 		}
 	}
 	focus = {
@@ -7070,7 +7101,7 @@ focus_tree = {
 			focus = TIX_dongfangshengcunkongjian
 		}
 		relative_position_id = TIX_dongfangshengcunkongjian
-		cost = 5
+		cost = 8
 		allow_branch = {
 			has_global_flag = MOD_azurlane_tianjiangjianniang
 		}
@@ -7078,7 +7109,51 @@ focus_tree = {
 			factor = 50
 		}
 		completion_reward = {
-			
+			guojishengyu_down_3 = yes
+			add_named_threat = {
+				threat = 5
+				name = "吞并波罗的海国家"
+			}
+			if = {
+			limit = {
+			country_exists = LIT
+			LIT = { is_puppet = no }
+			}
+			LIT = { country_event = az_tianjiang.307 }
+			}
+			if = {
+			limit = {
+			country_exists = LAT
+			LAT = { is_puppet = no }
+			}
+			LAT = { country_event = az_tianjiang.307 }
+			}
+			if = {
+			limit = {
+			country_exists = EST
+			EST = { is_puppet = no }
+			}
+			EST = { country_event = az_tianjiang.307 }
+			}
+			effect_tooltip = {
+				custom_effect_tooltip = if_they_accept_tt
+				set_autonomy = {
+					target = LIT
+					autonomous_state = az_autonomy_volkskommissariat
+				}
+				set_autonomy = {
+					target = NOR
+					autonomous_state = az_autonomy_volkskommissariat
+				}
+				set_autonomy = {
+					target = EST
+					autonomous_state = az_autonomy_volkskommissariat
+				}							
+				custom_effect_tooltip = if_they_refuse_tt
+				create_wargoal = { target = LIT type = take_state_focus }
+				create_wargoal = { target = LAT type = take_state_focus }
+				create_wargoal = { target = EST type = take_state_focus }
+			}
 		}
 	}
 	focus = {
@@ -7096,6 +7171,15 @@ focus_tree = {
 			focus = TIX_zhengfuboluodihaiguojia
 		}
 		relative_position_id = TIX_shandongzhongougeming
+		available = {
+			is_puppet = no
+			has_war = no
+		}
+		bypass = {
+			not = { country_exists = DEN }
+			not = { country_exists = NOR }
+			not = { country_exists = SWE }
+		}
 		cost = 7
 		available = {
 			is_puppet = no
@@ -7107,7 +7191,6 @@ focus_tree = {
 			country_exists = HUJ
 			country_exists = HOL
 			country_exists = BEL
-			country_exists = HOL
 			country_exists = LUX
 			}
 		}
@@ -7115,10 +7198,51 @@ focus_tree = {
 			has_global_flag = MOD_azurlane_tianjiangjianniang
 		}
 		ai_will_do = {
-			factor = 50
+			factor = 0
+			modifier = {
+				date > 1940.1.1
+				add = 50
+			}
 		}
 		completion_reward = {
-			
+			declare_war_on = {
+				target = HUJ
+				type = annex_everything
+			}
+			declare_war_on = {
+				target = YUW
+				type = annex_everything
+			}
+			if = {
+				limit = {
+					country_exists = HOL
+					not = { is_in_faction_with = HOL }
+				}
+				declare_war_on = {
+					target = HOL
+					type = annex_everything
+				}
+			}
+			if = {
+				limit = {
+					country_exists = BEL
+					not = { is_in_faction_with = BEL }
+				}
+				declare_war_on = {
+					target = BEL
+					type = annex_everything
+				}
+			}
+			if = {
+				limit = {
+					country_exists = LUX
+					not = { is_in_faction_with = LUX }
+				}
+				declare_war_on = {
+					target = LUX
+					type = annex_everything
+				}
+			}
 		}
 	}
 	focus = {
@@ -7149,7 +7273,14 @@ focus_tree = {
 			has_global_flag = MOD_azurlane_tianjiangjianniang
 		}
 		ai_will_do = {
-			factor = 50
+			factor = 0
+			modifier = {
+				date > 1941.6.1
+				controls_state = 14
+				controls_state = 16
+				controls_state = 19
+				add = 10
+			}
 		}
 		completion_reward = {
 			add_timed_idea = {
@@ -7163,6 +7294,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = MOL
+						not = { is_in_faction_with = MOL }
 					}
 					declare_war_on = {
 						target = MOL
@@ -7172,6 +7304,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = FIN
+						not = { is_in_faction_with = FIN }
 					}
 					declare_war_on = {
 						target = FIN
@@ -7181,6 +7314,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = LAT
+						not = { is_in_faction_with = LAT }
 					}
 					declare_war_on = {
 						target = LAT
@@ -7190,6 +7324,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = EST
+						not = { is_in_faction_with = EST }
 					}
 					declare_war_on = {
 						target = EST
@@ -7199,6 +7334,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = LIT
+						not = { is_in_faction_with = LIT }
 					}
 					declare_war_on = {
 						target = LIT
@@ -7208,6 +7344,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = UKR
+						not = { is_in_faction_with = UKR }
 					}
 					declare_war_on = {
 						target = UKR
@@ -7217,6 +7354,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = POL
+						not = { is_in_faction_with = POL }
 					}
 					declare_war_on = {
 						target = POL
@@ -7226,6 +7364,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = BLR
+						not = { is_in_faction_with = BLR }
 					}
 					declare_war_on = {
 						target = BLR
@@ -7235,6 +7374,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = ARM
+						not = { is_in_faction_with = ARM }
 					}
 					declare_war_on = {
 						target = ARM
@@ -7244,6 +7384,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = TMS
+						not = { is_in_faction_with = TMS }
 					}
 					declare_war_on = {
 						target = TMS
@@ -7253,6 +7394,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = AZR
+						not = { is_in_faction_with = AZR }
 					}
 					declare_war_on = {
 						target = AZR
@@ -7262,6 +7404,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = TAJ
+						not = { is_in_faction_with = TAJ }
 					}
 					declare_war_on = {
 						target = TAJ
@@ -7271,6 +7414,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = SMI
+						not = { is_in_faction_with = SMI }
 					}
 					declare_war_on = {
 						target = SMI
@@ -7280,6 +7424,7 @@ focus_tree = {
 				if = {
 					limit = {
 						country_exists = KAR
+						not = { is_in_faction_with = KAR }
 					}
 					declare_war_on = {
 						target = KAR