2025-12-23 04:03:14

src/common/achievements/az_achievements.txt

@@ -213,8 +213,18 @@ az_tongsinimiao_cj = {
     
     happened = {
 		not = { has_global_flag = modoption_dingzhenai_on }
-		is_in_faction_with = SAD
-    has_war_with = ITA
+    OR = {
+      AND = {
+        is_in_faction_with = SAD
+        has_war_with = ITA
+      }
+      AND = {
+        SAD = {
+          has_civil_war = yes
+          has_war_with = TIX
+        }
+      }
+    }
     }    
 }
 

src/common/combat_tactics.txt

@@ -1239,7 +1239,7 @@ tactic_guerrilla_tactics_for_doh = {
 	
 	combat_width = -0.5
 	attacker = -0.9
-	defender = -0.7
+	defender = -0.65
 	attacker_movement_speed = -0.25
 }
 

src/common/decisions/tianjiang_aizuobi_decisions.txt

@@ -155,6 +155,26 @@ tianjiang_aizuobi = {
 			}
 		}
 	}
+	ai_fkAI_shuzhidabaozha = {
+		available = {
+			is_ai = yes
+			has_idea = TY_fkAI_zuizhonghetiex
+			has_global_flag = TY_fkAI_yourenjuedebugounan
+		}
+		visible = {
+			is_ai = yes
+		}
+		ai_will_do = {
+			factor = 10000
+		}
+		fire_only_once = yes
+		complete_effect = {
+			swap_ideas = {
+			remove_idea = TY_fkAI_zuizhonghetiex
+			add_idea = TY_fkAI_zuizhonghetiex_shuzhipengzhang
+			}
+		}
+	}
 	ai_fkAIcitiao_huoxingbing = {
 		available = {
 			OR = {

src/common/decisions/tianjiang_decision.txt

@@ -11475,6 +11475,37 @@ TIX_quanlipingheng = {
 }
 
 AZ_fkAIplayerjiaqiang = {
+	az_qianzoule_dianzhege = {
+		visible = {
+			is_ai = no
+			has_global_flag = modoption_tiantangzhizhan_on
+			has_global_flag = AZ_fengkuangAI_citiao_ex
+			date < 1936.1.3
+		}
+		available = {
+			is_ai = no
+			has_global_flag = modoption_tiantangzhizhan_on
+			has_global_flag = AZ_fengkuangAI_citiao_ex
+			date < 1936.1.3
+		}
+		fire_only_once = yes
+		complete_effect = {
+			set_global_flag = TY_fkAI_yourenjuedebugounan
+			custom_effect_tooltip = az_dianzhiqiankanqingchu_tips
+			effect_tooltip = {
+				every_other_country = {
+					limit = {
+						shijianniangguojia_trigger = yes
+						is_ai = yes
+					}
+					swap_ideas = {
+						remove_idea = TY_fkAI_zuizhonghetiex
+						add_idea = TY_fkAI_zuizhonghetiex_shuzhipengzhang
+					}
+				}
+			}
+		}
+	}
 	az_wanjialingqufkAIbuff = {
 		icon = generic_form_nation
 		visible = {
@@ -16216,6 +16247,7 @@ SAD_panbianzhe_jyz = {
 			factor = 100
 			modifier = {
 				is_historical_focus_on = yes
+				date < 1943.7.1
 				factor = 0
 			}
 		}

src/common/doctrines/subdoctrines/land/infantry_subdoctrines.txt

@@ -394,7 +394,7 @@ commandos_SAD = {
     }
     enable_tactic = tactic_infantry_charge
     category_light_infantry = {
-        max_strength = 0.2
+        max_strength = 5
     }
 
     # EFFECTS
@@ -424,6 +424,13 @@ commandos_SAD = {
                     defense = 0.2
                 }
             }
+            logistics_company = {
+                battalion_mult = {
+                 category = category_vehicle_infantry
+                 max_strength = 5
+                 add = yes
+                }
+            }
             category_vehicle_infantry = {
                 reliability = 0.1
                 breakthrough = 0.2

src/common/ideas/azurlane_generic.txt

@@ -660,6 +660,7 @@ ideas = {
 				sp_air_jet_engine_speed_factor = 0.3
 				land_bunker_effectiveness_factor = 0.5
 				coastal_bunker_effectiveness_factor = 0.5
+				training_time_army_factor = -0.2
 			} 
 		}
 		TY_fengkuangai2 = {
@@ -712,6 +713,7 @@ ideas = {
 				sp_air_jet_engine_speed_factor = 0.3
 				land_bunker_effectiveness_factor = 0.75
 				coastal_bunker_effectiveness_factor = 0.75
+				training_time_army_factor = -0.2
 			} 
 		}
 		TY_fengkuangai3 = {
@@ -764,6 +766,7 @@ ideas = {
 				sp_air_jet_engine_speed_factor = 0.3
 				land_bunker_effectiveness_factor = 1
 				coastal_bunker_effectiveness_factor = 1
+				training_time_army_factor = -0.2
 			} 
 		}
 		az_pt_1 = {

src/common/ideas/tianjiang.txt

@@ -848,24 +848,19 @@ ideas = {
 				NOT = { has_war_with = TIX }
 			}
 			modifier = {
-				army_strength_factor = 0.5
+				army_strength_factor = 0.1
 				army_org_factor = 0.5
 				army_morale_factor = 0.5
 				land_reinforce_rate = 0.25
 				army_core_attack_factor = 1
 				army_core_defence_factor = 2
 				planning_speed = -1
-				max_planning = -0.8
+				max_planning = -1
 			}
 			targeted_modifier = {
 				tag = TIX
-				attack_bonus_against = 1.2
-				defense_bonus_against = 2.5
-			}
-			targeted_modifier = {
-				tag = SAD
-				attack_bonus_against = 1.2
-				defense_bonus_against = 2.5
+				attack_bonus_against = 0.8
+				defense_bonus_against = 1
 			}
 		}
 		
@@ -2368,55 +2363,14 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				war_support_factor = 1
 				political_power_cost = -0.5
 				army_org_factor = 0.2
 				army_morale_factor = 0.3
 				org_loss_when_moving = -0.2
-				army_armor_attack_factor = 0.6
-				army_armor_defence_factor = 0.6
+				army_armor_attack_factor = 0.5
+				army_armor_defence_factor = 0.5
 				army_speed_factor = 0.1
 				ai_focus_aggressive_factor = 1
-				training_time_army_factor = -0.2
-			}
-			equipment_bonus = {
-				infantry_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					instant = yes
-				}
-				medium_tank_chassis = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-				mechanized_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-			}
-			targeted_modifier = {
-				tag = HUJ
-				attack_bonus_against = 0.6
-				defense_bonus_against = 0.6
-			}
-			targeted_modifier = {
-				tag = BYG
-				attack_bonus_against = 0.6
-				defense_bonus_against = 0.6
-			}
-			targeted_modifier = {
-				tag = YUW
-				attack_bonus_against = 0.8
-				defense_bonus_against = 0.8
-			}
-			targeted_modifier = {
-				tag = BFL
-				attack_bonus_against = 0.8
-				defense_bonus_against = 0.8
 			}
 		}
 		
@@ -2426,7 +2380,6 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				war_support_factor = 1
 				political_power_cost = -0.5
 				air_accidents = -0.4
 				air_weather_penalty = -0.4
@@ -2439,37 +2392,6 @@ ideas = {
 				air_night_penalty = -0.3
 				air_range_factor = 0.3
 				air_agility_factor = 0.3
-				training_time_army_factor = -0.1
-			}
-			equipment_bonus = {
-				infantry_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					instant = yes
-				}
-				light_tank_chassis = {
-					hard_attack = 0.2
-					soft_attack = 0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-				mechanized_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-			}
-			targeted_modifier = {
-				tag = HUJ
-				attack_bonus_against = 0.5
-				defense_bonus_against = 0.5
-			}
-			targeted_modifier = {
-				tag = YUW
-				attack_bonus_against = 0.5
-				defense_bonus_against = 0.5
 			}
 		}
 		
@@ -2479,7 +2401,6 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				war_support_factor = 1
 				political_power_gain = 0.5
 				army_attack_factor = 0.2
 				army_defence_factor = 0.2
@@ -2494,40 +2415,6 @@ ideas = {
 				naval_speed_factor = 0.2
 				navy_max_range_factor = 0.4
 				supply_consumption_factor = -0.2
-				training_time_army_factor = -0.1
-			}
-			equipment_bonus = {
-				infantry_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					instant = yes
-				}
-				medium_tank_chassis = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-			}
-			targeted_modifier = {
-				tag = DOH
-				attack_bonus_against = 2.5
-				defense_bonus_against = 2.5
-			}
-			targeted_modifier = {
-				tag = HUJ
-				attack_bonus_against = 0.5
-				defense_bonus_against = 0.5
-			}
-			targeted_modifier = {
-				tag = BYG
-				attack_bonus_against = 0.5
-				defense_bonus_against = 0.5
-			}
-			targeted_modifier = {
-				tag = BFL
-				attack_bonus_against = 0.6
-				defense_bonus_against = 0.6
 			}
 		}
 		
