2025-11-22 04:03:03

src/common/ai_strategy/TIX.txt

@@ -545,7 +545,7 @@ TIX_bubangzhusading = {
 	ai_strategy = {
 		type = dont_defend_ally_borders
 		id = "SAD"
-		value = 200
+		value = 5000
 	}
 	ai_strategy = {
 		type = dont_join_wars_with
@@ -1314,7 +1314,7 @@ TIX_let_SAD_handle_french_front_alone = {
 	ai_strategy = {
 		type = dont_defend_ally_borders
 		id = "SAD"
-		value = 100
+		value = 5000
 	}
 }
 

src/common/decisions/tianjiang_decision.txt

@@ -2389,6 +2389,9 @@ YUW_fangong = {
 				SAD = {
 					controls_state = 14
 				}
+				WEX = {
+					controls_state = 14
+				}
 			}
 			OR = {
 				TIX = {
@@ -2397,12 +2400,15 @@ YUW_fangong = {
 				SAD = {
 					controls_state = 15
 				}
+				WEX = {
+					controls_state = 15
+				}
 			}
 		}
 		ai_will_do = {
 			factor = 0
 			modifier = {
-				date > 1943.1.1
+				date > 1942.6.1
 				add = 100
 			}
 		}
@@ -2457,6 +2463,9 @@ YUW_fangong = {
 				TIX = {
 					controls_state = 21
 				}
+				SAD = {
+					controls_state = 21
+				}
 				WEX = {
 					controls_state = 21
 				}
@@ -2465,7 +2474,7 @@ YUW_fangong = {
 		ai_will_do = {
 			factor = 0
 			modifier = {
-				date > 1943.1.1
+				date > 1942.6.1
 				add = 100
 			}
 		}
@@ -2514,9 +2523,11 @@ YUW_fangong = {
 				target = WEX
 				transfer_troops = no
 			}
+			hidden_effect = {
 				news_event = { id = az_tianjiang.367 days = 1 }
 			}
 		}
+	}
 	YUW_zhaohuiweixipaijianniang = {
 		icon = generic_break_treaty
 		visible = {
@@ -2935,13 +2946,13 @@ TIX_zhanhou = {
 			}
 		}
 		ai_will_do = {
-			factor = 10
+			factor = 0
 			modifier = {
 				OR = {
 					date > 1944.1.1
 					has_war = no
 				}
-				factor = 100
+				add = 100
 			}
 		}
 		fire_only_once = yes

src/common/decisions/xingdong_decisions.txt

@@ -10,9 +10,16 @@ xingdong_category = {
 		complete_effect = {
 			#add_to_variable = {
 			#	var = xzmf_sl
-			#	value = 99
+			#	value = 9999
+			#}
+			#add_to_variable = {
+			#	var = zs_sl
+			#	value = 99999
+			#}
+			#add_to_variable = {
+			#	var = wz_sl
+			#	value = 999999
 			#}
-			
 		}
 	}
 
@@ -2244,7 +2251,7 @@ xingdong_category = {
 				tooltip = ""
 				check_variable = {
 					var = xzmf_sl
-					value = 5
+					value = 4
 					compare = greater_than_or_equals
 				}
 			}
@@ -2258,19 +2265,61 @@ xingdong_category = {
 		custom_cost_trigger = {
 			check_variable = {
 				var = xzmf_sl
-				value = 5
+				value = 4
 				compare = greater_than_or_equals
 			}
 		}
 
-		custom_cost_text = mf_shuliang_5
+		custom_cost_text = mf_shuliang_4
 		complete_effect = { 
 			custom_effect_tooltip = az_ziyuanzhuanhua_tan_tooltip
-			add_to_variable = { az_ziyuanzhuanhua_tan = 100 }
+			add_to_variable = { az_ziyuanzhuanhua_tan = 120 }
 			force_update_dynamic_modifier = yes
 			add_to_variable = {
 				var = xzmf_sl
-				value = -5
+				value = -4
+			}
+		}
+	}
+
+	mf_jingtongdu = {
+		icon = xzmf
+		available = {
+			custom_trigger_tooltip = {
+				tooltip = ""
+				check_variable = {
+					var = xzmf_sl
+					value = 2
+					compare = greater_than_or_equals
+				}
+			}
+		}
+		ai_will_do = {
+			factor = 0
+		}
+		visible = {
+
+		}
+		days_remove = 120
+		modifier = {
+			mass_assault_mastery_gain_factor = 1
+			grand_battleplan_mastery_gain_factor = 1
+			superior_firepower_mastery_gain_factor = 1
+			new_mobile_warfare_mastery_gain_factor = 1
+		}
+		custom_cost_trigger = {
+			check_variable = {
+				var = xzmf_sl
+				value = 2
+				compare = greater_than_or_equals
+			}
+		}
+
+		custom_cost_text = mf_shuliang_2
+		complete_effect = { 
+			add_to_variable = {
+				var = xzmf_sl
+				value = -2
 			}
 		}
 	}

src/common/ideas/azurlane_generic.txt

@@ -463,6 +463,107 @@ ideas = {
 
 	# Special ones that can be applied on other countries through focus system.
 	country = {
+		az_hjll_1 = {
+			picture = dingzhenai
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				new_convoy_raiding_mastery_gain_factor = 0.2
+				new_fleet_in_being_mastery_gain_factor = 0.2
+				new_base_strike_mastery_gain_factor = 0.2
+			} 
+		}
+		az_hjll_2 = {
+			name = az_hjll_1
+			picture = dingzhenai
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				new_convoy_raiding_mastery_gain_factor = 0.5
+				new_fleet_in_being_mastery_gain_factor = 0.5
+				new_base_strike_mastery_gain_factor = 0.5
+			} 
+		}
+		az_hjll_3 = {
+			name = az_hjll_1
+			picture = dingzhenai
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				new_convoy_raiding_mastery_gain_factor = 1
+				new_fleet_in_being_mastery_gain_factor = 1
+				new_base_strike_mastery_gain_factor = 1
+			} 
+		}
+		az_lltp_zlph = {
+			picture = dingzhenai
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				air_strategic_bomber_night_penalty = -0.5
+				air_nav_efficiency = 1
+				air_strategic_bomber_bombing_factor = 1
+			} 
+		}
+		az_lltp_zczy = {
+			picture = dingzhenai
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				air_bombing_targetting = 0.3
+				air_cas_efficiency = 0.3
+				air_close_air_support_org_damage_factor = 0.3
+			} 
+		}
+		az_lltp_lxzz = {
+			picture = dingzhenai
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				air_escort_efficiency = 0.3
+				air_agility_factor = 0.5
+				air_mission_efficiency = 0.25
+			} 
+		}
+		az_lltp_czjd = {
+			picture = dingzhenai
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				navy_org_factor = 0.5
+				navy_max_range_factor = 1
+				naval_speed_factor = 0.25
+			} 
+		}
+		az_lltp_myfs = {
+			picture = dingzhenai
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				naval_enemy_fleet_size_ratio_penalty_factor = 0.25
+				naval_critical_score_chance_factor = 0.5
+				naval_torpedo_hit_chance_factor = 0.5
+			} 
+		}
+		az_lltp_jddj = {
+			picture = dingzhenai
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				carrier_traffic = 1
+				navy_carrier_air_agility_factor = 1
+				carrier_capacity_penalty_reduction = -0.5
+			} 
+		}
 		TY_dingzhenai = {
 			picture = dingzhenai
 			allowed_civil_war = {

src/common/ideas/doh.txt

@@ -434,6 +434,7 @@ ideas = {
 			}
 			modifier = {
 				defensive_war_stability_factor = 0.2
+				army_core_defence_factor = 0.1
 				war_support_factor = 0.1
 			}
 		}
@@ -447,8 +448,9 @@ ideas = {
 				has_war = no
 			}
 			modifier = {
+				army_strength_factor = 0.1
 				defensive_war_stability_factor = 0.3
-				army_core_defence_factor = 0.05
+				army_core_defence_factor = 0.2
 				war_support_factor = 0.3
 			}
 		}
@@ -462,8 +464,10 @@ ideas = {
 				has_war = no
 			}
 			modifier = {
+				army_strength_factor = 0.2
 				defensive_war_stability_factor = 0.4
-				army_core_defence_factor = 0.1
+				army_core_attack_factor = 0.1
+				army_core_defence_factor = 0.4
 				war_support_factor = 0.5
 			}
 		}