@@ -2537,7 +2424,6 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				war_support_factor = 1
 				attrition = -0.3
 				army_org_factor = 0.4
 				army_morale_factor = 0.5
@@ -2547,46 +2433,6 @@ ideas = {
 				land_reinforce_rate = 0.05
 				planning_speed = 1.2
 				max_planning = 0.8
-				training_time_army_factor = -0.2
-			}
-			equipment_bonus = {
-				infantry_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					instant = yes
-				}
-				medium_tank_chassis = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-				mechanized_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-			}
-			targeted_modifier = {
-				tag = TIX
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = BFL
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = SAD
-				attack_bonus_against = 0.4
-				defense_bonus_against = 0.4
-			}
-			targeted_modifier = {
-				tag = HUJ
-				attack_bonus_against = 0.4
-				defense_bonus_against = 0.4
 			}
 		}
 		
@@ -2596,7 +2442,6 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				war_support_factor = 1
 				air_accidents = -0.3
 				air_weather_penalty = -0.2
 				air_attack_factor = 0.2
@@ -2608,60 +2453,9 @@ ideas = {
 				air_night_penalty = -0.3
 				air_range_factor = 0.2
 				air_agility_factor = 0.2
-				industrial_capacity_dockyard = 1.5
-				navy_org = 20
+				industrial_capacity_dockyard = 1
 				navy_screen_attack_factor = 0.5
 				navy_screen_defence_factor = 0.5
-				navy_capital_ship_attack_factor = 0.3
-				training_time_army_factor = -0.1
-			}
-			targeted_modifier = {
-				tag = SAD
-				attack_bonus_against = 0.6
-				defense_bonus_against = 0.6
-			}
-			targeted_modifier = {
-				tag = TIX
-				attack_bonus_against = 0.6
-				defense_bonus_against = 0.6
-			}
-			targeted_modifier = {
-				tag = CHY
-				attack_bonus_against = 0.6
-				defense_bonus_against = 0.6
-			}
-			equipment_bonus = {
-				small_plane_airframe = {
-					build_cost_ic = -0.25 instant = yes
-				}
-				cv_small_plane_airframe = {
-					build_cost_ic = -0.25 instant = yes
-				}
-				small_plane_cas_airframe = {
-					instant = yes
-					build_cost_ic = -0.2 instant = yes
-				}
-				cv_small_plane_cas_airframe = {
-					instant = yes
-					build_cost_ic = -0.2 instant = yes
-				}
-				infantry_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					instant = yes
-				}
-				medium_tank_chassis = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-				mechanized_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
 			}
 		}
 		
@@ -2671,55 +2465,13 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				stability_factor = 0.6
-				war_support_factor = 1
 				political_power_cost = -0.8
 				line_change_production_efficiency_factor = 0.4
 				industrial_capacity_factory = 0.5
 				industrial_capacity_dockyard = 2.5
 				production_factory_max_efficiency_factor = 0.3
 				production_factory_efficiency_gain_factor = 2
-				training_time_army_factor = -0.2
-			}
-			equipment_bonus = {
-				infantry_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					instant = yes
-				}
-				medium_tank_chassis = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-				mechanized_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-			}
-			
-			targeted_modifier = {
-				tag = TIX
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = SAD
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = CHY
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = BFL
-				attack_bonus_against = 1
-				defense_bonus_against = 1
+				training_time_army_factor = -0.1
 			}
 		}
 		
@@ -2729,8 +2481,6 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				stability_factor = 0.6
-				war_support_factor = 1
 				political_power_cost = -0.8
 				production_factory_efficiency_gain_factor = 1
 				army_infantry_attack_factor = 0.6
@@ -2739,44 +2489,6 @@ ideas = {
 				army_org_factor = 0.2
 				army_morale_factor = 0.25
 			}
-			equipment_bonus = {
-				infantry_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					instant = yes
-				}
-				medium_tank_chassis = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-			}
-			targeted_modifier = {
-				tag = TIX
-				attack_bonus_against = 0.8
-				defense_bonus_against = 0.8
-			}
-			targeted_modifier = {
-				tag = CHY
-				attack_bonus_against = 0.8
-				defense_bonus_against = 0.8
-			}
-			targeted_modifier = {
-				tag = HUJ
-				attack_bonus_against = 0.8
-				defense_bonus_against = 0.8
-			}
-			targeted_modifier = {
-				tag = BYG
-				attack_bonus_against = 0.8
-				defense_bonus_against = 0.8
-			}
-			targeted_modifier = {
-				tag = YUW
-				attack_bonus_against = 0.8
-				defense_bonus_against = 0.8
-			}
 		}
 		
 		DOH_fkAIbuff = {
@@ -2790,24 +2502,7 @@ ideas = {
 				command_power_gain_mult = 1
 				army_core_attack_factor = 1
 				army_core_defence_factor = 1
-			}
-			equipment_bonus = {
-				infantry_equipment = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					instant = yes
-				}
-				medium_tank_chassis = {
-					build_cost_ic = -0.2
-					reliability = 0.15
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-			}
-			targeted_modifier = {
-				tag = CHY
-				attack_bonus_against = 1
-				defense_bonus_against = 1
+				training_time_army_factor = -0.1
 			}
 		}
 		