@@ -477,8 +481,10 @@ ideas = {
 				has_war = no
 			}
 			modifier = {
+				army_strength_factor = 0.4
 				defensive_war_stability_factor = 0.5
-				army_core_defence_factor = 0.2
+				army_core_attack_factor = 0.3
+				army_core_defence_factor = 0.8
 				local_org_regain = 0.1
 				army_org_factor = 0.1
 				war_support_factor = 0.7
@@ -494,9 +500,10 @@ ideas = {
 				has_war = no
 			}
 			modifier = {
+				army_strength_factor = 0.6
 				defensive_war_stability_factor = 0.6
-				army_core_attack_factor = 0.1
-				army_core_defence_factor = 0.5
+				army_core_attack_factor = 0.6
+				army_core_defence_factor = 1.2
 				training_time_army_factor = -0.05
 				surrender_limit = 0.05
 				local_org_regain = 0.3
@@ -515,9 +522,10 @@ ideas = {
 				has_war = no
 			}
 			modifier = {
+				army_strength_factor = 0.8
 				defensive_war_stability_factor = 0.8
 				army_core_attack_factor = 1
-				army_core_defence_factor = 1
+				army_core_defence_factor = 2
 				training_time_army_factor = -0.1
 				surrender_limit = 0.1
 				army_org_factor = 0.5
@@ -535,9 +543,10 @@ ideas = {
 				has_war = no
 			}
 			modifier = {
+				army_strength_factor = 1
 				defensive_war_stability_factor = 1
-				army_core_attack_factor =1
-				army_core_defence_factor = 1.5
+				army_core_attack_factor = 1.5
+				army_core_defence_factor = 3
 				training_time_army_factor = -0.15
 				surrender_limit = 0.15
 				local_org_regain = 0.8
@@ -646,10 +655,10 @@ ideas = {
 			}
 			targeted_modifier = {
 				tag = CHY
-				defense_bonus_against = 0.2
+				defense_bonus_against = 0.5
 			}
 			modifier = {
-				army_core_defence_factor = 0.2
+				army_core_defence_factor = 1
 			}
 		}
 		DOH_xfzr = {
@@ -674,8 +683,8 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				army_attack_against_minor_factor = 0.5
-				army_breakthrough_against_minor_factor = 0.5
+				army_attack_against_minor_factor = 1
+				army_breakthrough_against_minor_factor = 1
 			}
 		}
 		DOH_dfgg1 = {

src/common/ideologies/00_ideologies.txt

@@ -14,6 +14,7 @@ ideologies = {
 			}
 			
 			xiafeizhidu = {
+				can_be_randomly_selected = no
 			}
 			
 			populism = {
@@ -53,17 +54,21 @@ ideologies = {
 			lend_lease_tension = 0.50
 			send_volunteers_tension = 0.50
 			guarantee_tension = 0.25
-			annex_cost_factor = 0.5
+			# annex_cost_factor = 0.5 # Deprecated, use common\peace_conference\00_generic_peace.txt instead
 			civilian_intel_to_others = 20.0
 			army_intel_to_others = 5.0
 			navy_intel_to_others = 20.0
 			airforce_intel_to_others = 5
+			embargo_cost_factor = -0.5
+			embargo_threshold_factor = -0.5
 		}
 		
 		faction_modifiers = {
 			faction_trade_opinion_factor = 0.50 #plus 50% trade opinion
 		}
 		ai_democratic = yes # uses the democratic AI behaviour
+		ai_ideology_wanted_units_factor = 2
+		ai_give_core_state_control_threshold = 0 # Extra threshold value added to DIPLOMATIC_ACTION_PROPOSE_SCORE for this ideology to give back core state control to other country
 	}
 
 
@@ -87,6 +92,10 @@ ideologies = {
 			}
 			
 			niulunbaozhidu = {
+				can_be_randomly_selected = no
+			}
+			buddhist_socialism = {
+				can_be_randomly_selected = no # won't be assigned to randomly generated country leaders
 			}
 		}
 		
@@ -104,6 +113,7 @@ ideologies = {
 		faction_impact_on_world_tension = 0.5
 		
 		ai_communist = yes # uses the commie AI behaviour
+		ai_ideology_wanted_units_factor = 2
 		
 		rules = {
 			can_force_government = no
@@ -114,18 +124,20 @@ ideologies = {
 		can_collaborate = yes
 		
 		modifiers = {
-			puppet_cost_factor = -0.3
+			# puppet_cost_factor = -0.3 # Deprecated, use common\peace_conference\00_generic_peace.txt instead
 			civilian_intel_to_others = 10.0
 			army_intel_to_others = 7.5
 			navy_intel_to_others = 12.5
 			airforce_intel_to_others = 7.5
 			hidden_modifier = { join_faction_tension = -0.1 }
+			embargo_threshold_factor = 0.5
+			lend_lease_tension = 0.50
 		}
 		
 		faction_modifiers = {
 			
 		}
-
+		ai_give_core_state_control_threshold = 10
 	}
 
 	fascism = {
@@ -146,7 +158,9 @@ ideologies = {
 			
 			rexism = {
 			}
-			
+			emperor_fascism = {
+				can_be_randomly_selected = no # won't be assigned to randomly generated country leaders
+			}
 			lisha_xierism = {
 				can_be_randomly_selected = no
 			}
@@ -166,7 +180,7 @@ ideologies = {
 		faction_impact_on_world_tension = 1.0
 		
 		rules = {
-			can_force_government = no
+			can_force_government = yes
 			can_send_volunteers = yes
 			can_puppet = yes
 		}
@@ -180,9 +194,13 @@ ideologies = {
 			navy_intel_to_others = 10.0
 			airforce_intel_to_others = 10.0
 			hidden_modifier = { join_faction_tension = -0.1 }
+			embargo_cost_factor = 1
+			lend_lease_tension = 0.50
 		}
 
 		ai_fascist = yes # uses the fascist AI behaviour
+		ai_ideology_wanted_units_factor = 2
+		ai_give_core_state_control_threshold = 10000
 	}
 	
 	neutrality = {
@@ -204,6 +222,10 @@ ideologies = {
 			
 			centrism = {
 			}
+
+			japan_militarism_ideology = {
+				can_be_randomly_selected = no # won't be assigned to randomly generated country leaders
+			}
 		}
 
 		dynamic_faction_names = {
@@ -244,5 +266,8 @@ ideologies = {
 		}
 
 		ai_neutral = yes # 
+		ai_ideology_wanted_units_factor = 2
+		
+		ai_give_core_state_control_threshold = 10000
 	}
 }

src/common/national_focus/beifanglianhe.txt

@@ -1630,6 +1630,7 @@
 
 		#search_filters = { FOCUS_FILTER_STABILITY }
 		completion_reward = {
+			TY_haijunliluntupo = yes
 			add_ideas = BFL_qtjq
 		}
 	}
@@ -1709,6 +1710,7 @@
 
 		#search_filters = { FOCUS_FILTER_STABILITY }
 		completion_reward = {
+			TY_haijunliluntupo = yes
 			add_ideas = BFL_jzdjc
 		}
 	}
@@ -3555,12 +3557,6 @@
 		relative_position_id = BFL_kongjunjianshe
 		cost = 10
 		available = {
-			if = {
-				limit = {
-					is_ai = no
-				}
-				has_air_experience > 299
-			}
 		}
 		ai_will_do = {
 			factor = 7
@@ -3610,7 +3606,6 @@
 				ahead_reduction = 2
 			    }
 			}
-			air_experience = -300
 		}
 	}
 	focus = {
@@ -3630,6 +3625,7 @@
 
 		#search_filters = { FOCUS_FILTER_STABILITY }
 		completion_reward = {
+			TY_kongjunliluntupo = yes
 			swap_ideas = {
 			remove_idea = BFL_buchengshudekongjun_2
 			add_idea = BFL_buchengshudekongjun_3

src/common/national_focus/chongying_new.txt

@@ -3553,6 +3553,7 @@
 			transfer_state = 286
 			transfer_state = 741
 			transfer_state = 728
+			transfer_state = 1017
 		}
 	}
 	focus = {

src/common/national_focus/yuanwei.txt

@@ -5740,21 +5740,7 @@ focus_tree = {
 		}
 		#search_filters = { FOCUS_FILTER_STABILITY }
 		completion_reward = {
-			custom_effect_tooltip = "允许解锁第二条陆军学说路线"
-			if = {
-				limit = {
-					is_ai = yes
-				}
-				set_technology = {
-					mobile_warfare = 1
-				}
-				set_technology = {
-					mechanised_infantry = 1
-				}
-			}
-			else = {
-				set_country_flag = TY_army_liluntupo
-			}
+			TY_lujunliluntupo = yes
 			if = {
 				limit = {
 					is_ai = yes
@@ -11062,8 +11048,7 @@ focus_tree = {
 			add_idea = YUW_ywlj_idea1_19
 			}
 			}
-			custom_effect_tooltip = "允许解锁第二条陆军学说路线"
-			set_country_flag = TY_army_liluntupo
+			TY_lujunliluntupo = yes
 			set_technology = {
 				backhand_blow_for_yuw = 1
 				popup = no
@@ -11104,8 +11089,7 @@ focus_tree = {
 			add_idea = YUW_ywlj_idea1_20
 			}
 			}
-			custom_effect_tooltip = "允许解锁第二条陆军学说路线"
-			set_country_flag = TY_army_liluntupo
+			TY_lujunliluntupo = yes
 			set_technology = {
 				backhand_blow_for_yuw = 1
 				popup = no

src/common/on_actions/10_toa_on_actions.txt

@@ -1,855 +1 @@
 ##狗屎DLC，傻逼代码##
-on_actions = {
-	on_weekly_VEN = {
-		effect = {
-			
-			for_each_scope_loop = {
-				array = global.ven_blockade_countries
-				if = {
-					limit = {
-						ships_in_area = {
-							area = 53
-							type = capital_ship
-							size < 3
-						}
-					}
-
-					for_each_scope_loop = {
-						array = ven_countries_that_are_under_embargo
-						VEN = {
-							break_embargo = PREV
-							remove_opinion_modifier = {
-								target = PREV
-								modifier = VEN_embargoed
-							}
-							remove_opinion_modifier = {
-								target = PREV
-								modifier = VEN_embargoed_2
-							}
-						}
-					}
-
-					remove_from_array = {
-						array = global.ven_blockade_countries
-						value = THIS
-					}
-					clear_array = ven_countries_that_are_under_embargo
-				}
-			}
-
-			#if theres still at least 1 blockading country, keep up the blockade
-			if = {
-				limit = {
-					check_variable = { global.ven_blockade_countries^num > 0 }
-					VEN = {
-						NOT = {
-							has_idea = idea_VEN_blockade_active
-						}
-					}
-				}
-				VEN = { 
-					swap_ideas = {
-						remove_idea = idea_VEN_blockade_inactive
-						add_idea = idea_VEN_blockade_active
-					}
-				}
-			}
-			else_if = { #If not remove blockade
-				limit = {
-					check_variable = { global.ven_blockade_countries^num < 1 }
-					VEN = {
-						NOT = {
-							has_idea = idea_VEN_blockade_inactive
-						}
-					}
-				}
-				VEN = { 
-					swap_ideas = {
-						remove_idea = idea_VEN_blockade_active
-						add_idea = idea_VEN_blockade_inactive
-					}
-				}
-			}
-		}
-	}
-	on_ruling_party_change = {
-		effect = {
-			if = {
-				limit = {
-					has_dlc = "Trial of Allegiance"
-					OR = {
-						original_tag = URG
-						original_tag = PAR
-					}
-				}
-				if = {
-					limit = {
-						has_completed_focus = GUAY_the_permanent_leader
-						NOT = { has_country_leader_with_trait = JUNO_the_permanent_leader }
-					}
-
-					add_country_leader_trait = JUNO_the_permanent_leader
-				}
-
-				if = {
-					limit = {
-						has_completed_focus = GUAY_cult_of_personality
-						NOT = { has_country_leader_with_trait = JUNO_cult_of_personality }
-					}
-
-					add_country_leader_trait = JUNO_cult_of_personality
-				}
-
-			}
-		}
-		effect = {
-			IF = {
-				limit = {
-					NOT = { has_dlc = "Trial of Allegiance" }
-					original_tag = URG
-					has_cosmetic_tag = URG_is_unaligned_URG_but_has_normal_URG_flag
-				}
-				drop_cosmetic_tag = yes
-			}
-		}
-		effect = {
-			if = {
-				limit = {
-					has_dlc = "Trial of Allegiance"
-					NOT = {
-						USA = {
-							has_government = communism
-						}
-					}
-					capital_scope = {
-						is_core_of = ROOT
-						OR = {
-							is_on_continent = north_america
-							is_on_continent = south_america
-						}
-					}
-					has_government = communism
-					date > 1936.05.1
-				}
-				USA = {
-					country_event = {
-						id = south_american_events.30
-						days = 7
-					}
-				}
-			}
-		}
-		effect = {
-			if = {
-				limit = {
-					has_dlc = "Trial of Allegiance"
-					BRA = {
-						has_completed_focus = BRA_expand_fordlandia
-						NOT = {	
-							OR = {
-								has_government = communism 
-								has_country_flag = BRA_ford_event_has_happened
-							}
-						}
-					}
-					USA = {
-						has_government = communism
-					}
-				}
-				BRA = {
-					country_event = {
-						id = JUNO_brazil_events.180
-						days = 14
-					}
-				}
-			}
-		}
-	}
-	on_startup = {
-		effect = {
-			if = {
-				limit = { 
-					has_dlc = "Trial of Allegiance" 
-				}
-
-				every_country = {	
-					limit = {
-						OR = {
-							original_tag = URG
-							original_tag = BRA
-							original_tag = PAR
-							original_tag = CHL
-							original_tag = BOL
-							original_tag = ARG
-							original_tag = PRU
-							original_tag = VEN
-							original_tag = ECU
-							original_tag = COL
-							
-						}
-					}
-
-					add_ai_strategy = { 
-						type = alliance 
-						id = JAP
-						value = -250
-					}
-
-					add_ai_strategy = { 
-						type = alliance 
-						id = CHI
-						value = -250
-					}
-
-					add_ai_strategy = { 
-						type = alliance 
-						id = PRC
-						value = -250
-					}
-
-					add_ai_strategy = { 
-						type = alliance 
-						id = USA
-						value = -15
-					}
-
-					add_ai_strategy = { 
-						type = alliance 
-						id = GER
-						value = -15
-					}
-
-					add_ai_strategy = { 
-						type = alliance 
-						id = ENG
-						value = -15
-					}
-
-					add_ai_strategy = { 
-						type = alliance 
-						id = SOV
-						value = -50
-					}
-
-				}
-			}
-		}
-		effect = {
-			#Monroe Doctrine
-			IF = {
-				limit = { has_dlc = "Trial of Allegiance" }
-				every_country = {
-					limit = {
-						exists = yes
-						NOT = { tag = USA }
-						OR = {
-							capital_scope = { is_on_continent = south_america }
-							capital_scope = { is_on_continent = north_america }
-							tag = CUB
-							tag = DOM
-							tag = HAI
-						}
-					}
-					#add_ideas = USA_monroe_doctrine_idea
-				}
-			}
-		}
-	}
-	on_peaceconference_ended = {
-
-		# Make sure that Uruguay get's their cosmetic tag if it applies
-		effect = {
-			IF = {
-				limit = {
-					URG = {
-						NOT = {
-							has_cosmetic_tag = URG_german
-						}
-						is_subject = yes
-						is_subject_of = GER
-					}
-				}
-				URG = {
-					set_cosmetic_tag = URG_german
-				}
-			}
-		}	
-		# Make sure that Uruguay drops their cosmetic tag if it applies
-		effect = {
-			IF = {
-				limit = {
-					URG = {
-						has_cosmetic_tag = URG_german
-						is_subject = no
-					}
-				}
-				URG = {
-					drop_cosmetic_tag = yes
-				}
-			}
-		}	
-
-		# Make sure that Bolivia get's their araucanian cosmetic tag if it applies
-		effect = {
-			IF = {
-				limit = {
-					BOL = {
-						NOT = {
-							has_cosmetic_tag = BOL_orelia
-						}
-						is_subject = yes
-						is_subject_of = CHL
-						CHL = {
-							has_completed_focus = CHL_crown_antoine_as_sovereign_king
-						}
-					}
-				}
-				BOL = {
-					set_cosmetic_tag = BOL_orelia
-				}
-			}
-		}	
-		# Make sure that Bolivia drops their araucanian cosmetic tag if it applies
-		effect = {
-			IF = {
-				limit = {
-					BOL = {
-						has_cosmetic_tag = BOL_orelia
-						is_subject = no
-					}
-				}
-				BOL = {
-					drop_cosmetic_tag = yes
-				}
-			}
-		}	
-	}
-
-	on_puppet = { #ROOT = nation being puppeted, FROM = overlord
-		effect = {
-
-			IF = {
-				limit = {
-					ROOT = {
-						original_tag = URG
-					}
-					FROM = {
-						original_tag = GER
-					}
-				}
-				ROOT = {
-					set_cosmetic_tag = URG_german
-				}
-			}
-
-		}
-
-		# Make sure that Bolivia get's their araucanian cosmetic tag if it applies
-		effect = {
-			IF = {
-				limit = {
-					ROOT = {
-						original_tag = BOL
-					}
-					FROM = {
-						original_tag = CHL
-					}
-					CHL = {
-						has_completed_focus = CHL_crown_antoine_as_sovereign_king
-					}
-				}
-				ROOT = {
-					set_cosmetic_tag = BOL_orelia
-				}
-			}
-		}	
-
-
-	}
-
-	on_release_as_puppet = { # ROOT is the nation being released, FROM is the overlord.
-
-		effect = {
-			IF = {
-				limit = {
-					ROOT = {
-						original_tag = BOL
-					}
-					FROM = {
-						original_tag = CHL
-					}
-					CHL = {
-						has_completed_focus = CHL_crown_antoine_as_sovereign_king
-					}
-				}
-				ROOT = {
-					set_cosmetic_tag = BOL_orelia
-				}
-			}
-		}
-
-		effect = {
-			IF = {
-				limit = {
-					ROOT = {
-						original_tag = URG
-					}
-					FROM = {
-						original_tag = GER
-					}
-				}
-				ROOT = {
-					set_cosmetic_tag = URG_german
-				}
-			}
-		}
-
-		effect = {
-			IF = {
-				limit = {
-					ROOT = {
-						tag = WLA
-					}
-				}
-				WLA = {
-					load_oob = "WLA_1936"
-				}
-			}
-		}
-	}
-
-	#ROOT is subject FROM is previous overlord
-	on_subject_free = {
-		effect = {
-			IF = {
-				limit = {
-					ROOT = {
-						original_tag = URG
-					}
-					FROM = {
-						original_tag = GER
-					}
-				}
-				ROOT = {
-					drop_cosmetic_tag = yes
-				}
-			}
-		}
-		effect = {
-			IF = {
-				limit = {
-					ROOT = {
-						original_tag = BOL
-					}
-					FROM = {
-						original_tag = CHL
-					}
-				}
-				ROOT = {
-					drop_cosmetic_tag = yes
-				}
-			}
-		}
-		effect = {
-			USA_add_monroe_doctrine_to_target = yes
-		}
-
-	}
-
-	# called when a country send volunteers to another
-	# ROOT is sender, FROM is receiver
-	on_send_volunteers = { #sets flag for whether Argentina has sent volunteers to Nationalist Spain
-		effect = {
-			if = { #Checks that sender is ARG and reciever is SPA
-				limit = {
-					original_tag = ARG
-					FROM = { 
-						tag = SPA
-					}
-				}
-				ROOT = { set_country_flag = ARG_argentinian_volunteers_in_spain }
-			}	
-		}
-		effect = {
-			if = { 
-				limit = {
-					ROOT = {
-						is_ai = no
-						OR = {
-							tag = CHL
-							tag = BOL
-							tag = PRU
-							tag = ECU
-							tag = VEN
-							tag = COL
-						}
-					}
-					FROM = {
-						tag = GER
-					}
-				}
-				set_global_flag = true_condor_legion_flag				
-			}	
-		}
-	}
-
-	#FROM is war target
-	#ROOT is country declaring war
-	on_declare_war = {
-
-		effect = {
-			IF = {
-				limit = {
-					ROOT = {
-						tag = ARG
-					}
-					FROM = { tag = URG }
-				}
-
-				BRA = {
-					country_event = {
-						id = ARG_political_events.110
-						hours = 5
-					}
-				}
-			}
-		}
-
-		effect = {
-			IF = {
-				limit = {
-					ROOT = {
-						tag = BRA
-					}
-					FROM = { tag = URG }
-				}
-
-				ARG = {
-					country_event = {
-						id = ARG_political_events.110
-						hours = 5
-					}
-				}
-			}
-		}
-
-		effect = {
-			IF = {
-				limit = {
-					ROOT = {
-						NOT = { has_idea = SMB_organization_of_american_states_member }
-					}
-					FROM = { has_idea = SMB_organization_of_american_states_member }
-				}
-				set_variable = {
-					var = global.org_american_unity_attacked_country
-					value = FROM
-				}
-				every_other_country = {
-					limit = {
-						has_idea = SMB_organization_of_american_states_member
-						NOT = { has_war_with = FROM }
-						NOT = { tag = FROM }
-					}
-					country_event = {
-						id = JUNO_brazil_events.130
-						hours = 1
-					}
-				}
-			}
-		}
-		effect = {
-			IF = {
-				limit = {
-					ROOT = {
-						has_idea = SMB_organization_of_american_states_member
-					}
-					FROM = { has_idea = SMB_organization_of_american_states_member }
-				}
-				ROOT = {	
-					country_event = {
-						id = JUNO_brazil_events.133
-						hours = 1
-					}
-				}
-				set_variable = {
-					var = global.org_american_unity_attacked_country
-					value = FROM
-				}
-				every_other_country = {
-					limit = {
-						has_idea = SMB_organization_of_american_states_member
-						NOT = { has_war_with = FROM }
-						NOT = { tag = FROM }
-					}
-					country_event = {
-						id = JUNO_brazil_events.130
-						hours = 2
-					}
-				}
-			}
-		}
-		effect = {
-			IF = {
-				limit = {
-					ROOT = {
-						tag = PAR
-					}
-					FROM = {
-						NOT = {
-							has_country_flag = PAR_revenge_flag
-						}
-						OR = {
-							tag = BRA
-							tag = ARG
-							tag = URG
-						}
-					}
-				}
-				hidden_effect = {
-					FROM = { 
-						set_country_flag = PAR_revenge_flag 
-						country_event = {
-							id = south_american_events.56
-							days = 31
-						}
-					}
-				}
-			}
-		}
-	}
-
-	#ROOT = attacking side
-	#FROM = defending side
-	on_declare_war = {
-		effect = {
-			IF = {
-				limit = {
-					OR = {
-						FROM = {
-							has_government = communism
-							capital_scope = {
-								is_core_of = PREV
-								OR = {
-									is_on_continent = north_america
-									is_on_continent = south_america
-								}
-							}
-							has_civil_war = yes
-							original_tag = ROOT
-							NOT = {
-								has_government = ROOT
-							}
-						}
-						ROOT = {
-							has_government = communism
-							capital_scope = {
-								is_core_of = PREV
-								OR = {
-									is_on_continent = north_america
-									is_on_continent = south_america
-								}
-							}
-							has_civil_war = yes
-							original_tag = FROM
-							NOT = {
-								has_government = FROM
-							}
-						}
-					}
-				}
-				IF = {
-					limit = {
-						ROOT = {
-							has_government = communism
-						}
-					}
-					FROM = {
-						USA = {
-							country_event = {
-								id = south_american_events.32
-								days = 7
-								random_days = 5
-							}
-						}
-					}
-				}
-				ELSE_IF = {
-					limit = {
-						FROM = {
-							has_government = communism
-						}
-					}
-					ROOT = {
-						USA = {
-							country_event = {
-								id = south_american_events.32
-								days = 7
-								random_days = 5
-							}
-						}
-					}
-				}
-			}
-		}
-		effect = {
-			IF = {
-				limit = {
-					NOT = {
-						OR = {
-							ROOT = {
-								tag = USA
-							}
-							FROM = {
-								tag = USA
-							}
-						}
-					}
-					USA = {
-						exists = yes
-						has_idea = USA_monroe_doctrine_enforcer
-						NOT = {
-							OR = { 
-								has_war_with = FROM
-								has_war_with = ROOT
-								is_in_faction_with = ROOT
-								is_in_faction_with = FROM
-							}
-						}
-					}
-					FROM = {
-						has_idea = USA_monroe_doctrine_idea
-						is_in_faction = no
-					}
-				}
-				# Both countries are in Americas
-				IF = {
-					limit = {
-						ROOT = {
-							has_idea = USA_monroe_doctrine_idea
-						}
-					}
-					# Do Nothing for now, may add more content here in future!
-				}
-				# Only defender is in Americas
-				ELSE = {
-					FROM = {
-						USA = {
-							set_variable = { monroe_defender = PREV }
-							country_event = {
-								id = south_american_events.50
-								days = 1
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	#ROOT is the nation being released, FROM is the overlord
-	on_release_as_free = { 
-		effect = {
-			USA_add_monroe_doctrine_to_target = yes
-		}
-		effect = {
-			IF = {
-				limit = {
-					ROOT = {
-						tag = WLA
-					}
-				}
-				WLA = {
-					load_oob = "WLA_1936"
-				}
-			}
-		}
-	}	
-
-	on_liberate = {
-		effect = {
-			USA_add_monroe_doctrine_to_target = yes
-		}
-	}
-
-	on_weekly_ECU = {
-
-		effect = {
-			
-			IF = {
-				limit = {
-					AND = {
-						649 = {
-							is_owned_and_controlled_by = ROOT
-						}
-						305 = {
-							NOT = {
-								is_owned_and_controlled_by = ROOT
-							}
-						}
-						490 = {
-							NOT = {
-								is_owned_and_controlled_by = ROOT
-							}
-						}
-					}
-					ROOT = {
-						NOT = {
-							has_cosmetic_tag = ECU_galapagos_regime
-						}
-					}
-				}
-				ROOT = {
-					set_cosmetic_tag = ECU_galapagos_regime
-				}
-			}
-			
-		}
-
-		effect = {
-			
-			IF = {
-				limit = {
-					305 = {
-						is_owned_and_controlled_by = ROOT
-					}
-					ROOT = {
-						has_cosmetic_tag = ECU_galapagos_regime
-					}
-				}
-				ROOT = {
-					drop_cosmetic_tag = yes
-				}
-			}
-			
-		}
-
-	}
-	# ROOT is capitulated country, FROM is winner
-	on_capitulation = {
-		effect = {
-			IF = {
-				limit = {
-					has_dlc = "Trial of Allegiance"
-					ROOT = {
-						original_tag = GER
-						has_government = fascism
-						has_country_leader = {
-							character = GER_adolf_hitler
-							ruling_only = yes
-						}
-					}
-					ARG = {
-						has_government = fascism
-					}
-				} 
-				ARG = {
-					country_event = {
-						id = ARG_political_events.120
-						days = 14
-					}
-				}
-			}
-		}
-	}
-}

src/common/on_actions/az_alpt_on_actions.txt

@@ -18,10 +18,4 @@ on_actions = {
 			}  
 		} 
 	}
-
-	on_monthly  = {
-		effect = {
-			
-		}
-	}
 }

src/common/on_actions/az_waring_on_actions.txt

@@ -279,216 +279,6 @@ on_actions = {
 			}
 		}
 	}
-	on_daily_TIX = { 
-		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
-					surrender_progress > 0.7
-					BFL = {
-					surrender_progress < 0.4
-					}
-					HUJ = {
-					surrender_progress < 0.3
-					}
-					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
-				}
-				TIX_z23 = {
-					set_nationality = TIX
-				}
-				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 = {
-		#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
-		}
-		}
-		HUJ = {
-			set_autonomy = {
-				target = IRQ
-				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}
-		
-		} 
-		
-		}
-
-	}
 	on_capitulation = { 
 		effect = {
 			if = {
@@ -532,6 +322,11 @@ on_actions = {
 				TIX_z23 = {
 					set_nationality = TIX
 				}
+				BFL = {
+					TIX_z23 = {
+						set_nationality = TIX
+					}
+				}
 				set_cosmetic_tag = TIX
 				TIX = {
 				add_country_leader_role = {
@@ -701,7 +496,7 @@ on_actions = {
 			}
 		}
 	}
-	on_daily_DOH = { 
+	on_monthly_DOH = { 
 		effect = {
 			if = {
 				limit = { 

src/common/on_actions/azshipgirl_on_actions.txt

@@ -64,139 +64,6 @@ on_actions = {
 		} 
 	}
 
-	on_monthly_TIX = {
-		effect = { 
-			if = {
-				limit = {
-					AND = {
-						NOT = { has_global_flag = bilanlianheguojiesan }
-						is_ai = yes
-					}
-				}
-				add_to_variable = {
-					var = wz_sl
-					value = 900
-				}
-			}
-		}
-	}
-
-	on_monthly_BFL = {
-		effect = { 
-			if = {
-				limit = {
-					AND = {
-						NOT = { has_global_flag = bilanlianheguojiesan }
-						is_ai = yes
-					}
-				}
-				add_to_variable = {
-					var = wz_sl
-					value = 900
-				}
-			}
-		}
-	}
-
-	on_monthly_BYG = {
-		effect = { 
-			if = {
-				limit = {
-					AND = {
-						NOT = { has_global_flag = bilanlianheguojiesan }
-						is_ai = yes
-					}
-				}
-				add_to_variable = {
-					var = wz_sl
-					value = 900
-				}
-			}
-		}
-	}
-
-	on_monthly_HUJ = {
-		effect = { 
-			if = {
-				limit = {
-					AND = {
-						NOT = { has_global_flag = bilanlianheguojiesan }
-						is_ai = yes
-					}
-				}
-				add_to_variable = {
-					var = wz_sl
-					value = 900
-				}
-			}
-		}
-	}
-
-	on_monthly_CHY = {
-		effect = { 
-			if = {
-				limit = {
-					AND = {
-						NOT = { has_global_flag = bilanlianheguojiesan }
-						is_ai = yes
-					}
-				}
-				add_to_variable = {
-					var = wz_sl
-					value = 900
-				}
-			}
-		}
-	}
-
-	on_monthly_DOH = {
-		effect = { 
-			if = {
-				limit = {
-					AND = {
-						NOT = { has_global_flag = bilanlianheguojiesan }
-						is_ai = yes
-					}
-				}
-				add_to_variable = {
-					var = wz_sl
-					value = 900
-				}
-			}
-		}
-	}
-	on_monthly_SAD = {
-		effect = { 
-			if = {
-				limit = {
-					AND = {
-						NOT = { has_global_flag = bilanlianheguojiesan }
-						is_ai = yes
-					}
-				}
-				add_to_variable = {
-					var = wz_sl
-					value = 900
-				}
-			}
-		}
-	}
-	on_monthly_YUW = {
-		effect = { 
-			if = {
-				limit = {
-					AND = {
-						NOT = { has_global_flag = bilanlianheguojiesan }
-						is_ai = yes
-					}
-				}
-				add_to_variable = {
-					var = wz_sl
-					value = 900
-				}
-			}
-		}
-	}
 	on_declare_war = { 
 		effect = { 
 			if = { 

src/common/scripted_effects/az_scripted_effects.txt

@@ -1,4 +1,4 @@
-getzhg_event_gerentezhi_se = {
+getzhg_event_gerentezhi_se = {SOV
 	custom_effect_tooltip = getzhg_event_gerentezhi_tt
 	if = {
 		limit = { is_navy_leader = yes }
@@ -547,12 +547,66 @@ TY_lujunliluntupo = {
 	}
 }	
 TY_haijunliluntupo = {
-	#custom_effect_tooltip = TY_haijunliluntupo_effect_tooltip
+	custom_effect_tooltip = TY_haijunliluntupo_effect_tooltip
 	#set_country_flag = TY_navy_liluntupo
+	if = {
+		limit = {
+			AND = { 
+				has_naval_academy = yes
+				has_doctrine = new_fleet_in_being
+			}
+		}
+		add_ideas = az_lltp_czjd
+	}
+	if = {
+		limit = {
+			AND = { 
+				has_naval_academy = yes
+				has_doctrine = new_convoy_raiding
+			}
+		}
+		add_ideas = az_lltp_myfs
+	}
+	if = {
+		limit = {
+			AND = { 
+				has_naval_academy = yes
+				has_doctrine = new_base_strike
+			}
+		}
+		add_ideas = az_lltp_jddj
+	}
 }
 TY_kongjunliluntupo = {
-	#custom_effect_tooltip = TY_kongjunliluntupo_effect_tooltip
+	custom_effect_tooltip = TY_kongjunliluntupo_effect_tooltip
 	#set_country_flag = TY_air_liluntupo
+	if = {
+		limit = {
+			AND = {
+				has_air_academy = yes
+				has_doctrine = new_strategic_destruction
+			}
+		}
+		add_ideas = az_lltp_zlph
+	}
+	if = {
+		limit = {
+			AND = {
+				has_air_academy = yes
+				has_doctrine = new_battlefield_support
+			}
+		}
+		add_ideas = az_lltp_zczy
+	}
+	if = {
+		limit = {
+			AND = {
+				has_air_academy = yes
+				has_doctrine = new_operational_integrity
+			}
+		}
+		add_ideas = az_lltp_lxzz
+	}
 }		
 
 shaixuan_leader_seffect = {

src/common/scripted_guis/az_leadermenu_guis.txt

@@ -119,10 +119,10 @@ scripted_gui = {
 
 					}
 					check_variable = { 
-						ROOT.ROOT.wz_sl >9999
+						ROOT.wz_sl >9999
 					} 
 					check_variable = {
-						ROOT.ROOT.xzmf_sl >0 
+						ROOT.xzmf_sl >0 
 					} 
 				}
 				
@@ -178,7 +178,7 @@ scripted_gui = {
 						THIS = {
 							skill > 8
 							skill < 10 
-							is_navy_leader = NO
+							#is_navy_leader = NO
 						}
 					}
 					check_variable = {
@@ -192,15 +192,15 @@ scripted_gui = {
 					}
 				}
 				#lv9haijun
-				if = {
-					limit = {
-						THIS = { 
-							is_navy_leader = yes
-							skill > 8
-						}
-					}
-					always = NO
-				}
+				#if = {
+				#	limit = {
+				#		THIS = { 
+				#			is_navy_leader = yes
+							#skill > 8
+					#	}
+				#	}
+				#	always = NO
+				#}
 				#lv10
 				if = {
 					limit = {
@@ -242,6 +242,96 @@ scripted_gui = {
 					limit = {
 						THIS = {
 							skill > 11
+							skill < 13
+						}
+					}
+					check_variable = {
+						ROOT.wz_sl >59999
+					}
+					check_variable = {
+						ROOT.xzmf_sl >3
+					}
+					check_variable = {
+						ROOT.zs_sl >99
+					}
+				}
+				#lv13
+				if = {
+					limit = {
+						THIS = {
+							skill > 12
+							skill < 14
+						}
+					}
+					check_variable = {
+						ROOT.wz_sl >69999
+					}
+					check_variable = {
+						ROOT.xzmf_sl >4
+					}
+					check_variable = {
+						ROOT.zs_sl >119
+					}
+				}
+				#lv14
+				if = {
+					limit = {
+						THIS = {
+							skill > 13
+							skill < 15
+						}
+					}
+					check_variable = {
+						ROOT.wz_sl >79999
+					}
+					check_variable = {
+						ROOT.xzmf_sl >4
+					}
+					check_variable = {
+						ROOT.zs_sl >119
+					}
+				}
+				#lv15
+				if = {
+					limit = {
+						THIS = {
+							skill > 14
+							skill < 16
+						}
+					}
+					check_variable = {
+						ROOT.wz_sl >89999
+					}
+					check_variable = {
+						ROOT.xzmf_sl >5
+					}
+					check_variable = {
+						ROOT.zs_sl >149
+					}
+				}
+				#lv16
+				if = {
+					limit = {
+						THIS = {
+							skill > 15
+							skill < 20
+						}
+					}
+					check_variable = {
+						ROOT.wz_sl >99999
+					}
+					check_variable = {
+						ROOT.xzmf_sl >6
+					}
+					check_variable = {
+						ROOT.zs_sl >199
+					}
+				}
+				#lv20
+				if = {
+					limit = {
+						THIS = {
+							skill > 19
 						}
 					}
 					always = NO
@@ -306,9 +396,11 @@ scripted_gui = {
 				#lv1
 				if = { 
 					limit = {
+						THIS = {
 							skill > 0
 							skill < 2
 						}
+					}
 					add_to_variable = {
 						ROOT.wz_sl = -500
 					}
@@ -319,10 +411,10 @@ scripted_gui = {
 				#lv2
 				else_if = {
 					limit = {
-						
+						THIS = {
 							skill > 1
 							skill < 3
-						
+						}
 					}
 					add_to_variable = {
 						ROOT.wz_sl = -1000
@@ -334,10 +426,10 @@ scripted_gui = {
 				#lv3
 				else_if = {
 					limit = {
-						
+						THIS = {
 							skill > 2 
 							skill < 4
-						
+						}
 					}
 					add_to_variable = {
 						ROOT.wz_sl = -3000
@@ -349,10 +441,10 @@ scripted_gui = {
 				#lv4
 				else_if = {
 					limit = {
-						
+						THIS = {
 							skill > 3 
 							skill < 5 
-						
+						}
 					}
 					add_to_variable = {
 						ROOT.wz_sl = -6000
@@ -364,10 +456,10 @@ scripted_gui = {
 				#lv5
 				else_if = {
 					limit = {
-						
+						THIS = {
 							skill > 4 
 							skill < 6 
-						
+						}
 					}
 					add_to_variable = {
 						ROOT.wz_sl = -10000
@@ -382,10 +474,10 @@ scripted_gui = {
 				#lv6
 				else_if = {
 					limit = {
-						
+						THIS = {
 							skill > 5 
 							skill < 7 
-						
+						}
 					}
 					add_to_variable = {
 						ROOT.wz_sl = -15000
@@ -400,10 +492,10 @@ scripted_gui = {
 				#lv7
 				else_if = {
 					limit = {
-						
+						THIS = {
 							skill > 6
 							skill < 8 
-						
+						}
 					}
 					add_to_variable = {
 						ROOT.wz_sl = -20000
@@ -418,10 +510,10 @@ scripted_gui = {
 				#lv8
 				else_if = {
 					limit = {
-						
+						THIS = {
 							skill > 7 
 							skill < 9 
-						
+						}
 					}
 					
 					add_to_variable = {
@@ -430,31 +522,8 @@ scripted_gui = {
 					add_to_variable = {
 						ROOT.xzmf_sl = -2
 					}
-					
-					randomize_temp_variable = { 
-						var = chenggonggailv 
-						distribution = uniform
-						min = 0
-						max = 100
-					} 
-					if = {
-						limit = {
-							check_variable = { 
-								chenggonggailv > 20
-							}
-						}
-						
 					add_skill_level = 1
 					
-					}
-					else = {
-						
-						PREV = { unit_leader_event = getzhg_event.2501 } 
-						
-					}
-					
-					
-					
 				}
 				#lv9
 				else_if = {
@@ -473,27 +542,7 @@ scripted_gui = {
 					add_to_variable = {
 						ROOT.zs_sl = -20
 					}
-					randomize_temp_variable = {
-						var = chenggonggailv 
-						distribution = uniform
-						min = 0
-						max = 100
-					}
-					if = {
-						limit = {
-							check_variable = { 
-								chenggonggailv > 25
-							}
-						}
-						
 					add_skill_level = 1
-						
-					}
-					else = {
-						
-						PREV = { unit_leader_event = getzhg_event.2501 } 
-						
-					}
 				}
 				#lv10
 				else_if = {
@@ -512,27 +561,7 @@ scripted_gui = {
 					add_to_variable = {
 						ROOT.zs_sl = -60
 					}
-					randomize_temp_variable = {
-						var = chenggonggailv 
-						distribution = uniform
-						min = 0
-						max = 100
-					}
-					if = {
-						limit = {
-							check_variable = { 
-								chenggonggailv > 30
-							}
-						}
-						
 					add_skill_level = 1
-						
-					}
-					else = {
-						
-						PREV = { unit_leader_event = getzhg_event.2501 } 
-						
-					}
 				}
 				#lv11
 				else_if = {
@@ -551,6 +580,101 @@ scripted_gui = {
 					add_to_variable = {
 						ROOT.zs_sl = -100
 					}
+					add_skill_level = 1
+				}
+				#lv12
+				else_if = {
+					limit = {
+						THIS = {
+							skill > 11
+							skill < 13
+						}
+					}
+					add_to_variable = {
+						ROOT.wz_sl = -60000
+					}
+					add_to_variable = {
+						ROOT.xzmf_sl = -4
+					}
+					add_to_variable = {
+						ROOT.zs_sl = -100
+					}
+					add_skill_level = 1
+				}
+				#lv13
+				else_if = {
+					limit = {
+						THIS = {
+							skill > 12
+							skill < 14
+						}
+					}
+					add_to_variable = {
+						ROOT.wz_sl = -70000
+					}
+					add_to_variable = {
+						ROOT.xzmf_sl = -4
+					}
+					add_to_variable = {
+						ROOT.zs_sl = -120
+					}
+					add_skill_level = 1
+				}
+				#lv14
+				else_if = {
+					limit = {
+						THIS = {
+							skill > 13
+							skill < 15
+						}
+					}
+					add_to_variable = {
+						ROOT.wz_sl = -80000
+					}
+					add_to_variable = {
+						ROOT.xzmf_sl = -5
+					}
+					add_to_variable = {
+						ROOT.zs_sl = -120
+					}
+					add_skill_level = 1
+				}
+				#lv15
+				else_if = {
+					limit = {
+						THIS = {
+							skill > 14
+							skill < 16
+						}
+					}
+					add_to_variable = {
+						ROOT.wz_sl = -90000
+					}
+					add_to_variable = {
+						ROOT.xzmf_sl = -6
+					}
+					add_to_variable = {
+						ROOT.zs_sl = -150
+					}
+					add_skill_level = 1
+				}
+				#lv16
+				else_if = {
+					limit = {
+						THIS = {
+							skill > 15
+							skill < 20
+						}
+					}
+					add_to_variable = {
+						ROOT.wz_sl = -100000
+					}
+					add_to_variable = {
+						ROOT.xzmf_sl = -7
+					}
+					add_to_variable = {
+						ROOT.zs_sl = -200
+					}
 					randomize_temp_variable = {
 						var = chenggonggailv 
 						distribution = uniform
@@ -566,7 +690,7 @@ scripted_gui = {
 					if = {
 						limit = {
 							check_variable = { 
-								chenggonggailv > 40
+								chenggonggailv > 50
 							}  
 						}
 						

src/common/scripted_localisation/az_guis_scripted_localisation.txt

@@ -781,17 +781,16 @@ defined_text = {
 		trigger = { 
 			skill > 8
 			skill < 10
-			is_navy_leader = NO 
 		}
 		localization_key = qianghua_cost_tooltip_lv9
 	}
-	text = {  
-		trigger = { 
-			skill > 8
-			is_navy_leader = yes
-		}
-		localization_key = qianghua_cost_tooltip_lv9_haijun
-	}
+	#text = {  
+	#	trigger = { 
+	#		skill > 8
+	#		is_navy_leader = yes
+	#	}
+	#	localization_key = qianghua_cost_tooltip_lv9_haijun
+	#}
 	text = {  
 		trigger = { 
 			skill > 9
@@ -809,9 +808,44 @@ defined_text = {
 	text = {  
 		trigger = { 
 			skill > 11
+			skill < 13
 		}
 		localization_key = qianghua_cost_tooltip_lv12
 	}
+	text = {  
+		trigger = { 
+			skill > 12
+			skill < 14
+		}
+		localization_key = qianghua_cost_tooltip_lv13
+	}
+	text = {  
+		trigger = { 
+			skill > 13
+			skill < 15
+		}
+		localization_key = qianghua_cost_tooltip_lv14
+	}
+	text = {  
+		trigger = { 
+			skill > 14
+			skill < 16
+		}
+		localization_key = qianghua_cost_tooltip_lv15
+	}
+	text = {  
+		trigger = { 
+			skill > 15
+			skill < 20
+		}
+		localization_key = qianghua_cost_tooltip_lv16
+	}
+	text = {  
+		trigger = { 
+			skill > 19
+		}
+		localization_key = qianghua_cost_tooltip_lv20
+	}
 }
 
 defined_text = {

src/common/scripted_triggers/az_scripted_triggers.txt

@@ -17,6 +17,8 @@ shijianniangguojia_trigger = {
 	
 	if = {
 		limit = { has_global_flag = MOD_azurlane_tianjiangjianniang }
+		custom_trigger_tooltip = {
+			tooltip = shijianniangguojia_trigger_tooltip
 		OR = {
 			tag = BYG
 			tag = HUJ
@@ -33,6 +35,7 @@ shijianniangguojia_trigger = {
 			is_ai = NO
 		}
 		}
+	}
 	if = {
 		limit = { has_global_flag = MOD_azurlane_sairenzhizai }
 		OR = {

src/common/technologies/az_tech.txt

@@ -93,12 +93,10 @@ technologies = {
 			always = no
 		}
 
-		start_year = 1936
-
-		show_effect_as_desc = no
+		army_org_factor = 0.5
 
 		category_all_armor = {
-			max_strength = 3
+			max_strength = 4
 		}
 		category_all_infantry = {
 			max_strength = 10
@@ -116,18 +114,18 @@ technologies = {
 			always = no
 		}
 
-		start_year = 1936
-
 		show_effect_as_desc = yes
 
+		army_org_factor = 1
+
 		category_all_armor = {
 			max_strength = 4
 		}
 		category_all_infantry = {
-			max_strength = 11
+			max_strength = 15
 		}
 		category_artillery = {
-			max_strength = 4
+			max_strength = 2.4
 		}
 
 	}

src/common/technologies/chy_tech.txt

@@ -1,8 +0,0 @@
-#technologies = {
-#	#重樱特殊科技
-#	mijibubin_chy = {     
-#       infantry = {
-#			combat_width = -0.6
-#		}
-#	}
-#}

src/events/AZ_tianjiangEvents.txt

@@ -45,7 +45,7 @@ news_event = {
 	id = az_tianjiang.3
 	title = az_tianjiang.3.t
 	desc = az_tianjiang.3.d
-	picture = GFX_az_tx1
+	picture = GFX_az_tix4
 	is_triggered_only = yes
 	major = yes
 	option = {
@@ -71,7 +71,7 @@ country_event = {
 	picture = GFX_report_event_generic_read_write
 	is_triggered_only = yes
 	option = {
-		name = "谁敢说奥地利不是铁血的一部分？！"
+		name = "很好"
 		annex_country = { target = AUS transfer_troops = yes }
 		add_political_power = 150
 		add_stability = 0.2
@@ -740,7 +740,7 @@ news_event = {
 	id = az_tianjiang.20
 	title = az_tianjiang.20.t
 	desc = az_tianjiang.20.d
-	picture = GFX_az_tix4
+	picture = GFX_az_tix6
 	is_triggered_only = yes
 	major = yes
 	option = {
@@ -1100,7 +1100,7 @@ news_event = {
 	id = az_tianjiang.35
 	title = az_tianjiang.35.t
 	desc = az_tianjiang.35.d
-	picture = GFX_az_bfl1
+	picture = GFX_az_bfl2
 	is_triggered_only = yes
 	major = yes
 	option = {
@@ -2309,7 +2309,7 @@ news_event = {
 	id = az_tianjiang.74
 	title = az_tianjiang.74.t
 	desc = az_tianjiang.74.d
-	picture = GFX_az_blhxyq
+	picture = GFX_az_sr2
 	is_triggered_only = yes
 	major = yes
 	option = {
@@ -2338,7 +2338,7 @@ news_event = {
 	id = az_tianjiang.75
 	title ="基辅陷落"
 	desc = az_tianjiang.75.d
-	picture = GFX_az_tx1
+	picture = GFX_az_tix5
 	major = yes
 	trigger = {
 		202 = { is_controlled_by = TIX }
@@ -2378,7 +2378,7 @@ news_event = {
 	id = az_tianjiang.76
 	title ="列宁格勒的陷落"
 	desc = az_tianjiang.76.d
-	picture = GFX_az_tx1
+	picture = GFX_az_tix6
 	major = yes
 	trigger = {
 		195 = { is_controlled_by = TIX }
@@ -2458,7 +2458,7 @@ news_event = {
 	id = az_tianjiang.78
 	title ="巴黎的解放"
 	desc = az_tianjiang.78.d
-	picture = GFX_az_blhxyq
+	picture = GFX_az_yw1
 	major = yes
 	trigger = {
 		date > 1941.1.1
@@ -2571,7 +2571,7 @@ news_event = {
 	title = "撒丁占领区的崩溃"
 	desc = az_tianjiang.80.d
 	major = yes
-	picture = GFX_az_sad1
+	picture = GFX_az_tix7
 	is_triggered_only = yes
 	option = {
 		name = "这下全完了...."
@@ -2842,7 +2842,7 @@ news_event = {
 	title = "帝国的毁灭"
 	desc = az_tianjiang.89.d
 	major = yes
-	picture = GFX_az_blhxyq
+	picture = GFX_az_txbisimai
 	is_triggered_only = yes
 	option = {
 		name = "战争结束了"
@@ -8143,29 +8143,29 @@ country_event = {
 	}
 }
 
-#country_event = {
-#	id = az_tianjiang.230
-#	title = "释放埃及"
-#	desc = "测试皇家AI保卫北非"#由于P社AI改进，此事件作废
-#	picture = GFX_aze_diannao
-#	trigger = {
-#		date > 1936.1.3
-#		tag = HUJ
-#		is_ai = yes
-#	}
-#	fire_only_once = yes
-#	option = {
-#		name = "OK"
-#		release_on_controlled = EGY
-#		set_autonomy = {
-#			target = EGY
-#			autonomy_state = autonomy_integrated_puppet
-#		}
-#		ai_chance = {
-#			factor = 100
-#		}
-#	}
-#}
+country_event = {
+	id = az_tianjiang.230
+	title = "释放埃及"
+	desc = "测试皇家AI保卫北非"#由于P社AI改进，此事件作废	#不好孩子们，皇家又开始不守北非了，重新启用此事件
+	picture = GFX_aze_diannao
+	trigger = {
+		date > 1936.1.3
+		tag = HUJ
+		is_ai = yes
+	}
+	fire_only_once = yes
+	option = {
+		name = "OK"
+		release_on_controlled = EGY
+		set_autonomy = {
+			target = EGY
+			autonomy_state = autonomy_integrated_puppet
+		}
+		ai_chance = {
+			factor = 100
+		}
+	}
+}
 
 country_event = {
 	id = az_tianjiang.231

src/events/DOH_shijian.txt

@@ -957,6 +957,7 @@ country_event = {
 	fire_only_once = yes
 	trigger = {
 		tag = DOH
+		has_war_with = CHY
 		NOT = { controls_state = 608 }
 		has_global_flag = MOD_azurlane_tianjiangjianniang
 	}
@@ -977,6 +978,7 @@ country_event = {
 	fire_only_once = yes
 	trigger = {
 		tag = DOH
+		has_war_with = CHY
 		NOT = { controls_state = 613 }
 		has_global_flag = MOD_azurlane_tianjiangjianniang
 	}
@@ -997,6 +999,7 @@ country_event = {
 	fire_only_once = yes
 	trigger = {
 		tag = DOH
+		has_war_with = CHY
 		NOT = { controls_state = 597 }
 		has_global_flag = MOD_azurlane_tianjiangjianniang
 	}
@@ -1017,6 +1020,7 @@ country_event = {
 	fire_only_once = yes
 	trigger = {
 		tag = DOH
+		has_war_with = CHY
 		NOT = { controls_state = 620 }
 		has_global_flag = MOD_azurlane_tianjiangjianniang
 	}
@@ -1051,6 +1055,7 @@ country_event = {
 	fire_only_once = yes
 	trigger = {
 		tag = DOH
+		has_war_with = CHY
 		NOT = { controls_state = 744 }
 		has_global_flag = MOD_azurlane_tianjiangjianniang
 	}
@@ -1102,6 +1107,7 @@ country_event = {
 	fire_only_once = yes
 	trigger = {
 		tag = DOH
+		has_war_with = CHY
 		NOT = { controls_state = 605 }
 		has_global_flag = MOD_azurlane_tianjiangjianniang
 	}

src/events/azcollege.txt

@@ -14,11 +14,9 @@ country_event = {
 		ai_chance = {
 			factor = 4
 		}
-		add_doctrine_cost_reduction = {
-			name = "如期完成"
-			cost_reduction = 0.2
-			uses = 1
-			category = naval_doctrine
+		add_timed_idea = {
+			days = 60
+			idea = az_hjll_1
 		}
 	}
 }
@@ -36,11 +34,9 @@ country_event = {
 		ai_chance = {
 			factor = 4
 		}
-		add_doctrine_cost_reduction = {
-			name = "科研成功"
-			cost_reduction = 0.4
-			uses = 2
-			category = naval_doctrine
+		add_timed_idea = {
+			days = 60
+			idea = az_hjll_2
 		}
 	}
 }
@@ -58,11 +54,9 @@ country_event = {
 		ai_chance = {
 			factor = 4
 		}
-		add_tech_bonus = {
-			name = "科研项目重大突破"
-			bonus = 0.7
-			uses = 3
-			category = naval_doctrine
+		add_timed_idea = {
+			days = 90
+			idea = az_hjll_3
 		}
 	}
 }

src/events/azspnews.txt

@@ -3,7 +3,7 @@ news_event = {
 	id = azspnews.38
 	title = "华盛顿沦陷"
 	desc = azspnews.38.d
-	picture = GFX_az_tix4
+	picture = GFX_az_tix6
 	major = yes
 	trigger = {
 		361 = { is_controlled_by = TIX }
@@ -81,7 +81,7 @@ news_event = {
 	id = azspnews.36
 	title ="东京陷落"
 	desc = azspnews.36.d
-	picture = GFX_az_bfl1
+	picture = GFX_az_bfl2
 	major = yes
 	trigger = {
 		282 = { is_controlled_by = BFL }
@@ -159,7 +159,7 @@ news_event = {
 	id = azspnews.34
 	title ="罗马陷落"
 	desc = azspnews.34.d
-	picture = GFX_az_bfl1
+	picture = GFX_az_bfl3
 	major = yes
 	trigger = {
 		2 = { is_controlled_by = BFL }
@@ -276,7 +276,7 @@ news_event = {
 	id = azspnews.31
 	title ="东京陷落"
 	desc = azspnews.31.d
-	picture = GFX_az_dh1
+	picture = GFX_az_cychangmen2
 	major = yes
 	trigger = {
 		282 = { is_controlled_by = DOH }
@@ -315,7 +315,7 @@ news_event = {
 	id = azspnews.30
 	title ="南京沦陷"
 	desc = azspnews.30.d
-	picture = GFX_az_cy1
+	picture = GFX_az_cy3
 	major = yes
 	trigger = {
 		613 = { is_controlled_by = CHY }
@@ -354,7 +354,7 @@ news_event = {
 	id = azspnews.29
 	title ="鸢尾国爆发内战！"
 	desc = "长期的政府混乱使鸢尾的政局十分动荡，内战一触即发。由于黎塞留的错误决定，让巴尔掌控了部分军队的控制权，并宣布发动内战。"
-	picture = GFX_az_yw2
+	picture = GFX_az_yw4
 	is_triggered_only = yes
 	
 	option = {
@@ -452,7 +452,7 @@ news_event = {
 	id = azspnews.26
 	title ="攻克柏林"
 	desc = azspnews.26.d
-	picture = GFX_az_bfl1
+	picture = GFX_az_bfl3
 	major = yes
 	trigger = {
 		64 = { is_controlled_by = BFL }
@@ -608,7 +608,7 @@ news_event = {
 	id = azspnews.22
 	title ="伦敦沦陷"
 	desc = azspnews.22.d
-	picture = GFX_az_tix3
+	picture = GFX_az_tix5
 	major = yes
 	trigger = {
 		126 = { is_controlled_by = TIX }
@@ -725,7 +725,7 @@ news_event = {
 	id = azspnews.19
 	title ="鸢尾教廷的分裂"
 	desc = azspnews.19.d
-	picture = GFX_az_yw1
+	picture = GFX_az_yw4
 	major = yes
 	is_triggered_only = yes
 	

src/history/countries/BFL - Beifanglianhe.txt

@@ -14,6 +14,7 @@ set_popularities = {
 
 set_grand_doctrine = mass_assault
 set_grand_doctrine = new_fleet_in_being
+set_grand_doctrine = new_strategic_destruction
 
 set_autonomy = {
 	target = MON

src/history/countries/BYG - Baiying.txt

@@ -7,6 +7,7 @@ starting_train_buffer = 5
 
 set_grand_doctrine = superior_firepower
 set_grand_doctrine = new_base_strike
+set_grand_doctrine = new_strategic_destruction
 
 create_faction_from_template = faction_template_byg_commonwealth
 

src/history/countries/HUJ - Huangjia.txt

@@ -112,6 +112,7 @@ set_technology = {
 
 set_grand_doctrine = grand_battleplan
 set_grand_doctrine = new_fleet_in_being
+set_grand_doctrine = new_operational_integrity
 
 if = {
 	limit = {

src/history/countries/SAD - Sading.txt

@@ -17,6 +17,7 @@ if = {
 
 set_grand_doctrine = grand_battleplan
 set_grand_doctrine = new_fleet_in_being
+set_grand_doctrine = new_operational_integrity
 
 set_variable = { var = jz_sl value = 1 }
 set_variable = { var = xzmf_sl value = 2 }

src/history/units/CHY_1936.txt

@@ -383,7 +383,7 @@ units = {
       is_name_ordered = yes
       name_order = 14
     }
-    location = 6806
+    location = 898
     division_template = "步兵师团"  # Hohei Shidan
     start_experience_factor = 0.3
   }

src/interface/az_eventpictures.gfx

@@ -11,10 +11,14 @@ spriteTypes = {
 		name = "GFX_aze_cy1"
 		texturefile = "gfx/event_pictures/aze_cy1.png"
 	}
-	# spriteType = {
-	# 	name = "GFX_aze_cy2"
-	# 	texturefile = "gfx/event_pictures/aze_cy2.png"
-	# }
+	spriteType = {
+		name = "GFX_az_cy2"
+	 	texturefile = "gfx/event_pictures/az_cy2.png"
+	}
+	spriteType = {
+		name = "GFX_az_cy3"
+	 	texturefile = "gfx/event_pictures/az_cy3.png"
+	}
 	# spriteType = {
 	# 	name = "GFX_aze_cy2"
 	# 	texturefile = "gfx/event_pictures/aze_cy2.png"
@@ -351,6 +355,30 @@ spriteTypes = {
 		name = "GFX_az_yw3"
 		texturefile = "gfx/event_pictures/az_yw3.png"
 	}
+	spriteType = {
+		name = "GFX_az_yw4"
+		texturefile = "gfx/event_pictures/az_yw4.png"
+	}
+	spriteType = {
+		name = "GFX_az_bfl2"
+		texturefile = "gfx/event_pictures/az_bfl2.png"
+	}
+	spriteType = {
+		name = "GFX_az_bfl3"
+		texturefile = "gfx/event_pictures/az_bfl3.png"
+	}
+	spriteType = {
+		name = "GFX_az_tix5"
+		texturefile = "gfx/event_pictures/az_tix5.png"
+	}
+	spriteType = {
+		name = "GFX_az_tix6"
+		texturefile = "gfx/event_pictures/az_tix6.png"
+	}
+	spriteType = {
+		name = "GFX_az_tix7"
+		texturefile = "gfx/event_pictures/az_tix7.png"
+	}
 	spriteType = {
 		name = "GFX_az_buli"
 		texturefile = "gfx/event_pictures/az_buli.png"

src/localisation/simp_chinese/az_decisions_l_simp_chinese.yml

@@ -286,6 +286,8 @@
  jiaoyuluolijianniang_desc:"我们的教练将继续教育萝莉舰娘。"
  mf_meitan:"煤炭转化"
  mf_meitan_desc:"使用大量魔方立刻制造出大量煤炭。"
+ mf_jingtongdu:"快速学习"
+ mf_jingtongdu_desc:"通过心智魔方的强化，快速学习陆军理论知识。"
 
  
 

src/localisation/simp_chinese/az_misc_l_simp_chinese.yml

@@ -1,6 +1,6 @@
 l_simp_chinese:
- gengxinshuoming_title2:0"2.13更新内容"
- gengxinshuoming_text2:"1.尚未确认适配完成，暂时不推荐游玩。\n\n在正式开始游戏前，请确保已经开启了50建筑槽MOD，这会对MOD的游戏流程与AI行为有极大影响。\nMOD内95%的长文案由AI生成，§C所有文案当做同人小说来看就好§!！MOD交流群539127559\n最下方的决议里有路线指南和舰娘羁绊事件。出现成就条件满足但无法去完成的情况请打开历史国策。"
+ gengxinshuoming_title2:0"2.14更新内容"
+ gengxinshuoming_text2:"1.初步适配完成，疯狂AI暂未测试，部分系统改动较多，具体改动内容请看创意工坊改动说明。\n\n在正式开始游戏前，请确保已经开启了50建筑槽MOD，这会对MOD的游戏流程与AI行为有极大影响。\nMOD内95%的长文案由AI生成，§C所有文案当做同人小说来看就好§!！MOD交流群539127559\n最下方的决议里有路线指南和舰娘羁绊事件。出现成就条件满足但无法去完成的情况请打开历史国策。"
  az_openstart_button_tooltip:0"打开碧蓝MOD开始界面"
  dancingxiaotiancheng_tooltip:0"§RDancing~§! §CDancing~§! §YNon Stop§! §Bmy§! §GDancing~§!"
  az_start_mainwindow_stratgame_btn_tooltip:0"§Y◆注意◆§!确认你已完成所有MOD设定，点击开始游戏后将§R无法更改§!任何设定§Y◆注意◆§!"
@@ -357,3 +357,6 @@ modifier_production_cost_air_base_factor_desc: "改变空军基地建造花费"
 modifier_production_cost_naval_base_factor: "§Y海军基地§!建造花费"
 modifier_production_cost_naval_base_factor_desc: "改变海军基地建造花费"
 az_aimeitanzuobi: "AI作弊"
+modifier_experience_gain_medium_armor_combat_factor: "战斗中获取的中坦经验："
+modifier_experience_gain_heavy_armor_combat_factor: "战斗中获取的重坦经验："
+shijianniangguojia_trigger_tooltip: "§Y[ROOT.getname]§!是舰娘国家"

src/localisation/simp_chinese/az_xmp_gui_l_simp_chinese.yml

@@ -58,3 +58,4 @@
  az_xmp_biyishuangfei_text:0"比翼双飞"
  az_xmp_biyishuangfei_desc:0"以优惠价格购入两枚誓约之戒，该礼包在一局游戏内只能购买一次。"
  az_xmp_biyishuangfei_desc2:0"注意啦！§Y比翼双飞§!礼包在一局游戏内§C只能购买一次§!~"
+ az_hjll_1:"海军战术研究"

src/localisation/simp_chinese/azc_YUW_l_simp_chinese.yml

@@ -2663,7 +2663,7 @@
  az_tianjiang.70.d:0"从皇家那里传来了消息，铁血希望与我们停战。在北联被击败后，铁血的主力就都集中在了西线，然而我们双方势均力敌，如今战争已经持续了太久，无论是赤色中轴还是碧蓝航线，都需要一个踹息的机会。铁血表示除鸢尾和比荷卢与波兰之外，其他的交战地区将保持战前划分。虽然听起来不太公平，但鸢尾的失败也是事实，皇家拿不定注意，她们希望我们能做出准确的判断。我们是否要接受这份并不完美的和平？"
  tix_yuhujyihecg:0"§Y@TIX赤色中轴§! 与 §Y@HUJ碧蓝航线§! 无条件和平\n鸢尾被皇家出卖\n欧洲与非洲的战争已经停止，世界大战即将结束"
  az_tianjiang.74.t:0"光荣和平"
- az_tianjiang.74.d:0"碧蓝航线与赤色中轴近日签署了具有历史意义的和平协议，标志着这场旷日持久的战争暂时画上句号。根据协议内容，碧蓝航线方面将做出重大让步：欧洲战场的比荷卢地区及鸢尾领土将维持现状，同时需向撒丁帝国移交非洲与中东的大片殖民地。尤为关键的是，苏伊士运河的控制权将移交铁血帝国，这一战略要地的易主必将重塑世界航运格局。\n\n颇具讽刺意味的是，此前曾有专家信誓旦旦地预言，除非出现威胁全体舰娘生存的共同敌人，否则这场战争永无宁日。如今这份和平协议的签署，无疑让这番言论沦为笑谈。然而，在这表面平静的外交胜利背后，暗流依旧涌动——没人能保证这份用妥协换来的和平能够维系多久。\n值得注意的是，作为战败方的北方联合对此反应激烈，公开谴责皇家与白鹰向铁血势力低头，她们声称迟早会发起对铁血的反攻。"
+ az_tianjiang.74.d:0"碧蓝航线与赤色中轴近日签署了具有历史意义的和平协议，标志着这场旷日持久的战争暂时画上句号。根据协议内容，碧蓝航线方面将做出重大让步：欧洲战场的比荷卢地区及鸢尾领土将维持现状，同时需向撒丁帝国移交非洲与中东的大片殖民地。苏伊士运河的控制权将移交铁血国，这一战略要地的易主必将重塑世界航运格局。\n颇具讽刺意味的是，此前曾有专家信誓旦旦地预言，除非出现威胁全体舰娘生存的共同敌人，否则这场战争永无宁日。如今这份和平协议的签署，无疑让这番言论沦为笑谈。值得注意的是，作为战败方的北方联合对此反应激烈，公开谴责皇家与白鹰向铁血势力低头，她们声称迟早会发起对铁血的反攻。"
  az_tianjiang.74.a:0"我们时代的和平来了"
  az_tianjiang.74.b:0"这和平能持续多久？"
  az_tianjiang.75.d:0"铁血军队已经攻占基辅，这座北联重要城市的陷落无疑是一次重大打击。然而，胜利的喜悦还未散去，占领军就尝到了苦果——北联内务部队事先在赫列夏季克大街沿线埋设的数千枚地雷接连爆炸，将本就满目疮痍的城市进一步化为废墟。\n\n眼下，铁血军队正继续向东推进，但她们能否维持这样的进攻势头仍是个未知数。基辅的惨状预示着，北联显然打算让侵略者为每一寸土地付出沉重代价。"

src/localisation/simp_chinese/azevent_l_simp_chinese.yml

@@ -564,12 +564,17 @@
  qianghua_cost_tooltip_lv5:0"需要§Y10000§!£GFX_small_wz!、§C1§!£GFX_small_xzmf!升级到§Y6§!级"
  qianghua_cost_tooltip_lv6:0"需要§Y15000§!£GFX_small_wz!、§C1§!£GFX_small_xzmf!升级到§Y7§!级"
  qianghua_cost_tooltip_lv7:0"需要§Y20000§!£GFX_small_wz!、§C2§!£GFX_small_xzmf!升级到§Y8§!级"
- qianghua_cost_tooltip_lv8:0"需要§Y30000§!£GFX_small_wz!、§C2§!£GFX_small_xzmf!升级到§Y9§!级（失败概率：§R20%§!）"
- qianghua_cost_tooltip_lv9:0"需要§Y35000§!£GFX_small_wz!、§C3§!£GFX_small_xzmf!、§R20§!£GFX_small_zs!升级到§Y10§!级（失败概率：§R25%§!）"
+ qianghua_cost_tooltip_lv8:0"需要§Y30000§!£GFX_small_wz!、§C2§!£GFX_small_xzmf!升级到§Y9§!级"
+ qianghua_cost_tooltip_lv9:0"需要§Y35000§!£GFX_small_wz!、§C3§!£GFX_small_xzmf!、§R20§!£GFX_small_zs!升级到§Y10§!级"
  qianghua_cost_tooltip_lv9_haijun:0"永远滴神！~她已经满级啦"
- qianghua_cost_tooltip_lv10:0"需要§Y40000§!£GFX_small_wz!、§C3§!£GFX_small_xzmf!、§R60§!£GFX_small_zs!升级到§Y11§!级（失败概率：§R30%§!）"
- qianghua_cost_tooltip_lv11:0"需要§Y50000§!£GFX_small_wz!、§C4§!£GFX_small_xzmf!、§R100§!£GFX_small_zs!升级到§Y12§!级（失败概率：§R40%§!）"
- qianghua_cost_tooltip_lv12:0"永远滴神！~她已经满级啦"
+ qianghua_cost_tooltip_lv10:0"需要§Y40000§!£GFX_small_wz!、§C3§!£GFX_small_xzmf!、§R60§!£GFX_small_zs!升级到§Y11§!级"
+ qianghua_cost_tooltip_lv11:0"需要§Y50000§!£GFX_small_wz!、§C4§!£GFX_small_xzmf!、§R100§!£GFX_small_zs!升级到§Y12§!级"
+ qianghua_cost_tooltip_lv12:0"需要§Y60000§!£GFX_small_wz!、§C4§!£GFX_small_xzmf!、§R100§!£GFX_small_zs!升级到§Y13§!级"
+ qianghua_cost_tooltip_lv13:0"需要§Y70000§!£GFX_small_wz!、§C4§!£GFX_small_xzmf!、§R120§!£GFX_small_zs!升级到§Y14§!级"
+ qianghua_cost_tooltip_lv14:0"需要§Y80000§!£GFX_small_wz!、§C5§!£GFX_small_xzmf!、§R120§!£GFX_small_zs!升级到§Y15§!级"
+ qianghua_cost_tooltip_lv15:0"需要§Y90000§!£GFX_small_wz!、§C6§!£GFX_small_xzmf!、§R150§!£GFX_small_zs!升级到§Y16§!级"
+ qianghua_cost_tooltip_lv16:0"需要§Y100000§!£GFX_small_wz!、§C7§!£GFX_small_xzmf!、§R200§!£GFX_small_zs!升级到§Y下一个§!等级（失败概率50%）"
+ qianghua_cost_tooltip_lv20:0"永远滴神！~她已经满级啦"
  az_debug_decision:"[?jianniangname]2[?THIS.jianniangname]"
  getzhg_event_gerentezhi_tt:0"获得一个§C随机§!的§Y个人特质§!"
  getzhg_event_xidetezhi_tt:0"获得一个§C随机§!的§O习得特质§!"

src/localisation/simp_chinese/aznews_l_simp_chinese.yml

@@ -188,5 +188,5 @@
  azspnews.34.d:"“永恒之城”罗马已经落入了北联先头部队之手。撒丁军队已经撤离了罗马，北联军队在城市中开始处理一些零星的抵抗。最具历史意义的地标建筑只受到了轻微的损伤，但也有些矛盾的报告，比如万神殿就遭到了机枪的扫射。"
  azspnews.35.d:"北联军队的继续前进已成必然之势，根据报告显示鸢尾的首都已经陷落，鸢尾共产党人帮助了北联军队进入了这座城市，并参加了一部分对于鸢尾陆军的追击行动。\n\n传单已经遍布城市，向巴黎居民宣布他们已经被‘从资产阶级的压迫之下解放出来’。"
  azspnews.36.d:"北联军队已经在东京聚集，整个城市都发生着惨烈的战斗。北联军队现已经控制大部分的城区，但是东部地区的大火仍在肆虐。\n\n在战斗转向皇居的时候，帝国卫队的成员通过肉搏战将北联逐出了皇居。这座宫殿最终是由一队VDV伞兵进行突袭攻陷，她们在逐个房间进行了战斗最终拿下了这座宫殿。她们没有抓到任何俘虏，但据信，重樱领导层已经在北联攻势开始前撤离了东京。"
- azspnews.37.d:"经过数小时与非正规军的激战后，铁血先锋部队现已夺取了纽约的控制权。\n\n装甲掷弹兵在摧毁掉第五大道上的简易反坦克桩后，开始逐个街区地清理曼哈顿城区当中负隅顽抗的敌人。\n\n激战中，自由女神像的头部不幸被一发炮弹炸断，至于是流弹横祸还是有人故意毁坏目前还不得而知。\n\n而在城区东部，大火已经燃烧了几天几夜，整个城市就算在夜晚也亮如白日，火红的天空映衬着黑暗中无头的自由女神像，宛如一幅地狱的画卷。"
- azspnews.38.d:"华盛顿特区的战斗于今天落下帷幕，铁血部队沿着波托马克河消灭了城中最后的抵抗力量。\n\n城市被浓厚的烟雾笼罩，据说在最终撤退前，CIA特工烧掉了许多机要文件。在与特勤局人员短暂的交火后，武装党卫军占领了白宫，而联邦总统在几天前就已经撤离此地。\n\n白鹰首都的陷落已经展现了铁血战争机器的可怕威力，后者已然势不可挡。"
+ azspnews.37.d:"经过数小时与非正规军的激战后，铁血先锋部队现已夺取了纽约的控制权。\n装甲掷弹兵在摧毁掉第五大道上的简易反坦克桩后，开始逐个街区地清理曼哈顿城区当中负隅顽抗的敌人。\n激战中，自由女神像的头部不幸被一发炮弹炸断，至于是流弹横祸还是有人故意毁坏目前还不得而知。\n而在城区东部，大火已经燃烧了几天几夜，整个城市就算在夜晚也亮如白日，火红的天空映衬着黑暗中无头的自由女神像，宛如一幅地狱的画卷。"
+ azspnews.38.d:"华盛顿特区的战斗于今天落下帷幕，铁血部队沿着波托马克河消灭了城中最后的抵抗力量。\n城市被浓厚的烟雾笼罩，据说在最终撤退前，CIA特工烧掉了许多机要文件。在与特勤局人员短暂的交火后，武装党卫军占领了白宫，而联邦总统在几天前就已经撤离此地。\n白鹰首都的陷落已经展现了铁血战争机器的可怕威力，后者已然势不可挡。"

src/localisation/simp_chinese/liluntupodecisions_l_simp_chinese.yml

@@ -20,11 +20,136 @@
  liluntupo_airexp_100_blocked:0 "需要§R100§!£air_experience!"
  liluntupo_airexp_100_tooltip:0 "花费§H100§!£air_experience!"
  TY_lujunliluntupo_effect_tooltip:0"允许通过§Y理论突破§!决议解锁第二条陆军学说路线"
- TY_haijunliluntupo_effect_tooltip:0"允许通过§Y理论突破§!决议解锁第二条海军学说路线"
- TY_kongjunliluntupo_effect_tooltip:0"允许通过§Y理论突破§!决议解锁第二条空军学说路线" 
- TY_lujunliluntupo_new_effect_tooltip:"达成陆军§Y理论突破§!，获得高额§Y陆军HP增益§!"
- 
- 
+ TY_haijunliluntupo_effect_tooltip:0"达成海军§Y理论突破§!，根据所选学说获得§Y特定增益§!"
+ TY_kongjunliluntupo_effect_tooltip:0"达成空军§Y理论突破§!，根据所选学说获得§Y特定增益§!" 
+ TY_lujunliluntupo_new_effect_tooltip:"达成陆军§Y理论突破§!，获得§Y陆军HP§!与§Y组织度§!增益"
+ az_lltp_zlph:"理论突破：战略破坏"
+ az_lltp_zczy:"理论突破：战场支援"
+ az_lltp_lxzz:"理论突破：连续作战"
+ az_lltp_czjd:"理论突破：存在舰队"
+ az_lltp_myfs:"理论突破：贸易封锁"
+ az_lltp_jddj:"理论突破：基地打击"
+###########新学说分支###################
+AZ_SUBDOCTRINE_LARGE_UNIT_TACTICS: "舰娘人海战术"
+large_unit_tactics_BFL_wide_trench_networks: "战壕构筑"
+large_unit_tactics_BFL_flexible_division_structures: "灵活的师级编制"
+large_unit_tactics_BFL_unit_knowledge_sharing: "单位情报共享"
+large_unit_tactics_BFL_large_front_offensive: "人海压制"
+large_unit_tactics_BFL_motorization_initiative: "摩托化计划"
+AZ_SUBDOCTRINE_ASSAULT_INFANTRY: "舰娘突击战术"
+assault_infantry_BYG_BYG1: "低梯队火力支援"
+assault_infantry_BYG_BYG2: "自主营级火力支援"
+assault_infantry_BYG_BYG3: "步兵前沿观察员训练"
+assault_infantry_BYG_BYG4: "侦查回撤"
+assault_infantry_BYG_BYG5: "突击分队"
+AZ_SUBDOCTRINE_DEFENSIVE_POSTURES: "舰娘防御战术"
+defensive_postures_HUJ_HUJ1: "临时战斗阵地"
+defensive_postures_HUJ_HUJ2: "前哨线"
+defensive_postures_HUJ_HUJ3: "支撑点网络"
+defensive_postures_HUJ_HUJ4: "交叉火力网"
+defensive_postures_HUJ_HUJ5: "步兵工兵训练"
+AZ_SUBDOCTRINE_MOBILE_INFANTRY: "舰娘机动步兵"
+mobile_infantry_TIX_TIX1: "现代化骑兵"
+mobile_infantry_TIX_TIX2: "敌后作战"
+mobile_infantry_TIX_TIX3: "先发制人"
+mobile_infantry_TIX_TIX4: "委派授权"
+mobile_infantry_TIX_TIX5: "机动作战"
+AZ_SUBDOCTRINE_COMMANDOS: "舰娘单兵战术"
+commandos_SAD_SAD1: "独立战斗单位"
+commandos_SAD_SAD2: "分散单位协同"
+commandos_SAD_SAD3: "严格训练"
+commandos_SAD_SAD4: "战场情报搜集"
+commandos_SAD_SAD5: "联合突击"
+AZ_SUBDOCTRINE_FIRE_CONCENTRATION: "舰娘火力集中"
+fire_concentration_BFL_BFL1: "预设炮位"
+fire_concentration_BFL_BFL2: "预测射击"
+fire_concentration_BFL_BFL3: "炮兵群区域警戒"
+fire_concentration_BFL_BFL4: "集中式防空支援"
+fire_concentration_BFL_BFL5: "测射火力阵地"
+AZ_SUBDOCTRINE_MOBILE_RECON_AND_ASSAULT: "舰娘机动侦查"
+mobile_recon_and_assault_TIX_TIX1: "建制摩托化补给"
+mobile_recon_and_assault_TIX_TIX2: "远距离侦查"
+mobile_recon_and_assault_TIX_TIX3: "机动作战部署"
+mobile_recon_and_assault_TIX_TIX4: "行进间射击"
+mobile_recon_and_assault_TIX_TIX5: "专注纵深侦查"
+AZ_SUBDOCTRINE_FIELD_ENGINEERING: "舰娘野战工程"
+field_engineering_SAD_SAD1: "快速火力清障"
+field_engineering_SAD_SAD2: "工兵野外技术"
+field_engineering_SAD_SAD3: "工兵构筑发射阵地"
+field_engineering_SAD_SAD4: "烟幕发射器训练"
+field_engineering_SAD_SAD5: "喷火与爆破攻坚"
+AZ_SUBDOCTRINE_FLYING_BATTERIES: "舰娘机动炮组"
+flying_batteries_AZ_AZ1: "部署演练"
+flying_batteries_AZ_AZ2: "反炮兵作战任务"
+flying_batteries_AZ_AZ3: "装甲前沿观察车"
+flying_batteries_AZ_AZ4: "快速展开炮架"
+flying_batteries_AZ_AZ5: "大范围分散炮兵群"
+AZ_SUBDOCTRINE_ARMORED_SPEARHEAD: "舰娘装甲先锋"
+armored_spearhead_TIX_TIX1: "主要突击点"
+armored_spearhead_TIX_TIX2: "装甲突破扩张"
+armored_spearhead_TIX_TIX3: "地方预备队"
+armored_spearhead_TIX_TIX4: "强点绕行突击"
+armored_spearhead_TIX_TIX5: "侧翼防护"
+AZ_SUBDOCTRINE_MOBILE_DEFENSE: "舰娘机动防御"
+mobile_defense_BYG_BYG1: "机械化搭乘载具"
+mobile_defense_BYG_BYG2: "顶着火力前进"
+mobile_defense_BYG_BYG3: "履带式战斗支援"
+mobile_defense_BYG_BYG4: "协同反装甲"
+mobile_defense_BYG_BYG5: "坦克对战"
+AZ_SUBDOCTRINE_STREAMLINED_DEPLOYMENT: "舰娘钢铁洪流"
+streamlined_deployment_BFL_BFL1: "陆军机械化推进"
+streamlined_deployment_BFL_BFL2: "机械化浪潮"
+streamlined_deployment_BFL_BFL3: "坦克步兵乘员"
+streamlined_deployment_BFL_BFL4: "精简式后勤"
+streamlined_deployment_BFL_BFL5: "持续进攻"
+AZ_SUBDOCTRINE_ARMORED_INFANTRY_SUPPORT: "舰娘装甲步兵"
+armored_infantry_support_HUJ_HUJ1: "碾压式突击"
+armored_infantry_support_HUJ_HUJ2: "装甲步兵队"
+armored_infantry_support_HUJ_HUJ3: "维护惯例"
+armored_infantry_support_HUJ_HUJ4: "燃料配给"
+armored_infantry_support_HUJ_HUJ5: "机动装甲据点"
+AZ_SUBDOCTRINE_ARMORED_CAVALRY: "舰娘装甲骑兵"
+armored_cavalry_CHY_CHY1: "巡洋坦克"
+armored_cavalry_CHY_CHY2: "摩托化警戒部队"
+armored_cavalry_CHY_CHY3: "以速度替代装甲"
+armored_cavalry_CHY_CHY4: "作战侦查"
+armored_cavalry_CHY_CHY5: "装甲外挂储物"
+AZ_SUBDOCTRINE_MISSION_TYPE_TACTICS: "舰娘任务战术"
+mission_type_tactics_TIX_TIX1: "低层级授权"
+mission_type_tactics_TIX_TIX2: "灵活指挥"
+mission_type_tactics_TIX_TIX3: "诸兵种合成战斗群"
+mission_type_tactics_TIX_TIX4: "进攻部署态势"
+mission_type_tactics_TIX_TIX5: "控制区责任"
+AZ_SUBDOCTRINE_DEEP_BATTLE: "舰娘纵深作战"
+deep_battle_BFL_BFL1: "边界监视"
+deep_battle_BFL_BFL2: "战术储备"
+deep_battle_BFL_BFL3: "战略欺骗"
+deep_battle_BFL_BFL4: "突破优先"
+deep_battle_BFL_BFL5: "战役级进攻"
+AZ_SUBDOCTRINE_GRAND_ASSAULT: "舰娘强袭战术"
+grand_assault_YUW_YUW1: "中央计划"
+grand_assault_YUW_YUW2: "牵制性进攻"
+grand_assault_YUW_YUW3: "联合兵种一体化"
+grand_assault_YUW_YUW4: "前线指挥所"
+grand_assault_YUW_YUW5: "C3I系统理论"
+AZ_SUBDOCTRINE_RAPID_DOMINATION: "舰娘快速主导"
+rapid_domination_BYG_BYG1: "侦查前出"
+rapid_domination_BYG_BYG2: "先进火力阵地"
+rapid_domination_BYG_BYG3: "动态火力管制"
+rapid_domination_BYG_BYG4: "团级战斗队"
+rapid_domination_BYG_BYG5: "震慑战术"
+AZ_SUBDOCTRINE_INFILTRATION_TACTICS: "舰娘渗透战术"
+infiltration_tactics_CHY_CHY1: "渗透突击"
+infiltration_tactics_CHY_CHY2: "夜间突袭"
+infiltration_tactics_CHY_CHY3: "自给自足的渗透部队"
+infiltration_tactics_CHY_CHY4: "地形与态势评估"
+infiltration_tactics_CHY_CHY5: "深度渗透作战"
+AZ_SUBDOCTRINE_LAST_STAND: "舰娘殊死防御"
+last_stand_AZ_AZ1: "破坏小组"
+last_stand_AZ_AZ2: "围困区巩固"
+last_stand_AZ_AZ3: "堑壕固守"
+last_stand_AZ_AZ4: "补给点物资援助"
+last_stand_AZ_AZ5: "最终攻势"