@@ -3612,9 +3307,9 @@ ideas = {
 			modifier = {
 				army_attack_factor = 3
 				army_defence_factor = 3
-				army_org_factor = 3
-				army_morale_factor = 3
-				army_strength_factor = 2
+				army_org_factor = 1
+				army_morale_factor = 1
+				army_strength_factor = 3
 			} 
 		}
 		
@@ -3626,9 +3321,9 @@ ideas = {
 			modifier = {
 				army_attack_factor = 10
 				army_defence_factor = 10
-				army_org_factor = 8
-				army_morale_factor = 5
-				army_strength_factor = 3
+				army_org_factor = 3
+				army_morale_factor = 3
+				army_strength_factor = 5
 			} 
 		}
 		
@@ -3638,35 +3333,12 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				war_support_factor = 1.5
-				political_power_cost = -1
 				army_org_factor = 0.4
 				army_morale_factor = 0.5
 				org_loss_when_moving = -0.4
-				army_armor_attack_factor = 1
-				army_armor_defence_factor = 1
+				army_armor_attack_factor = 0.6
+				army_armor_defence_factor = 0.6
 				army_speed_factor = 0.2
-				training_time_army_factor = -0.2
-			}
-			targeted_modifier = {
-				tag = HUJ
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = BYG
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = YUW
-				attack_bonus_against = 1.5
-				defense_bonus_against = 1.5
-			}
-			targeted_modifier = {
-				tag = BFL
-				attack_bonus_against = 1.5
-				defense_bonus_against = 1.5
 			}
 		}
 		
@@ -3676,35 +3348,17 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				war_support_factor = 1.5
-				political_power_cost = -0.75
-				air_accidents = -0.6
-				air_weather_penalty = -0.6
-				air_attack_factor = 0.6
-				air_ace_generation_chance_factor = 0.75
-				air_mission_efficiency = 0.6 
-				air_superiority_efficiency = 0.6
-				air_intercept_efficiency = 0.6
-				air_cas_efficiency = 0.8
-				air_night_penalty = -0.6
-				air_range_factor = 0.6
-				air_agility_factor = 0.6
-				training_time_army_factor = -0.2
-			}
-			targeted_modifier = {
-				tag = HUJ
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = YUW
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = BYG
-				attack_bonus_against = 1
-				defense_bonus_against = 1
+				air_accidents = -0.5
+				air_weather_penalty = -0.5
+				air_attack_factor = 0.4
+				air_ace_generation_chance_factor = 0.5
+				air_mission_efficiency = 0.4
+				air_superiority_efficiency = 0.4
+				air_intercept_efficiency = 0.4
+				air_cas_efficiency = 0.5
+				air_night_penalty = -0.5
+				air_range_factor = 0.4
+				air_agility_factor = 0.4
 			}
 		}
 		
@@ -3714,42 +3368,19 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				war_support_factor = 1.5
-				political_power_gain = 0.75
-				army_attack_factor = 0.5
-				army_defence_factor = 0.5
-				army_morale_factor = 1
-				navy_screen_attack_factor = 1
-				navy_screen_defence_factor = 1
-				navy_capital_ship_attack_factor = 1
-				navy_capital_ship_defence_factor = 1
+				army_attack_factor = 0.3
+				army_defence_factor = 0.3
+				army_morale_factor = 0.75
+				navy_screen_attack_factor = 0.5
+				navy_screen_defence_factor = 0.5
+				navy_capital_ship_attack_factor = 0.5
+				navy_capital_ship_defence_factor = 0.5
 				carrier_capacity_penalty_reduction = -0.5
-				naval_strike_attack_factor = 0.3
-				naval_strike_targetting_factor = 0.3
-				naval_speed_factor = 0.4
-				navy_max_range_factor = 0.8
-				supply_consumption_factor = -0.3
-				training_time_army_factor = -0.2
-			}
-			targeted_modifier = {
-				tag = DOH
-				attack_bonus_against = 3
-				defense_bonus_against = 3
-			}
-			targeted_modifier = {
-				tag = HUJ
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = BYG
-				attack_bonus_against = 1
-				defense_bonus_against =1
-			}
-			targeted_modifier = {
-				tag = BFL
-				attack_bonus_against = 1
-				defense_bonus_against = 1
+				naval_strike_attack_factor = 0.2
+				naval_strike_targetting_factor = 0.2
+				naval_speed_factor = 0.2
+				navy_max_range_factor = 0.5
+				supply_consumption_factor = -0.25
 			}
 		}
 		
@@ -3759,37 +3390,15 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				war_support_factor = 1.5
-				attrition = -0.5
-				army_org_factor = 1
-				army_morale_factor = 1
-				org_loss_when_moving = -0.4
-				breakthrough_factor = 0.4
-				recon_factor = 1
-				land_reinforce_rate = 0.1
-				planning_speed = 2.5
-				max_planning = 1.5
-				training_time_army_factor = -0.2
-			}
-			targeted_modifier = {
-				tag = TIX
-				attack_bonus_against = 1.5
-				defense_bonus_against = 1.5
-			}
-			targeted_modifier = {
-				tag = BFL
-				attack_bonus_against = 1.5
-				defense_bonus_against = 1.5
-			}
-			targeted_modifier = {
-				tag = SAD
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = HUJ
-				attack_bonus_against = 1
-				defense_bonus_against = 1
+				attrition = -0.2
+				army_org_factor = 0.5
+				army_morale_factor = 0.5
+				org_loss_when_moving = -0.25
+				breakthrough_factor = 0.2
+				recon_factor = 0.5
+				land_reinforce_rate = 0.06
+				planning_speed = 1.5
+				max_planning = 1
 			}
 		}
 		
@@ -3799,39 +3408,21 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				war_support_factor = 1.5
-				air_accidents = -0.5
-				air_weather_penalty = -0.4
-				air_attack_factor = 0.5
-				air_ace_generation_chance_factor = 0.6
-				air_mission_efficiency = 0.5 
-				air_superiority_efficiency = 0.4
-				air_intercept_efficiency = 0.4
-				air_cas_efficiency = 1
-				air_night_penalty = -0.5
-				air_range_factor = 0.5
-				air_agility_factor = 0.5
-				industrial_capacity_dockyard = 4
-				navy_org = 40
-				navy_screen_attack_factor = 1
-				navy_screen_defence_factor = 1
-				navy_capital_ship_attack_factor = 0.8
-				training_time_army_factor = -0.2
-			}
-			targeted_modifier = {
-				tag = SAD
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = TIX
-				attack_bonus_against = 1
-				defense_bonus_against = 1
-			}
-			targeted_modifier = {
-				tag = CHY
-				attack_bonus_against = 1
-				defense_bonus_against = 1
+				air_accidents = -0.3
+				air_weather_penalty = -0.2
+				air_attack_factor = 0.3
+				air_ace_generation_chance_factor = 0.4
+				air_mission_efficiency = 0.3
+				air_superiority_efficiency = 0.3
+				air_intercept_efficiency = 0.3
+				air_cas_efficiency = 0.5
+				air_night_penalty = -0.3
+				air_range_factor = 0.3
+				air_agility_factor = 0.3
+				industrial_capacity_dockyard = 1
+				navy_screen_attack_factor = 0.5
+				navy_screen_defence_factor = 0.5
+				navy_capital_ship_attack_factor = 0.1
 			}
 		}
 		
@@ -3841,34 +3432,11 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				stability_factor = 1.25
 				line_change_production_efficiency_factor = 0.4
-				industrial_capacity_factory = 1
+				industrial_capacity_factory = 0.8
 				industrial_capacity_dockyard = 2
-				production_factory_max_efficiency_factor = 0.5
+				production_factory_max_efficiency_factor = 0.4
 				production_factory_efficiency_gain_factor = 2
-				training_time_army_factor = -0.2
-			}
-			
-			targeted_modifier = {
-				tag = TIX
-				attack_bonus_against = 2
-				defense_bonus_against = 2
-			}
-			targeted_modifier = {
-				tag = SAD
-				attack_bonus_against = 2
-				defense_bonus_against = 2
-			}
-			targeted_modifier = {
-				tag = CHY
-				attack_bonus_against = 2
-				defense_bonus_against = 2
-			}
-			targeted_modifier = {
-				tag = BFL
-				attack_bonus_against = 2
-				defense_bonus_against = 2
 			}
 		}
 		
@@ -3878,50 +3446,12 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				stability_factor = 1
-				war_support_factor = 1.5
-				political_power_cost = -1
-				production_factory_efficiency_gain_factor = 2
-				army_infantry_attack_factor = 2
-				army_infantry_defence_factor = 2
-				land_reinforce_rate = 0.2
-				army_org_factor = 0.5
-				army_morale_factor = 0.5
-			}
-			equipment_bonus = {
-				infantry_equipment = {
-					build_cost_ic = -0.15
-					instant = yes
-				}
-				medium_tank_chassis = {
-					fuel_consumption_factor = -0.25
-					instant = yes
-				}
-			}
-			targeted_modifier = {
-				tag = TIX
-				attack_bonus_against = 2
-				defense_bonus_against = 2
-			}
-			targeted_modifier = {
-				tag = CHY
-				attack_bonus_against = 1.5
-				defense_bonus_against = 1.5
-			}
-			targeted_modifier = {
-				tag = HUJ
-				attack_bonus_against = 1.5
-				defense_bonus_against = 1.5
-			}
-			targeted_modifier = {
-				tag = BYG
-				attack_bonus_against = 2
-				defense_bonus_against = 2
-			}
-			targeted_modifier = {
-				tag = YUW
-				attack_bonus_against = 2
-				defense_bonus_against = 2
+				production_factory_efficiency_gain_factor = 1
+				army_infantry_attack_factor = 0.8
+				army_infantry_defence_factor = 0.8
+				land_reinforce_rate = 0.1
+				army_org_factor = 0.3
+				army_morale_factor = 0.3
 			}
 		}
 		
@@ -3931,28 +3461,23 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				war_support_factor = 1.5
-				land_reinforce_rate = 0.5
-				command_power_gain_mult = 2
-				army_core_attack_factor = 2
-				army_core_defence_factor = 2
+				war_support_factor = 1
+				land_reinforce_rate = 0.2
+				command_power_gain_mult = 0.25
+				army_core_attack_factor = 1
+				army_core_defence_factor = 1
 			}
 			equipment_bonus = {
 				modern_tank_chassis = {
-					build_cost_ic = -0.3
-					armor_value = 0.4
+					build_cost_ic = -0.1
+					armor_value = 0.2
 					soft_attack = 0.3
 					hard_attack = 0.3
 					ap_attack = 0.3
-					reliability_factor = 0.2
+					reliability_factor = 0.15
 					instant = yes
 				}
 			}
-			targeted_modifier = {
-				tag = CHY
-				attack_bonus_against = 2
-				defense_bonus_against = 2
-			}
 		}
 		
 		TY_fkAI_wanjiagangtiezhiqu = {
@@ -3961,9 +3486,9 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				army_org_factor = 4
-				army_morale_factor = 3
-				army_strength_factor = 3
+				army_org_factor = 1
+				army_morale_factor = 1
+				army_strength_factor = 1
 			} 
 		}
 		
@@ -3973,7 +3498,7 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				army_strength_factor = 2
+				army_strength_factor = 1
 			} 
 		}
 		
@@ -4053,14 +3578,14 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				army_attack_factor = 5
-				army_defence_factor = 5
-				army_attack_against_major_factor = 1
-				army_defence_against_major_factor = 1
-				army_breakthrough_against_major_factor = 1
-				army_attack_against_minor_factor = 1
-				army_defence_against_minor_factor = 1
-				army_breakthrough_against_minor_factor = 1
+				army_attack_factor = 1
+				army_defence_factor = 1
+				army_attack_against_major_factor = 0.1
+				army_defence_against_major_factor = 0.1
+				army_breakthrough_against_major_factor = 0.1
+				army_attack_against_minor_factor = 0.3
+				army_defence_against_minor_factor = 0.3
+				army_breakthrough_against_minor_factor = 0.3
 			} 
 		}
 		
@@ -4080,7 +3605,7 @@ ideas = {
 			modifier = {
 				army_attack_against_major_factor = -0.5
 				army_breakthrough_against_major_factor = -1
-				army_org_factor = -1
+				army_org_factor = -0.75
 				training_time_army_factor = 1
 			} 
 			on_remove = {
@@ -4110,7 +3635,59 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				army_strength_factor = 4
+				army_strength_factor = 2
+				army_org_factor = 2
+				army_morale_factor = 2
+				planning_speed = 10
+				production_factory_start_efficiency_factor = 1
+				line_change_production_efficiency_factor = 1
+				max_command_power = 500
+				command_power_gain = 5
+				grant_medal_cost_factor = -1
+				crypto_strength = 10
+				intelligence_agency_defense = 10
+				enemy_operative_capture_chance_factor = 0.3
+				enemy_operative_detection_chance = 20
+				enemy_operative_forced_into_hiding_time_factor = 0.3
+				#terrain_penalty_reduction = 1
+				industrial_capacity_dockyard = 20
+				positioning = 2
+				army_attack_factor = 2
+				army_defence_factor = 2
+				army_attack_against_major_factor = 0.2
+				army_defence_against_major_factor = 0.2
+				army_breakthrough_against_major_factor = 0.2
+				army_attack_against_minor_factor = 0.3
+				army_defence_against_minor_factor = 0.3
+				army_breakthrough_against_minor_factor = 0.3
+			}
+			equipment_bonus = {
+				ship_hull_cruiser = {
+					build_cost_ic = -0.25
+					instant = yes
+				}
+				ship_hull_light = {
+					build_cost_ic = -0.25
+					instant = yes
+				}
+				ship_hull_carrier = {
+					build_cost_ic = -0.25
+					instant = yes
+				}
+				ship_hull_heavy = {
+					build_cost_ic = -0.25
+					instant = yes
+				}
+			}
+		}
+
+		TY_fkAI_zuizhonghetiex_shuzhipengzhang = {
+			picture = fengkuangai
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				army_strength_factor = 5
 				army_org_factor = 5
 				army_morale_factor = 5
 				planning_speed = 10
@@ -4132,9 +3709,9 @@ ideas = {
 				army_attack_against_major_factor = 1
 				army_defence_against_major_factor = 1
 				army_breakthrough_against_major_factor = 1
-				army_attack_against_minor_factor = 1
-				army_defence_against_minor_factor = 1
-				army_breakthrough_against_minor_factor = 1
+				army_attack_against_minor_factor = 3
+				army_defence_against_minor_factor = 3
+				army_breakthrough_against_minor_factor = 3
 			}
 			equipment_bonus = {
 				ship_hull_cruiser = {
@@ -4183,8 +3760,8 @@ ideas = {
 				always = yes
 			}
 			modifier = {
-				army_attack_factor = 0.8
-				army_defence_factor = 0.8
+				army_attack_factor = 1
+				army_defence_factor = 1
 				planning_speed = 2
 				max_planning = 1
 				line_change_production_efficiency_factor = 0.4
@@ -4192,7 +3769,7 @@ ideas = {
 				industrial_capacity_dockyard = 0.8
 				production_factory_max_efficiency_factor = 0.4
 				production_factory_efficiency_gain_factor = 0.8
-				army_org_factor = 0.6
+				army_org_factor = 0.8
 				army_morale_factor = 0.5
 			} 
 		}

src/common/national_focus/chongying_new.txt

@@ -1917,6 +1917,9 @@
 		ai_will_do = {
 			factor = 40
 		}
+		available = {
+			is_puppet = no
+		}
 		cancel_if_invalid = yes
 		continue_if_invalid = no
 		available_if_capitulated = no
@@ -1937,6 +1940,7 @@
 			focus = CHY_changmen1
 		}
 		available = {
+			is_puppet = no
 			has_country_flag = chy_shangwu
 		}
 		x = 5
@@ -2346,6 +2350,9 @@
 		x = 0
 		y = 1
 		cost = 4
+		available = {
+			is_puppet = no
+		}
 		ai_will_do = {
 			factor = 35
 		}
@@ -3824,6 +3831,7 @@
 			focus = CHY_chichen1
 		}
 		available = {
+			is_puppet = no
 			has_country_leader = {
 				ruling_only = yes
 				character = CHY_changmen

src/common/national_focus/donghuang_new.txt

@@ -6514,25 +6514,25 @@ focus_tree = {
 					}
 					load_oob = "DOH_haianfangshou_ai"
 				}
-				if = {
-					limit = {
-						is_ai = yes
-						OR = {
-							has_global_flag = AZ_fengkuangAI_citiao_10
-							has_global_flag = AZ_fengkuangAI_citiao_ex
-						}
-					}
-					load_oob = "DOH_haianfangshou_fengkuangai"
-					set_technology = {
-						tech_engineers = 1
-					}
-					set_technology = {
-						tech_field_hospital = 1
-					}
-					set_technology = {
-						basic_light_tank_chassis = 1
-					}
-				}
+				#if = {
+				#	limit = {
+				#		is_ai = yes
+				#		OR = {
+				#			has_global_flag = AZ_fengkuangAI_citiao_10
+				#			has_global_flag = AZ_fengkuangAI_citiao_ex
+				#		}
+				#	}
+				#	load_oob = "DOH_haianfangshou_fengkuangai"
+				#	set_technology = {
+				#		tech_engineers = 1
+				#	}
+				#	set_technology = {
+				#		tech_field_hospital = 1
+				#	}
+				#	set_technology = {
+				#		basic_light_tank_chassis = 1
+				#	}
+				#}
 			}
 		}
 	}

src/common/national_focus/tiexue.txt

@@ -4842,6 +4842,12 @@ focus_tree = {
 				YUG = {
 					is_subject_of = SAD
 				}
+				SAD = {
+					OR = {
+						has_government = communism
+						has_government = democratic
+					}
+				}
 			}
 		}
 		completion_reward = {