2026-01-08 04:02:10

2026-01-08 04:02:10 +00:00
parent b620b50e43
commit 6b25074574
17 changed files with 6141 additions and 572 deletions
--- a/src/common/decisions/DOH_decision.txt
+++ b/src/common/decisions/DOH_decision.txt
@@ -231,18 +231,18 @@ DOH_decision_category = {
 				409 = {
 					set_state_name = DOH_boli_name
 				}
-				set_victory_points = {
-					province = 957					# 符拉迪沃斯托克/海参崴
-					value = 20
-				}
-				set_victory_points = {
-					province = 12189					# 哈巴罗夫斯克/伯力
-					value = 20
-				}
-				set_victory_points = {
-					province = 4705					# 赤塔/尼布楚
-					value = 10
-				}
+				# set_victory_points = {
+				# 	province = 957					# 符拉迪沃斯托克/海参崴
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 12189					# 哈巴罗夫斯克/伯力
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 4705					# 赤塔/尼布楚
+				# 	value = 10
+				# }
 			}
 		}
 	}
@@ -273,14 +273,14 @@ DOH_decision_category = {
 				name = DOH_wuliyasutai_name
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 10627					# 克孜勒/乌里雅苏台
-					value = 10
-				}
-				set_victory_points = {
-					province = 4801					# 乌兰巴托
-					value = 15
-				}
+				# set_victory_points = {
+				# 	province = 10627					# 克孜勒/乌里雅苏台
+				# 	value = 10
+				# }
+				# set_victory_points = {
+				# 	province = 4801					# 乌兰巴托
+				# 	value = 15
+				# }
 			}
 		}
 	}
@@ -318,14 +318,14 @@ DOH_decision_category = {
 				set_state_category = large_city
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 10062					# 香港
-					value = 20
-				}
-				set_victory_points = {
-					province = 4189					# 澳门
-					value = 10
-				}
+				# set_victory_points = {
+				# 	province = 10062					# 香港
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 4189					# 澳门
+				# 	value = 10
+				# }
 			}
 		}
 	}
@@ -362,14 +362,14 @@ DOH_decision_category = {
 				add_core_of = DOH
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 4052					# 平壤
-					value = 15
-				}
-				set_victory_points = {
-					province = 7125					# 汉城
-					value = 20
-				}
+				# set_victory_points = {
+				# 	province = 4052					# 平壤
+				# 	value = 15
+				# }
+				# set_victory_points = {
+				# 	province = 7125					# 汉城
+				# 	value = 20
+				# }
 			}
 		}
 	}
@@ -1758,9 +1758,35 @@ DOH_decision_debug_category = {
 					target = YUN
 				}
 				annex_country = {
-					target = GXC
+					target = KHM
+				}
+				annex_country = {
+					target = NXM
+				}
+				annex_country = {
+					target = GSM
+				}
+				annex_country = {
+					target = XIC
+				}
+				annex_country = {
+					target = SIC
+				}
+				annex_country = {
+					target = HBC
+				}
+				annex_country = {
+					target = SND
+				}
+				annex_country = {
+					target = GDC
 				}
 				transfer_state = 609
+				transfer_state = 1043
+				transfer_state = 1028
+				transfer_state = 1029
+				transfer_state = 1030
+				transfer_state = 1031
 				transfer_state = 611
 				transfer_state = 610
 				transfer_state = 612
--- a/src/common/ideas/doh.txt
+++ b/src/common/ideas/doh.txt
@@ -1619,7 +1619,7 @@ ideas = {
 		
 		designer = yes
 		
-		CHI_taiyuan_arsenal = {
+		DOH_taiyuan_arsenal = {
 			picture = generic_artillery_manufacturer_1

 			
@@ -1642,7 +1642,7 @@ ideas = {
 			
 		}

-		CHI_liaoning_arsenal = {
+		DOH_liaoning_arsenal = {
 			picture = generic_motorized_equipment_manufacturer_1
 			
 			allowed = {
@@ -1664,7 +1664,7 @@ ideas = {
 			
 		}

-		CHI_hanyan_arsenal = {
+		DOH_hanyan_arsenal = {
 			picture = generic_infantry_equipment_manufacturer_1

 			
@@ -1686,7 +1686,7 @@ ideas = {
 			traits = { infantry_equipment_manufacturer }
 			
 		}
-		CHI_mukden_arsenal = {
+		DOH_mukden_arsenal = {
 			picture = generic_infantry_equipment_manufacturer_2

 			
@@ -1744,7 +1744,7 @@ ideas = {
 			
 		designer = yes		

-		CHI_camco_3 = {
+		DOH_camco_3 = {

 			picture = CHI_camco

@@ -1772,24 +1772,364 @@ ideas = {

 	}
 	industrial_concern = {
-	
-		CHI_mining_commission = {
-
-			picture = generic_industrial_concern_3		
+		#  PRC_peoples_bank_of_china: "[ROOT.GetName]人民银行"
+		#  PRC_publicity_department_of_central_committee: "中国共产党中央委员会宣传部"
+		#  PRC_sinochem: "中化集团"
+		#  PRC_nanjing_wireless_electronics_plant: "南京无线电厂"
+		#  PRC_china_state_construction_engineering_corporation: "中国建筑工程总局"
+		#  PRC_china_state_construction_engineering_corporation_civ_improved: "$PRC_china_state_construction_engineering_corporation$"
+		#  PRC_china_state_construction_engineering_corporation_mil_improved: "$PRC_china_state_construction_engineering_corporation$"
+		#  PRC_china_railway_construction_corporation: "中国铁道建筑总公司"
+		#  PRC_china_national_nuclear_corporation: "中国核工业总公司"
+		DOH_peoples_bank_of_china = {
+			# 中国人民银行
+			picture = PRC_peoples_bank_of_china

 			allowed = {
-				tag = DOH
+				always = yes
 			}

-			cost = 150
+			available = {
+				has_completed_focus = DOH_renminwansui
+			}
+
+			visible = {
+				always = yes
+			}
+
+			ai_will_do = {
+				base = 1
+			}
+
+			traits = { central_bank } 
+
+			modifier = {
+				consumer_goods_factor = -0.1
+			}
+		}
+
+		DOH_publicity_department_of_central_committee = {
+			# 宣传部
+			picture = PRC_publicity_department_of_central_committee 
+
+			allowed = {
+				always = yes
+			}
+
+			visible = {
+				always = yes
+			}
+
+			ai_will_do = {
+				base = 10
+			}
+
+			traits = { PRC_magazine }
+
+			modifier = {
+				political_power_gain = 0.25
+				stability_factor = 0.05
+			}
+		}
+
+		DOH_sinochem = {
+			# 中国化工集团
+			picture = PRC_sinochem
+
+			allowed = {
+				always = yes
+			}
+
+			visible = {
+				always = yes
+			}
+
+			available = {
+				OR = {
+			 		DOH = {
+		 				controls_state = 608
+		 			}
+		 		}
+			}
+
+			research_bonus = { synth_resources = 0.15 }
+
+			traits = {
+				refinery_concern
+			}
+
+			modifier = {
+				country_resource_oil = 10
+			}
+		}
+
+		DOH_china_state_construction_engineering_corporation = {
+			# 中国建筑工程总局
+			picture = PRC_china_state_construction_engineering_corporation
+
+			allowed = {
+				always = yes
+			}
+
+			visible = {
+				always = yes
+			}
+
+			ai_will_do = {
+				base = 1
+			}
+
+			traits = { construction_company }
+
+			research_bonus = { construction_tech = 0.15 }
+
+			modifier = {
+				production_speed_industrial_complex_factor = 0.075
+				production_speed_arms_factory_factor = 0.075
+			}
+		}
+
+		DOH_china_railway_construction_corporation = {
+			# 中国铁道建筑总公司
+			picture = PRC_china_railway_construction_corporation 
+
+			allowed = {
+				always = yes
+			}
+
+			visible = {
+				always = yes
+			}
+
+			ai_will_do = {
+				base = 1
+			}
+
+			traits = { railway_company }
+		}
+
+		DOH_china_national_nuclear_corporation = {
+			# 中国核工业总公司
+			picture = PRC_china_national_nuclear_corporation
+
+			allowed = {
+				always = yes
+			}
+
+			visible = {
+				always = yes
+			}
+
+			available = {
+				has_completed_focus = DOH_liangdanyixing
+			}
+
+			ai_will_do = {
+				base = 1
+			}
+
+			traits = { PRC_nuclear_company }
+
+			modifier = {
+				specialization_nuclear_speed_factor = 0.1
+				sp_tag_nuclear_power_speed_factor = 0.15
+				production_speed_nuclear_reactor_factor = 0.1
+
+			}
+		}
+
+	#  CHI_national_resource_commission: "全国资源委员会"
+	#  CHI_national_resource_commission_desc: "$CHI_mining_commission_desc$"
+	#  CHI_china_national_aviation_corporation: "中国航空公司"
+	#  CHI_china_merchant_group: "招商局集团"
+	#  CHI_shanghai_power_company: "上海电力公司"
+	#  CHI_bank_of_china: "中国银行"
+	#  CHI_yongli_chemical_industries: "永利化学工业"
+
+		DOH_showa_steel_works = {
+			# 鞍山炼钢厂
+			picture = JAP_japan_steel_works			
+			
+			available = {
+				controls_state = 716
+			}
+
+			allowed = {
+				always = yes
+			}
+
+			visible = { NOT	= { has_completed_focus = MAN_tsr_mangyo } }
+
+			research_bonus = {
+				industry = 0.15
+			}
+
+			traits = {
+				industrial_steel_mills_trait
+			}
 			
 			ai_will_do = {
 				factor = 1
 			}
+		}
+
+		DOH_western_refinery = {
+			# 西制油厂
+			picture = generic_refining_concern_1
+
+			available = {
+				controls_state = 716
+			}
+
+			allowed = { ## If have SEA, then all China except PRC has it. Else all have it (because SEA PRC has Sinochem)
+				always = yes
+			}
+			
+			research_bonus = {
+				industry = 0.1
+				synth_resources = 0.15
+			}
+			
+			traits = { refinery_concern }
+			
+			# assembled hawk II and hawk III fighter bombers as well as the Vultee V-11 ground attackers
+						
+			ai_will_do = {
+				factor = 1
+			}
+
+		}
+
+		DOH_nanjing_wireless_electronics_plant = {
+			# 南京无线电厂
+			picture = PRC_nanjing_wireless_electronics_plant 
+
+			allowed = {
+				has_completed_focus = DOH_wuxiandianjishu
+			}
+
+			visible = {
+				always = yes
+			}
+
+			available = {
+				controls_state = 1035
+			}
+
+
+			traits = { electronics_concern }
+
+			research_bonus = {
+				electronics = 0.15
+			}

 			modifier = {
-				local_resources_factor = 0.1
+				
 			}
+
+		}
+
+		DOH_china_national_aviation_corporation = {
+			# 中国航空公司
+			picture = CHI_china_national_aviation_corporation
+			
+			allowed = {
+				has_completed_focus = DOH_tieyuan
+			}
+						
+			research_bonus = {
+				air_equipment = 0.05
+			}
+
+			ai_will_do = {
+				base = 1
+			}
+			
+			traits = { civilian_airway_company }
+		}
+
+		DOH_china_merchant_group = {
+			# 招商局集团
+			picture = CHI_china_merchant_group
+			
+			allowed = {
+				has_completed_focus = DOH_heqishengcai
+			}
+						
+			research_bonus = {
+			}
+
+			ai_will_do = {
+				base = 1
+			}
+			
+			traits = { transport_company }
+		}
+
+		DOH_shanghai_power_company = {
+			# 上海电力公司
+			picture = CHI_shanghai_power_company
+			
+			allowed = {
+				always = yes
+			}
+			available = {
+				controls_state = 613
+			}
+						
+			research_bonus = {
+			}
+
+			modifier = {
+				country_resource_coal = 18
+			}
+
+			ai_will_do = {
+				base = 1
+			}
+			
+			traits = { energy_supply_company }
+		}
+
+		DOH_bank_of_china = {
+			# 中国银行						
+			picture = CHI_bank_of_china
+			
+			allowed = {
+				always = yes
+			}
+			available = {
+				always = yes
+			}
+
+			ai_will_do = {
+				base = 3
+			}
+			
+			traits = { monopolistic_bank }
+		}
+
+		DOH_yongli_chemical_industries = {
+			# 永利化学工业
+			picture = CHI_yongli_chemical_industries
+			
+			allowed = {
+				always = yes
+			}
+			available = {
+				always = yes
+			}
+						
+			research_bonus = {
+				industry = 0.05
+				synth_resources = 0.15
+			}
+
+			ai_will_do = {
+				base = 1
+			}
+			
+			traits = { refinery_concern }
 		}
 	}
 }
--- a/src/common/military_industrial_organization/organizations/BFL_organization.txt
+++ b/src/common/military_industrial_organization/organizations/BFL_organization.txt
--- a/src/common/military_industrial_organization/organizations/BLI_organization.txt
+++ b/src/common/military_industrial_organization/organizations/BLI_organization.txt
@@ -57,7 +57,7 @@ BLI_carrier_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -91,7 +91,7 @@ BLI_carrier_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -133,7 +133,7 @@ BLI_BB_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -167,7 +167,7 @@ BLI_BB_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -209,7 +209,7 @@ BLI_SL_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -243,7 +243,7 @@ BLI_SL_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -285,7 +285,7 @@ BLI_SM_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -319,7 +319,7 @@ BLI_SM_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
--- a/src/common/military_industrial_organization/organizations/BYG_organization.txt
+++ b/src/common/military_industrial_organization/organizations/BYG_organization.txt
@@ -21,6 +21,7 @@ BYG_marmon_herrington_organization = {
 	allowed = {	
 		tag = BYG 
 	}
+	
 }

 BYG_chrysler_organization = {
@@ -36,12 +37,16 @@ BYG_chrysler_organization = {

 		limit_to_equipment_type = { mio_cat_eq_all_medium_tank }

-		equipment_bonus = {
-			reliability = 0.1
-			soft_attack = 0.02
-			hard_attack = 0.03
-			defense = -0.15
-		}
+			equipment_bonus = {
+				reliability = 0.1
+			    soft_attack = 0.1
+			    hard_attack = 0.1
+			    defense = -0.15
+			}
+			production_bonus = {
+				production_cost_factor = 0.1
+			}
+		
 	}

 	add_trait = { 
@@ -85,7 +90,14 @@ BYG_army_ordnance_department_organization = {
 	allowed = {	
 		tag = BYG
 	}
-
+	
+	initial_trait = {
+		production_bonus = {
+			production_capacity_factor = 0.05
+			production_cost_factor = -0.1
+		}
+	}
+	
 	add_trait = { 
 		token = BYG_mio_trait_periscope_sights
 		name = BYG_mio_trait_periscope_sights
@@ -126,11 +138,36 @@ BYG_detroit_arsenal_organization = {
 	allowed = {	
 		tag = BYG
 	}
+	
+	initial_trait = {
+        equipment_bonus = {
+			armor_value = -0.05
+			defense =-0.05
+			build_cost_ic = -0.02
+		}
+		production_bonus = {
+			production_capacity_factor = 0.1
+		}
+	}

+	add_trait = { 
+		token = BYG_mio_trait_arsenal_of_democracy
+		name = BYG_mio_trait_arsenal_of_democracy
+		icon = GFX_generic_mio_department_icon_tank_medium_tank_line_efficiency
+		special_trait_background = yes
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_standardized_components
+
+		all_parents = { generic_mio_trait_standardized_components }
+		production_bonus = {
+			production_efficiency_cap_factor = 0.1
+		}
+	}
+	
 	add_trait = { 
 		token = BYG_armor_up
 		name = BYG_armor_up
-		#icon = GFX_generic_mio_department_icon_facilities
 		icon = GFX_generic_mio_department_icon_tank_medium_tank_line_efficiency
 		special_trait_background = yes

@@ -213,7 +250,7 @@ BYG_norfolk_naval_yard_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -247,7 +284,7 @@ BYG_norfolk_naval_yard_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -272,6 +309,36 @@ BYG_norfolk_naval_yard_organization = {
 			}
 		}
 	}
+
+	add_trait = { 
+		token = BYG_mio_trait_shipyard_expansion
+		name = BYG_mio_trait_shipyard_expansion
+		icon = GFX_generic_mio_trait_icon_production_capacity
+		special_trait_background = yes
+
+		position = { x=2 y=0 }
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	add_trait = { 
+		token = BYG_mio_trait_naval_station_norfolk
+		name = BYG_mio_trait_naval_station_norfolk
+		icon = GFX_generic_mio_trait_icon_naval_range
+		special_trait_background = yes
+
+		all_parents = { BYG_mio_trait_shipyard_expansion }
+
+		position = { x=0 y=1 }
+		relative_position_id = BYG_mio_trait_shipyard_expansion
+
+		equipment_bonus = {
+			reliability = 0.1
+			naval_range = 0.1
+		}
+	}
 }

 BYG_electric_boat_company_organization = {
@@ -289,7 +356,7 @@ BYG_electric_boat_company_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -323,7 +390,7 @@ BYG_electric_boat_company_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -348,6 +415,45 @@ BYG_electric_boat_company_organization = {
 			}
 		}
 	}
+
+	add_trait = { 
+		token = BYG_mio_trait_gould_centrifugal_pump
+		name = BYG_mio_trait_gould_centrifugal_pump
+		icon = GFX_generic_mio_trait_icon_sub_visibility
+		special_trait_background = yes
+
+		any_parent = { generic_mio_trait_efficient_fuel_engines generic_mio_trait_high_powered_engines }
+
+		position = { x=-1 y=1 }
+		relative_position_id = generic_mio_trait_efficient_fuel_engines
+
+		equipment_bonus = {
+			sub_visibility = -0.03
+		}
+	}
+
+	add_trait = { 
+		token = BYG_mio_trait_radar_experimentation
+		name = BYG_mio_trait_radar_experimentation
+		icon = GFX_generic_mio_trait_icon_surface_detection
+		special_trait_background = yes
+
+		all_parents = { generic_mio_trait_experimental_anechoic_tiles generic_mio_trait_improved_torpedo_detonators }
+
+		available = {
+			FROM = {
+				has_tech = centimetric_radar
+			}
+		}
+
+		position = { x=0 y=1 }
+		relative_position_id = generic_mio_trait_experimental_anechoic_tiles
+
+		equipment_bonus = {
+			sub_visibility = -0.03
+			surface_detection = 0.03
+		}
+	}
 }

 BYG_brooklyn_naval_yard_organization = {
@@ -365,7 +471,7 @@ BYG_brooklyn_naval_yard_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -399,7 +505,7 @@ BYG_brooklyn_naval_yard_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -424,6 +530,41 @@ BYG_brooklyn_naval_yard_organization = {
 			}
 		}
 	}
+
+	add_trait = { 
+		token = BYG_mio_trait_the_can_do_shipyard
+		name = BYG_mio_trait_the_can_do_shipyard
+		icon = GFX_generic_mio_trait_icon_production_capacity
+		special_trait_background = yes
+
+		#all_parents = {   }
+
+		position = { x=3 y=0 }
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
+
+	add_trait = { 
+		token = BYG_mio_trait_drydock_expansion
+		name = BYG_mio_trait_drydock_expansion
+		icon = GFX_generic_mio_department_icon_ship_capital_ship_production
+		special_trait_background = yes
+
+		limit_to_equipment_type = {
+			capital_ship
+		}
+
+		all_parents = { BYG_mio_trait_the_can_do_shipyard }
+
+		position = { x=0 y=1 }
+		relative_position_id = BYG_mio_trait_the_can_do_shipyard
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
 }

 BYG_newport_news_shipbuilding_organization = {
@@ -432,6 +573,37 @@ BYG_newport_news_shipbuilding_organization = {
 	allowed = {	
 		tag = BYG 
 	}
+
+	initial_trait = {
+		
+		limit_to_equipment_type = { 
+			carrier
+		}
+		
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+
+	}
+
+	add_trait = { 
+		token = BYG_mio_trait_north_carolina_shipbuilding_company
+		name = BYG_mio_trait_north_carolina_shipbuilding_company
+		icon = GFX_generic_mio_department_icon_ship_screen_ship_production
+		special_trait_background = yes
+
+		limit_to_equipment_type = {
+			screen_ship
+		}
+
+		#all_parents = {  }
+
+		position = { x=3 y=0 }
+
+		production_bonus = {
+			production_capacity_factor = 0.05
+		}
+	}
 	add_trait = {  
 		token = bulizaochuanchang_1
 		name = bulizaochuanchang_1
@@ -441,8 +613,10 @@ BYG_newport_news_shipbuilding_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
+
+		
 		
 		equipment_bonus = {
 			reliability = 0.08 
@@ -475,7 +649,7 @@ BYG_newport_news_shipbuilding_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -558,6 +732,65 @@ BYG_north_american_aviation_organization = {
 			air_attack = 0.02
 		}
 	}
+	
+	add_trait = {
+		token = BYG_mio_yingxingpeijian
+		name = BYG_mio_yingxingpeijian
+		icon = GFX_generic_mio_department_icon_plane_tactical_bomber_engine
+		special_trait_background = yes
+
+		position = { x=0 y=0 }  
+		#relative_position_id = generic_mio_trait_light_weight_barrels
+
+		visible = {
+			FROM = { original_tag = BYG }
+		}
+
+		available = { #Two FROM blocs to provide two different check marks in the UI
+			FROM = {
+				has_completed_focus = BYG_kongdixietong
+			}
+		}
+		
+		equipment_bonus = {
+			air_agility = 0.1
+			air_ground_attack = 0.1
+			air_attack = 0.1
+			reliability = 0.05
+		}
+		production_bonus = {
+			#production_cost_factor = 0.05
+		}
+	}
+	
+	add_trait = {
+		token = BYG_mio_wangsheshengji
+		name = BYG_mio_wangsheshengji
+		icon = GFX_generic_mio_department_icon_plane_tactical_bomber_quality
+		special_trait_background = yes
+
+		position = { x=0 y=1 }  
+		relative_position_id = BYG_mio_yingxingpeijian
+
+		visible = {
+			FROM = { original_tag = BYG }
+		}
+
+		available = { #Two FROM blocs to provide two different check marks in the UI
+			FROM = {
+				has_completed_focus = BYG_kongdixietong
+			}
+		}
+		
+		equipment_bonus = {
+			air_range = 0.25
+			maximum_speed = 0.1
+			reliability = 0.1
+		}
+		production_bonus = {
+			#production_cost_factor = 0.05
+		}
+	}
 }

 BYG_lockheed_organization = {
@@ -609,6 +842,64 @@ BYG_lockheed_organization = {
 			air_attack = 0.05
 		}
 	}
+	add_trait = {
+		token = BYG_mio_yingxingpeijian2
+		name = BYG_mio_yingxingpeijian
+		icon = GFX_generic_mio_department_icon_plane_tactical_bomber_engine
+		special_trait_background = yes
+
+		position = { x=0 y=0 }  
+		#relative_position_id = generic_mio_trait_light_weight_barrels
+
+		visible = {
+			FROM = { original_tag = BYG }
+		}
+
+		available = { #Two FROM blocs to provide two different check marks in the UI
+			FROM = {
+				has_completed_focus = BYG_kongdixietong
+			}
+		}
+		
+		equipment_bonus = {
+			air_agility = 0.1
+			air_ground_attack = 0.1
+			air_attack = 0.1
+			reliability = 0.05
+		}
+		production_bonus = {
+			#production_cost_factor = 0.05
+		}
+	}
+	
+	add_trait = {
+		token = BYG_mio_wangsheshengji2
+		name = BYG_mio_wangsheshengji
+		icon = GFX_generic_mio_department_icon_plane_tactical_bomber_quality
+		special_trait_background = yes
+
+		position = { x=0 y=1 }  
+		relative_position_id = BYG_mio_yingxingpeijian2
+
+		visible = {
+			FROM = { original_tag = BYG }
+		}
+
+		available = { #Two FROM blocs to provide two different check marks in the UI
+			FROM = {
+				has_completed_focus = BYG_kongdixietong
+			}
+		}
+		
+		equipment_bonus = {
+			air_range = 0.25
+			maximum_speed = 0.1
+			reliability = 0.1
+		}
+		production_bonus = {
+			#production_cost_factor = 0.05
+		}
+	}
 }

 BYG_douglas_aircraft_company_organization = {
@@ -618,6 +909,110 @@ BYG_douglas_aircraft_company_organization = {
 	allowed = {	
 		tag = BYG 
 	}
+
+	override_trait = {
+		token = generic_mio_trait_low_altitude_attacks
+		position = { x=3 y=0 }
+	}
+
+	add_trait = {
+		token = USA_mio_trait_remote_controlled_turrets
+		name = USA_mio_trait_remote_controlled_turrets
+		icon = GFX_generic_mio_trait_icon_air_attack
+
+		special_trait_background = yes
+		
+		position = { x=0 y=1 }  
+		relative_position_id = generic_mio_trait_low_altitude_attacks
+		
+		available = {
+			FROM = {
+				has_tech = computing_machine
+			}
+		}
+
+		any_parent = { generic_mio_trait_low_altitude_attacks }
+			
+		equipment_bonus = {
+			air_attack = 0.1
+		}
+	}
+
+	add_trait = {
+		token = USA_mio_trait_specialist_nose_configurations
+		name = USA_mio_trait_specialist_nose_configurations
+		icon = GFX_generic_mio_department_icon_plane_cas_combat
+
+		special_trait_background = yes
+		
+		position = { x=0 y=2 }  
+		relative_position_id = generic_mio_trait_heavily_armed_aircraft
+
+		any_parent = { generic_mio_trait_air_brakes generic_mio_trait_wingborne_fuel_tanks }
+		any_parent = {generic_mio_trait_heavily_armed_aircraft }
+			
+		equipment_bonus = {
+			air_ground_attack = 0.1
+		}
+	}
+	add_trait = {
+		token = BYG_mio_yingxingpeijian3
+		name = BYG_mio_yingxingpeijian
+		icon = GFX_generic_mio_department_icon_plane_tactical_bomber_engine
+		special_trait_background = yes
+
+		position = { x=0 y=1 }  
+		#relative_position_id = generic_mio_trait_light_weight_barrels
+
+		visible = {
+			FROM = { original_tag = BYG }
+		}
+
+		available = { #Two FROM blocs to provide two different check marks in the UI
+			FROM = {
+				has_completed_focus = BYG_kongdixietong
+			}
+		}
+		
+		equipment_bonus = {
+			air_agility = 0.1
+			air_ground_attack = 0.1
+			air_attack = 0.1
+			reliability = 0.05
+		}
+		production_bonus = {
+			#production_cost_factor = 0.05
+		}
+	}
+	
+	add_trait = {
+		token = BYG_mio_wangsheshengji3
+		name = BYG_mio_wangsheshengji
+		icon = GFX_generic_mio_department_icon_plane_tactical_bomber_quality
+		special_trait_background = yes
+
+		position = { x=0 y=1 }  
+		relative_position_id = BYG_mio_yingxingpeijian3
+
+		visible = {
+			FROM = { original_tag = BYG }
+		}
+
+		available = { #Two FROM blocs to provide two different check marks in the UI
+			FROM = {
+				has_completed_focus = BYG_kongdixietong
+			}
+		}
+		
+		equipment_bonus = {
+			air_range = 0.25
+			maximum_speed = 0.1
+			reliability = 0.1
+		}
+		production_bonus = {
+			#production_cost_factor = 0.05
+		}
+	}
 }

 BYG_boeing_organization = {
@@ -657,6 +1052,65 @@ BYG_boeing_organization = {
 			fuel_consumption = 0.05
 		}
 	}
+	
+	add_trait = {
+		token = BYG_mio_yingxingpeijian4
+		name = BYG_mio_yingxingpeijian
+		icon = GFX_generic_mio_department_icon_plane_tactical_bomber_engine
+		special_trait_background = yes
+
+		position = { x=0 y=0 }  
+		#relative_position_id = generic_mio_trait_light_weight_barrels
+
+		visible = {
+			FROM = { original_tag = BYG }
+		}
+
+		available = { #Two FROM blocs to provide two different check marks in the UI
+			FROM = {
+				has_completed_focus = BYG_kongdixietong
+			}
+		}
+		
+		equipment_bonus = {
+			air_agility = 0.1
+			air_ground_attack = 0.1
+			air_attack = 0.1
+			reliability = 0.05
+		}
+		production_bonus = {
+			#production_cost_factor = 0.05
+		}
+	}
+	
+	add_trait = {
+		token = BYG_mio_wangsheshengji4
+		name = BYG_mio_wangsheshengji
+		icon = GFX_generic_mio_department_icon_plane_tactical_bomber_quality
+		special_trait_background = yes
+
+		position = { x=0 y=1 }  
+		relative_position_id = BYG_mio_yingxingpeijian4
+
+		visible = {
+			FROM = { original_tag = BYG }
+		}
+
+		available = { #Two FROM blocs to provide two different check marks in the UI
+			FROM = {
+				has_completed_focus = BYG_kongdixietong
+			}
+		}
+		
+		equipment_bonus = {
+			air_range = 0.25
+			maximum_speed = 0.1
+			reliability = 0.1
+		}
+		production_bonus = {
+			#production_cost_factor = 0.05
+		}
+	}
 }

 BYG_grumman_organization = {
@@ -677,7 +1131,7 @@ BYG_grumman_organization = {
 		relative_position_id = generic_mio_trait_reinforced_fuselage
 		
 		any_parent = { generic_mio_trait_reinforced_fuselage }
-		limit_to_equipment_type = { large_plane_airframe large_plane_maritime_patrol_plane_airframe }
+		limit_to_equipment_type = { mio_cat_eq_all_cv_aircraft small_plane_naval_bomber_airframe }
 			
 		equipment_bonus = {
 			air_agility = 0.05
@@ -711,6 +1165,65 @@ BYG_grumman_organization = {
 			maximum_speed = 0.1
 		}
 	}
+	
+	add_trait = {
+		token = BYG_mio_yingxingpeijian5
+		name = BYG_mio_yingxingpeijian
+		icon = GFX_generic_mio_department_icon_plane_tactical_bomber_engine
+		special_trait_background = yes
+
+		position = { x=5 y=0 }  
+		relative_position_id = generic_mio_trait_navigation_equipment
+
+		visible = {
+			FROM = { original_tag = BYG }
+		}
+
+		available = { #Two FROM blocs to provide two different check marks in the UI
+			FROM = {
+				has_completed_focus = BYG_kongdixietong
+			}
+		}
+		
+		equipment_bonus = {
+			air_agility = 0.1
+			air_ground_attack = 0.1
+			air_attack = 0.1
+			reliability = 0.05
+		}
+		production_bonus = {
+			#production_cost_factor = 0.05
+		}
+	}
+	
+	add_trait = {
+		token = BYG_mio_wangsheshengji5
+		name = BYG_mio_wangsheshengji
+		icon = GFX_generic_mio_department_icon_plane_tactical_bomber_quality
+		special_trait_background = yes
+
+		position = { x=0 y=1 }  
+		relative_position_id = BYG_mio_yingxingpeijian5
+
+		visible = {
+			FROM = { original_tag = BYG }
+		}
+
+		available = { #Two FROM blocs to provide two different check marks in the UI
+			FROM = {
+				has_completed_focus = BYG_kongdixietong
+			}
+		}
+		
+		equipment_bonus = {
+			air_range = 0.25
+			maximum_speed = 0.1
+			reliability = 0.1
+		}
+		production_bonus = {
+			#production_cost_factor = 0.05
+		}
+	}
 }


@@ -732,6 +1245,39 @@ BYG_springfield_armory_organization = {
 	allowed = {	 
 		tag = BYG 
 	}
+	
+	add_trait = { 
+		token = BYG_mio_jiguangpeijian
+		name = BYG_mio_jiguangpeijian
+		icon = GFX_generic_mio_department_icon_infantry_offense
+		special_trait_background = yes
+
+		position = { x=2 y=0 }  
+		relative_position_id = generic_mio_trait_drum_pattern_sights
+
+		visible = {
+			FROM = { original_tag = BYG }
+		}
+
+		available = { #Two FROM blocs to provide two different check marks in the UI
+			FROM = {
+				has_completed_focus = BYG_danbingzhuangbei
+			}
+		}
+		
+		equipment_bonus = {
+			soft_attack = 0.15
+			hard_attack = 0.1
+			breakthrough = 0.35
+		}
+		
+		production_bonus = {
+			#production_cost_factor = 0.05
+		}
+		ai_will_do = {
+			base = 100
+		}
+	}
 }

 BYG_ford_motor_company_organization = {
@@ -759,4 +1305,32 @@ BYG_rock_island_arsenal_organization = {
 		tag = BYG 

 	}
+	add_trait = { 
+		token = BYG_mio_weixingyindao
+		name = BYG_mio_weixingyindao
+		icon = GFX_generic_mio_department_icon_tank_general_spg
+		special_trait_background = yes
+
+		position = { x=-2 y=0 }  
+		relative_position_id = generic_mio_trait_light_weight_barrels
+
+		visible = {
+			FROM = { original_tag = BYG }
+		}
+
+		available = { #Two FROM blocs to provide two different check marks in the UI
+			FROM = {
+				has_completed_focus = BYG_xietongpaoji
+			}
+		}
+		
+		equipment_bonus = {
+			soft_attack = 0.25
+			hard_attack = 0.25
+		}
+		
+		ai_will_do = {
+			base = 100
+		}
+	}
 }
--- a/src/common/military_industrial_organization/organizations/DOH_organization.txt
+++ b/src/common/military_industrial_organization/organizations/DOH_organization.txt
@@ -9,8 +9,8 @@
 ####################

 DOH_shanghai_tank = {
-	include = generic_tank_organization
-	icon = GFX_idea_osaka_army_arsenal
+	include = generic_infantry_tank_organization
+	icon = GFX_idea_CHI_shanghai_arsenal
 	allowed = {
 		tag = DOH
 	}
@@ -77,9 +77,9 @@ DOH_shanghai_tank = {
 	}
 }

- DOH_baotoudiyijixiechang_organization = {
+DOH_first_tractor_company_organization = {
 	include = generic_tank_refurbishment_plant_organization
-	icon = GFX_idea_generic_tank_manufacturer_3
+	icon =  GFX_idea_PRC_first_tractor_company
 	allowed = {
 		tag = DOH
 	}
@@ -121,7 +121,82 @@ DOH_shanghai_tank = {
 		}
 	}
 }
+DOH_baotoudiyijixiechang_organization = {
+	include = generic_tank_organization
+	name = PRC_first_tractor_company_organization
+ 	icon = GFX_idea_PRC_factory_617

+
+ 	allowed = {
+		always = yes
+ 	}
+
+ 	available = {
+		always = yes
+ 	}
+
+	add_trait = {
+		token = jishugaijing
+		name = jishugaijing
+		icon = GFX_generic_mio_trait_icon_unique
+		special_trait_background = yes
+
+		position = { x=8 y=0 }  
+
+		available = {
+			FROM = { 
+				OR = {
+					has_completed_focus =  CHY_gongyejituan 
+					OR = {
+						is_ally_with = CHY
+						has_country_flag = chy_jungongyuanzhu_flag
+					}
+				}
+			}
+		}
+		
+		equipment_bonus = {
+			reliability = 0.05
+			maximum_speed = 0.05
+      	}
+
+		production_bonus = {
+			production_resource_need_factor = -0.25
+			production_capacity_factor = 0.05
+			production_efficiency_gain_factor = 0.05
+			production_efficiency_cap_factor = 0.05
+		}
+
+		organization_modifier = {
+			military_industrial_organization_research_bonus = 0.15
+		}
+	}
+
+ 	add_trait = {
+ 		token = PRC_first_tractor_company_peoples_tank_trait
+ 		name = PRC_first_tractor_company_peoples_tank_trait
+ 		icon = GFX_generic_mio_department_icon_tank_light_tank_quality
+ 		
+ 		special_trait_background = yes 
+
+
+ 		relative_position_id = generic_mio_trait_improved_tracks 
+ 		position = {
+ 			x = -1
+ 			y = 0
+ 		}
+
+ 		all_parents = {
+ 			generic_mio_trait_improved_tracks
+ 		}
+
+ 		equipment_bonus = {
+			reliability = 0.05
+			breakthrough = 0.05
+      	}
+ 	}
+
+ }
 #####################

 ## #  # ### ###   ## 
@@ -133,7 +208,7 @@ DOH_shanghai_tank = {
 #####################
 DOH_dalianzaochuan_organization = {
 	include = generic_battle_line_ship_organization
-	icon = GFX_idea_generic_navy_bonus
+	icon = GFX_idea_PRC_dalian_shipbuilding_company
 	allowed = {	
 		tag = DOH
 	}
@@ -162,8 +237,7 @@ DOH_dalianzaochuan_organization = {
 			military_industrial_organization_funds_gain = 0.35
 		}
 		on_complete = {
-			ROOT = {
-				add_mio_size = 1
+			 PREV = { add_mio_size = 1
 			}
 			FROM = {
 				navy_experience = 200
@@ -197,8 +271,7 @@ DOH_dalianzaochuan_organization = {
 			military_industrial_organization_funds_gain = 0.35
 		}
 		on_complete = {
-			ROOT = {
-				add_mio_size = 1
+			 PREV = { add_mio_size = 1
 			}
 			FROM = {
 				navy_experience = 200
@@ -268,7 +341,7 @@ DOH_dalianzaochuan_organization = {
 }
 DOH_hudong_organization = {
 	include = generic_escort_ship_organization
-	icon = GFX_idea_escort_effort_focus
+	icon = GFX_idea_PRC_shipbuilding_industry_bureau
 	allowed = {	
 		tag = DOH
 	}
@@ -297,8 +370,7 @@ DOH_hudong_organization = {
 			military_industrial_organization_funds_gain = 0.35
 		}
 		on_complete = {
-			ROOT = {
-				add_mio_size = 1
+			 PREV = { add_mio_size = 1
 			}
 			FROM = {
 				navy_experience = 200
@@ -332,8 +404,7 @@ DOH_hudong_organization = {
 			military_industrial_organization_funds_gain = 0.35
 		}
 		on_complete = {
-			ROOT = {
-				add_mio_size = 1
+			 PREV = { add_mio_size = 1
 			}
 			FROM = {
 				navy_experience = 200
@@ -442,8 +513,7 @@ DOH_wuchangzaochuanchang_organization = {
 			military_industrial_organization_funds_gain = 0.35
 		}
 		on_complete = {
-			ROOT = {
-				add_mio_size = 1
+			 PREV = { add_mio_size = 1
 			}
 			FROM = {
 				navy_experience = 200
@@ -477,8 +547,7 @@ DOH_wuchangzaochuanchang_organization = {
 			military_industrial_organization_funds_gain = 0.35
 		}
 		on_complete = {
-			ROOT = {
-				add_mio_size = 1
+			 PREV = { add_mio_size = 1
 			}
 			FROM = {
 				navy_experience = 200
@@ -514,8 +583,7 @@ DOH_wuchangzaochuanchang_organization = {
 			production_capacity_factor = 0.05
 		}
 		on_complete = {
-			ROOT = {
-				add_mio_size = 10
+			 PREV = { add_mio_size = 10
 			}
 		}
 	}
@@ -565,7 +633,7 @@ DOH_wuchangzaochuanchang_organization = {

 DOH_jiangnan_shipyard_group_organization = {
 	include = generic_task_force_ship_organization
-	icon = GFX_idea_generic_naval_manufacturer_1
+	icon = GFX_idea_CHI_kiangnan
 	allowed = {	
 		tag = DOH
 	}
@@ -599,8 +667,7 @@ DOH_jiangnan_shipyard_group_organization = {
 			military_industrial_organization_funds_gain = 0.35
 		}
 		on_complete = {
-			ROOT = {
-				add_mio_size = 1
+			 PREV = { add_mio_size = 1
 			}
 			FROM = {
 				navy_experience = 200
@@ -634,8 +701,7 @@ DOH_jiangnan_shipyard_group_organization = {
 			military_industrial_organization_funds_gain = 0.35
 		}
 		on_complete = {
-			ROOT = {
-				add_mio_size = 1
+			 PREV = { add_mio_size = 1
 			}
 			FROM = {
 				navy_experience = 200
@@ -700,7 +766,7 @@ DOH_jiangnan_shipyard_group_organization = {

 DOH_dagu_shipyard_organization = {
 	include = generic_raider_ship_organization
-	icon = GFX_idea_generic_naval_manufacturer_3
+	icon = GFX_idea_CHI_dagu
 	allowed = {	
 		tag = DOH
 	}
@@ -729,8 +795,7 @@ DOH_dagu_shipyard_organization = {
 			military_industrial_organization_funds_gain = 0.35
 		}
 		on_complete = {
-			ROOT = {
-				add_mio_size = 1
+			 PREV = { add_mio_size = 1
 			}
 			FROM = {
 				navy_experience = 200
@@ -764,8 +829,7 @@ DOH_dagu_shipyard_organization = {
 			military_industrial_organization_funds_gain = 0.35
 		}
 		on_complete = {
-			ROOT = {
-				add_mio_size = 1
+			 PREV = { add_mio_size = 1
 			}
 			FROM = {
 				navy_experience = 200
@@ -836,25 +900,9 @@ DOH_dagu_shipyard_organization = {

 ###########################

-DOH_camco_medium_organization = {
-	include = generic_medium_aircraft_organization
-	icon = GFX_idea_CHI_camco
-	allowed = {	
-		tag = DOH
-	}
-	available = {
-		owner = {
-			OR = {
-				has_completed_focus = DOH_xindonghuang
-				has_completed_focus = DOH_yixianwansui		
-			}
-			has_completed_focus = DOH_duidizhiyuan
-		}
-	}
-}
 DOH_camco_fighter_organization = {
-	include = generic_light_aircraft_organization
-	icon = GFX_idea_CHI_camco
+	include = generic_high_agility_fighter_aircraft_organization
+	icon = GFX_idea_PRC_pla_air_force
 	allowed = {	
 		tag = DOH
 	}
@@ -867,10 +915,72 @@ DOH_camco_fighter_organization = {
 			has_completed_focus = DOH_tieyuan
 		}
 	}
+	add_trait = {
+
+ 		token = PRC_shenyang_aircraft_corporation_factory_112_trait
+ 		name = PRC_shenyang_aircraft_corporation_factory_112_trait
+ 		icon = GFX_generic_mio_department_icon_facilities
+ 		
+ 		special_trait_background = yes 
+
+ 		relative_position_id = generic_mio_trait_fabric_skin
+
+ 		any_parent = {	generic_mio_trait_fabric_skin generic_mio_trait_metal_skin }
+
+
+ 		position = {
+ 			x = 1
+ 			y = 2
+ 		} 
+
+ 		limit_to_equipment_type = { 
+			small_plane_airframe_4
+			cv_small_plane_airframe_4
+		}
+
+ 		production_bonus = {
+ 			production_capacity_factor = 0.15
+ 		}
+ 	}
+
+
+ 	add_trait = {
+
+ 		token = PRC_shenyang_aircraft_corporation_domestic_jet_manufacturer_trait
+ 		name = PRC_shenyang_aircraft_corporation_domestic_jet_manufacturer_trait
+ 		icon = GFX_military_industrial_organization_jet_fighter_equipment
+ 		
+ 		special_trait_background = yes 
+
+ 		relative_position_id = generic_mio_trait_fabric_skin
+
+ 		all_parents = {
+ 			PRC_shenyang_aircraft_corporation_factory_112_trait
+ 			generic_mio_trait_fuel_injection_engines
+ 		}
+
+ 		position = {
+ 			x = 1
+ 			y = 4
+ 		} 
+
+ 		limit_to_equipment_type = { 
+			small_plane_airframe_4
+			cv_small_plane_airframe_4
+		}
+
+ 		equipment_bonus = {
+ 			air_agility = 0.15
+ 		}
+
+ 		production_bonus = {
+ 			production_capacity_factor = 0.1
+ 		}
+ 	}
 }
 DOH_camco_cas_organization = {
 	include = generic_cas_aircraft_organization
-	icon = GFX_idea_CHI_camco
+	icon = GFX_idea_PRC_shenyang_aircraft_corporation
 	allowed = {	
 		tag = DOH
 	}
@@ -886,7 +996,7 @@ DOH_camco_cas_organization = {
 }
 DOH_camco_heavy_organization = {
 	include = generic_heavy_aircraft_organization
-	icon = GFX_idea_CHI_camco
+	icon = GFX_idea_generic_air_manufacturer_3
 	allowed = {	
 		tag = DOH
 	}
@@ -904,6 +1014,98 @@ DOH_camco_heavy_organization = {
 		}
 	}
 }
+
+DOH_harbin_aircraft_industry_group_organization = {
+	include = generic_multi_role_aircraft_organization 
+	name = PRC_harbin_aircraft_industry_group_organization
+ 	icon = GFX_idea_PRC_harbin_aircraft
+
+ 	available = {
+ 		ROOT = { controls_state = 328 }
+ 	}
+
+	equipment_type = {
+		mio_cat_eq_all_small_plane
+		mio_cat_eq_all_medium_plane
+		transport_plane_equipment
+ 		helicopter_equipment ## Include helicopters
+		motorbike_equipment
+	}
+	
+	tree_header_text = {
+		text = PRC_harbin_aircraft_industry_group_organization_header
+		x = 0 
+	}
+		tree_header_text = {
+		text = mio_header_light_aircraft
+		x = 3
+	}
+
+	tree_header_text = {
+		text = mio_header_medium_aircraft
+		x = 6
+	}
+
+
+	research_categories = { mio_cat_all_light_aircraft_and_modules mio_cat_all_medium_aircraft_and_modules helicopter_tech }
+
+ 	allowed = {
+		tag = DOH
+ 	}
+
+
+ 	add_trait = {
+
+ 		token = PRC_harbin_aircraft_industry_group_harbin_aircraft_manufacturing_plant_trait
+ 		name = PRC_harbin_aircraft_industry_group_harbin_aircraft_manufacturing_plant_trait
+ 		icon = GFX_generic_mio_department_icon_helicopter
+
+
+ 		special_trait_background = yes 
+
+ 		relative_position_id = generic_mio_trait_armored_cockpit
+
+ 		all_parents = {
+ 			generic_mio_trait_armored_cockpit
+ 		}
+
+ 		position = {
+ 			x = -3
+ 			y = 3
+ 		} 
+
+ 		limit_to_equipment_type = { helicopter_equipment }
+
+ 		production_bonus = {
+ 			production_capacity_factor = 0.15
+ 		}
+
+ 	}
+
+
+ 	add_trait = {
+ 		token = PRC_harbin_aircraft_industry_group_factory_122_trait
+ 		name = PRC_harbin_aircraft_industry_group_factory_122_trait
+ 		icon = GFX_generic_mio_department_icon_plane_general_conversion
+
+ 		special_trait_background = yes 
+
+ 		relative_position_id = generic_mio_trait_escort_designs
+ 		position = {
+ 			x = 2
+ 			y = 1
+ 		}
+
+ 		all_parents = {
+ 			generic_mio_trait_escort_designs
+ 		}
+
+ 		production_bonus = {
+ 			production_conversion_speed_factor = 0.1
+ 		}
+
+ 	}
+}
 ################################### 

 #   #  ##  ### ### ###  ### ### #   
@@ -1016,7 +1218,7 @@ DOH_taiyuan_arsenal_organization = {
 }
 DOH_liaoning_arsenal_organization = {
 	include = generic_motorized_mechanized_organization
-	icon = GFX_idea_generic_motorized_equipment_manufacturer_1
+	icon = GFX_idea_PRC_first_automative_works
 	allowed = {
 				tag = DOH
 			}
@@ -1052,7 +1254,7 @@ DOH_liaoning_arsenal_organization = {
 }
 DOH_hanyan_arsenal_organization = {
 	include = generic_infantry_equipment_organization
-	icon = GFX_idea_generic_infantry_equipment_manufacturer_1
+	icon = GFX_idea_CHI_hanyang
 	allowed = {
 				tag = DOH
 			}
@@ -1146,7 +1348,7 @@ DOH_hanyan_arsenal_organization = {
 }
 DOH_mukden_arsenal_organization = {
 	include = DOH_hanyan_arsenal_organization
-	icon = GFX_idea_generic_infantry_equipment_manufacturer_2
+	icon = GFX_idea_CHI_mukden
 	allowed = {
 				tag = DOH
 			}
--- a/src/common/military_industrial_organization/organizations/HUJ_organization.txt
+++ b/src/common/military_industrial_organization/organizations/HUJ_organization.txt
@@ -126,10 +126,10 @@ HUJ_harland_wolff_organization = {
 		icon = GFX_BLI_zaochuanchang_mio_icon_1
 		special_trait_background = yes

-		position = { x=8 y=4 }  
+		position = { x=9 y=3 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -163,7 +163,7 @@ HUJ_harland_wolff_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -219,10 +219,10 @@ HUJ_cammell_laird_organization = {
 		icon = GFX_BLI_zaochuanchang_mio_icon_1
 		special_trait_background = yes

-		position = { x=8 y=4 }  
+		position = { x=7 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -256,7 +256,7 @@ HUJ_cammell_laird_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -340,7 +340,7 @@ HUJ_yarrow_shipbuilders_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -374,7 +374,7 @@ HUJ_yarrow_shipbuilders_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -417,7 +417,7 @@ HUJ_john_brown_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -451,7 +451,7 @@ HUJ_john_brown_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -504,6 +504,7 @@ HUJ_supermarine_organization = {

 	research_categories = {	
 		mio_cat_all_light_fighter_and_modules 
+
 	}

 	override_trait = {
--- a/src/common/military_industrial_organization/organizations/SAD_organization.txt
+++ b/src/common/military_industrial_organization/organizations/SAD_organization.txt
@@ -26,7 +26,7 @@ SAD_fiat_organization = {
 		position = { x=9 y=0 }
 		
 		available = {
-			or = {
+			OR = {
 				FROM = { has_completed_focus = SAD_changshizizhuyanfa }
 			    FROM = { is_ai = yes }
 			}
@@ -113,7 +113,7 @@ SAD_crda_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -147,7 +147,7 @@ SAD_crda_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -281,7 +281,7 @@ SAD_cantiere_oto_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -315,7 +315,7 @@ SAD_cantiere_oto_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -444,7 +444,7 @@ SAD_navalmeccanica_organization = {
 		position = { x=4 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -478,7 +478,7 @@ SAD_navalmeccanica_organization = {
 		position = { x=5 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -612,7 +612,7 @@ SAD_cantiere_navale_di_ancona_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -646,7 +646,7 @@ SAD_cantiere_navale_di_ancona_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -780,7 +780,7 @@ SAD_cantieri_navali_tosi_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -814,7 +814,7 @@ SAD_cantieri_navali_tosi_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -1438,7 +1438,7 @@ SAD_officine_meccaniche_organization = {
 	
 	research_categories = {
 		mio_cat_tech_all_motorized_mechanized
-		train_tech
+		train_equipment
 	}

 	initial_trait = {
--- a/src/common/military_industrial_organization/organizations/SIR_organization.txt
+++ b/src/common/military_industrial_organization/organizations/SIR_organization.txt
@@ -60,7 +60,7 @@ SIR_carrier_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -94,7 +94,7 @@ SIR_carrier_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -142,7 +142,7 @@ SIR_BB_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -176,7 +176,7 @@ SIR_BB_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -224,7 +224,7 @@ SIR_SL_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -258,7 +258,7 @@ SIR_SL_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -306,7 +306,7 @@ SIR_SM_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -340,7 +340,7 @@ SIR_SM_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
--- a/src/common/military_industrial_organization/organizations/TIX_organization.txt
+++ b/src/common/military_industrial_organization/organizations/TIX_organization.txt
--- a/src/common/military_industrial_organization/organizations/YUW_organization.txt
+++ b/src/common/military_industrial_organization/organizations/YUW_organization.txt
@@ -123,7 +123,7 @@ YUW_fcm_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -157,7 +157,7 @@ YUW_fcm_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -199,7 +199,7 @@ YUW_aeb_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -233,7 +233,7 @@ YUW_aeb_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -275,7 +275,7 @@ YUW_acl_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -309,7 +309,7 @@ YUW_acl_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
@@ -351,7 +351,7 @@ YUW_acf_organization = {
 		position = { x=8 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi1_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi1_get } }
 		}
 		
 		equipment_bonus = {
@@ -385,7 +385,7 @@ YUW_acf_organization = {
 		position = { x=9 y=4 }  

 		available = {
-			FROM = { OR = { tag = BLI has_country_flag =  buligongyi2_get } }
+			FROM = { OR = { hidden_trigger = { is_ai = yes } tag = BLI has_country_flag = buligongyi2_get } }
 		}
 		
 		equipment_bonus = {
--- a/src/common/military_industrial_organization/organizations/az_doh_extra_organization.txt
+++ b/src/common/military_industrial_organization/organizations/az_doh_extra_organization.txt
@@ -1,5 +1,5 @@
 az_DOH_railway_organization = {
-	icon = GFX_idea_generic_railroads
+	icon = GFX_idea_PRC_peoples_aviation_company_of_china
 	allowed = {
 		tag = DOH
 	}
--- a/src/common/national_focus/donghuang_new.txt
+++ b/src/common/national_focus/donghuang_new.txt
@@ -350,18 +350,18 @@ focus_tree = {
 				add_mio_size = 3
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 4525					# 包头
-					value = 15
-				}
-				set_victory_points = {
-					province = 12432					# 大同
-					value = 20
-				}
-				set_victory_points = {
-					province = 1519					# 太原
-					value = 20
-				}
+				# set_victory_points = {
+				# 	province = 4525					# 包头
+				# 	value = 15
+				# }
+				# set_victory_points = {
+				# 	province = 12432					# 大同
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 1519					# 太原
+				# 	value = 20
+				# }
 			}
 		}
 	}
@@ -962,14 +962,6 @@ focus_tree = {
 						has_completed_focus = DOH_dashijiyoujizhan
 					}
 				}
-				set_technology = {
-					guerrilla_tactics_for_doh = 1
-					popup = no
-				}
-				set_technology = {
-					human_wave_tactics_for_doh = 1
-					popup = no
-				}
 				custom_effect_tooltip = DOH_dashijiyoujizhan_tooltip
 				hidden_effect = {
 					set_technology = {
@@ -3800,10 +3792,10 @@ focus_tree = {
 				}
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 10000					# 青岛
-					value = 20
-				}
+				# set_victory_points = {
+				# 	province = 10000					# 青岛
+				# 	value = 20
+				# }
 			}
 			add_ideas = DOH_hailufuhe_idea_0
 			swap_ideas = {
@@ -4000,54 +3992,54 @@ focus_tree = {
 				}
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 2022					# 兰州
-					value = 20
-				}
-				set_victory_points = {
-					province = 12732					# 西宁
-					value = 20
-				}
-				set_victory_points = {
-					province = 4709					# 乌鲁木齐
-					value = 20
-				}
-				set_victory_points = {
-					province = 4823					# 阿勒泰
-					value = 10
-				}
-				set_victory_points = {
-					province = 8049					# 延安
-					value = 15
-				}
-				set_victory_points = {
-					province = 2015					# 喀什
-					value = 20
-				}
-				set_victory_points = {
-					province = 4823					# 阿勒泰
-					value = 10
-				}
-				set_victory_points = {
-					province = 8127					# 银川
-					value = 20
-				}
-				set_victory_points = {
-					province = 5100					# 张掖
-					value = 10
-				}
-				set_victory_points = {
-					province = 12820					# 敦煌
-					value = 15
-				}
-				set_victory_points = {
-					province = 5057					# 武威
-					value = 10
-				}
-				set_victory_points = {
-					province = 2028					# 酒泉
-					value = 20
-				}
+				# set_victory_points = {
+				# 	province = 2022					# 兰州
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 12732					# 西宁
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 4709					# 乌鲁木齐
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 4823					# 阿勒泰
+				# 	value = 10
+				# }
+				# set_victory_points = {
+				# 	province = 8049					# 延安
+				# 	value = 15
+				# }
+				# set_victory_points = {
+				# 	province = 2015					# 喀什
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 4823					# 阿勒泰
+				# 	value = 10
+				# }
+				# set_victory_points = {
+				# 	province = 8127					# 银川
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 5100					# 张掖
+				# 	value = 10
+				# }
+				# set_victory_points = {
+				# 	province = 12820					# 敦煌
+				# 	value = 15
+				# }
+				# set_victory_points = {
+				# 	province = 5057					# 武威
+				# 	value = 10
+				# }
+				# set_victory_points = {
+				# 	province = 2028					# 酒泉
+				# 	value = 20
+				# }
 			}
 		}
 	}
@@ -4200,42 +4192,42 @@ focus_tree = {
 				set_state_category = metropolis
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 7191					# 杭州
-					value = 20
-				}
-				set_victory_points = {
-					province = 9974					# 宁波
-					value = 20
-				}
-				set_victory_points = {
-					province = 4196					# 福州
-					value = 20
-				}
-				set_victory_points = {
-					province = 7071					# 厦门
-					value = 20
-				}
-				set_victory_points = {
-					province = 9938					# 汕头
-					value = 20
-				}
-				set_victory_points = {
-					province = 7182					# 潮州
-					value = 10
-				}
-				set_victory_points = {
-					province = 1055					# 温州
-					value = 20
-				}
-				set_victory_points = {
-					province = 4205					# 威海
-					value = 10
-				}
-				set_victory_points = {
-					province = 1200					# 烟台
-					value = 10
-				}
+				# set_victory_points = {
+				# 	province = 7191					# 杭州
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 9974					# 宁波
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 4196					# 福州
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 7071					# 厦门
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 9938					# 汕头
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 7182					# 潮州
+				# 	value = 10
+				# }
+				# set_victory_points = {
+				# 	province = 1055					# 温州
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 4205					# 威海
+				# 	value = 10
+				# }
+				# set_victory_points = {
+				# 	province = 1200					# 烟台
+				# 	value = 10
+				# }
 			}
 		}
 	}
@@ -5330,42 +5322,42 @@ focus_tree = {
 		completion_reward = {
 			DOH_neibufenqi_jianqin_effect = yes
 			hidden_effect = {
-				set_victory_points = {
-					province = 1319					# 昆明
-					value = 20
-				}
-				set_victory_points = {
-					province = 10404					# 桂林
-					value = 15
-				}
-				set_victory_points = {
-					province = 7137					# 南宁
-					value = 20
-				}
-				set_victory_points = {
-					province = 3992					# 南昌
-					value = 20
-				}
-				set_victory_points = {
-					province = 7222					# 合肥
-					value = 20
-				}
-				set_victory_points = {
-					province = 5033					# 拉萨
-					value = 20
-				}
-				set_victory_points = {
-					province = 7186					# 台北
-					value = 30
-				}
-				set_victory_points = {
-					province = 12068					# 高雄
-					value = 20
-				}
-				set_victory_points = {
-					province = 4504					# 贵阳
-					value = 15
-				}
+				# set_victory_points = {
+				# 	province = 1319					# 昆明
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 10404					# 桂林
+				# 	value = 15
+				# }
+				# set_victory_points = {
+				# 	province = 7137					# 南宁
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 3992					# 南昌
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 7222					# 合肥
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 5033					# 拉萨
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 7186					# 台北
+				# 	value = 30
+				# }
+				# set_victory_points = {
+				# 	province = 12068					# 高雄
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 4504					# 贵阳
+				# 	value = 15
+				# }
 			}
 		}
 	}
@@ -5420,18 +5412,18 @@ focus_tree = {
 				set_state_category = large_city
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 11913					# 南京
-					value = 50
-				}
-				set_victory_points = {
-					province = 10076					# 苏州
-					value = 20
-				}
-				set_victory_points = {
-					province = 7014					# 上海
-					value = 40
-				}
+				# set_victory_points = {
+				# 	province = 11913					# 南京
+				# 	value = 50
+				# }
+				# set_victory_points = {
+				# 	province = 10076					# 苏州
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 7014					# 上海
+				# 	value = 40
+				# }
 			}
 		}
 	}
@@ -5471,26 +5463,26 @@ focus_tree = {

 			add_political_power = 100
 			hidden_effect = {
-				set_victory_points = {
-					province = 9958					# 郑州
-					value = 20
-				}
-				set_victory_points = {
-					province = 12055					# 徐州
-					value = 20
-				}
-				set_victory_points = {
-					province = 1069					# 济南
-					value = 20
-				}
-				set_victory_points = {
-					province = 7656					# 开封
-					value = 15
-				}
-				set_victory_points = {
-					province = 11931					# 洛阳
-					value = 15
-				}
+				# set_victory_points = {
+				# 	province = 9958					# 郑州
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 12055					# 徐州
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 1069					# 济南
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 7656					# 开封
+				# 	value = 15
+				# }
+				# set_victory_points = {
+				# 	province = 11931					# 洛阳
+				# 	value = 15
+				# }

 				country_event = {
 					id = DOH_loong_event.6001
@@ -5563,22 +5555,22 @@ focus_tree = {
 				set_state_category = metropolis
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 6999					# 重庆
-					value = 40
-				}
-				set_victory_points = {
-					province = 4925					# 成都
-					value = 40
-				}
-				set_victory_points = {
-					province = 1367					# 绵阳
-					value = 15
-				}
-				set_victory_points = {
-					province = 12141					# 乐山
-					value = 10
-				}
+				# set_victory_points = {
+				# 	province = 6999					# 重庆
+				# 	value = 40
+				# }
+				# set_victory_points = {
+				# 	province = 4925					# 成都
+				# 	value = 40
+				# }
+				# set_victory_points = {
+				# 	province = 1367					# 绵阳
+				# 	value = 15
+				# }
+				# set_victory_points = {
+				# 	province = 12141					# 乐山
+				# 	value = 10
+				# }
 			}
 		}
 	}
@@ -5638,26 +5630,26 @@ focus_tree = {
 				state = 609
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 9843					# 北京
-					value = 50
-				}
-				set_victory_points = {
-					province = 10068					# 天津
-					value = 20
-				}
-				set_victory_points = {
-					province = 12043					# 唐山
-					value = 15
-				}
-				set_victory_points = {
-					province = 7109					# 保定
-					value = 20
-				}
-				set_victory_points = {
-					province = 11801					# 承德
-					value = 10
-				}
+				# set_victory_points = {
+				# 	province = 9843					# 北京
+				# 	value = 50
+				# }
+				# set_victory_points = {
+				# 	province = 10068					# 天津
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 12043					# 唐山
+				# 	value = 15
+				# }
+				# set_victory_points = {
+				# 	province = 7109					# 保定
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 11801					# 承德
+				# 	value = 10
+				# }
 			}
 		}
 	}
@@ -5699,18 +5691,18 @@ focus_tree = {
 				add_mio_size = 1
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 4619					# 武汉
-					value = 40
-				}
-				set_victory_points = {
-					province = 7101					# 常德
-					value = 20
-				}
-				set_victory_points = {
-					province = 7097					# 长沙
-					value = 20
-				}
+				# set_victory_points = {
+				# 	province = 4619					# 武汉
+				# 	value = 40
+				# }
+				# set_victory_points = {
+				# 	province = 7101					# 常德
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 7097					# 长沙
+				# 	value = 20
+				# }
 			}
 		}
 	}
@@ -5750,10 +5742,10 @@ focus_tree = {
 				add_mio_size = 3
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 1150					# 大连
-					value = 30
-				}
+				# set_victory_points = {
+				# 	province = 1150					# 大连
+				# 	value = 30
+				# }
 			}
 		}
 	}
@@ -5794,10 +5786,10 @@ focus_tree = {
 				target_province = 7101
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 7418					# 西安
-					value = 30
-				}
+				# set_victory_points = {
+				# 	province = 7418					# 西安
+				# 	value = 30
+				# }
 			}
 		}
 	}
@@ -5904,42 +5896,42 @@ focus_tree = {
 				target_province = 11771
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 11771					# 奉天/沈阳
-					value = 20
-				}
-				set_victory_points = {
-					province = 10433					# 哈尔滨
-					value = 30
-				}
-				set_victory_points = {
-					province = 916					# 四平
-					value = 5
-				}
-				set_victory_points = {
-					province = 9803					# 通化
-					value = 10
-				}
-				set_victory_points = {
-					province = 11808					# 铁岭
-					value = 5
-				}
-				set_victory_points = {
-					province = 9885					# 抚顺
-					value = 15
-				}
-				set_victory_points = {
-					province = 3895					# 本溪
-					value = 5
-				}
-				set_victory_points = {
-					province = 9781					# 鞍山
-					value = 15
-				}
-				set_victory_points = {
-					province = 11836					# 通辽
-					value = 5
-				}
+				# set_victory_points = {
+				# 	province = 11771					# 奉天/沈阳
+				# 	value = 20
+				# }
+				# set_victory_points = {
+				# 	province = 10433					# 哈尔滨
+				# 	value = 30
+				# }
+				# set_victory_points = {
+				# 	province = 916					# 四平
+				# 	value = 5
+				# }
+				# set_victory_points = {
+				# 	province = 9803					# 通化
+				# 	value = 10
+				# }
+				# set_victory_points = {
+				# 	province = 11808					# 铁岭
+				# 	value = 5
+				# }
+				# set_victory_points = {
+				# 	province = 9885					# 抚顺
+				# 	value = 15
+				# }
+				# set_victory_points = {
+				# 	province = 3895					# 本溪
+				# 	value = 5
+				# }
+				# set_victory_points = {
+				# 	province = 9781					# 鞍山
+				# 	value = 15
+				# }
+				# set_victory_points = {
+				# 	province = 11836					# 通辽
+				# 	value = 5
+				# }
 			}
 			328 = {
 				set_state_category = large_city
@@ -6010,10 +6002,10 @@ focus_tree = {
 				target_province = 7137
 			}
 			hidden_effect = {
-				set_victory_points = {
-					province = 1047					# 广州
-					value = 40
-				}
+				# set_victory_points = {
+				# 	province = 1047					# 广州
+				# 	value = 40
+				# }
 			}
 		}
 	}
@@ -6153,10 +6145,10 @@ focus_tree = {
 			navy_experience = 50
 			air_experience = 50
 			hidden_effect = {
-				set_victory_points = {
-					province = 1070					# 海口
-					value = 20
-				}
+				# set_victory_points = {
+				# 	province = 1070					# 海口
+				# 	value = 20
+				# }
 			}
 			591 = {
 				set_state_category = large_city
--- a/src/common/scripted_triggers/az_scripted_triggers.txt
+++ b/src/common/scripted_triggers/az_scripted_triggers.txt
@@ -32,6 +32,9 @@ shijianniangguojia_trigger = {
 			tag = SIR
 			tag = WEX
 			tag = DH1
+			tag = USA
+			tag = USB
+			tag = CSA
 			is_ai = NO
 		}
 		}
--- a/src/events/AZ_tianjiangEvents.txt
+++ b/src/events/AZ_tianjiangEvents.txt
@@ -4250,8 +4250,6 @@ country_event = {
 			}
 		USA = {
 			set_cosmetic_tag = USA1
-			load_oob = BYG_neizhanfenbu_1
-			load_oob = USA_1936
 			add_war_support = 1
 			add_popularity = { ideology = fascism popularity = 1 } 
 				set_politics = {
@@ -4288,6 +4286,10 @@ country_event = {
 		add_popularity = { ideology = fascism popularity = -0.2 }
 		hidden_effect = {
 			country_event = { id = az_tianjiang.123 hours = 24}
+			USA = {
+				load_oob = BYG_neizhanfenbu_1
+				load_oob = USA_1936
+			}
 		}
 		ai_chance = {
 			factor = 100
@@ -4303,6 +4305,10 @@ country_event = {
 		add_popularity = { ideology = fascism popularity = -0.2 }
 		hidden_effect = {
 			country_event = { id = az_tianjiang.123 hours = 24}
+			USA = {
+				load_oob = BYG_neizhanfenbu_1
+				load_oob = USA_1936
+			}
 		}
 		ai_chance = {
 			factor = 0
@@ -4353,7 +4359,6 @@ country_event = {
 			}
 			USB = {
 				set_cosmetic_tag = USB1
-				load_oob = BYG_neizhanfenbu_2
 				set_capital = { state = 395 }
 				add_war_support = 1
 				add_popularity = { ideology = communism popularity = 1 } 
@@ -4396,6 +4401,9 @@ country_event = {
 		add_popularity = { ideology = communism popularity = -0.2 }
 		hidden_effect = {
 			country_event = { id = az_tianjiang.124 hours = 24}
+			USB = {
+				load_oob = BYG_neizhanfenbu_2
+			}
 		}
 		ai_chance = {
 			factor = 100
@@ -4410,6 +4418,9 @@ country_event = {
 		add_popularity = { ideology = communism popularity = -0.2 }
 		hidden_effect = {
 			country_event = { id = az_tianjiang.124 hours = 24}
+			USB = {
+				load_oob = BYG_neizhanfenbu_2
+			}
 		}
 		ai_chance = {
 			factor = 0
@@ -4491,12 +4502,6 @@ country_event = {
 						}
 				}
 				}
-				CSA = {
-					load_oob = BYG_neizhanfenbu_3
-				}
-				BYG = {
-					load_oob = BYG_neizhanfenbu_4
-				}
 			}
 	}
 	option = {
@@ -4505,6 +4510,12 @@ country_event = {
 		add_popularity = { ideology = neutrality popularity = -0.2 }
 		hidden_effect = {
 			country_event = { id = az_tianjiang.125 days = 1 }
+			CSA = {
+				load_oob = BYG_neizhanfenbu_3
+			}
+			BYG = {
+				load_oob = BYG_neizhanfenbu_4
+			}
 		}
 		ai_chance = {
 			factor = 100
@@ -4519,6 +4530,12 @@ country_event = {
 		add_popularity = { ideology = neutrality popularity = -0.2 }
 		hidden_effect = {
 			country_event = { id = az_tianjiang.125 days = 1 }
+			CSA = {
+				load_oob = BYG_neizhanfenbu_3
+			}
+			BYG = {
+				load_oob = BYG_neizhanfenbu_4
+			}
 		}
 		ai_chance = {
 			factor = 0
--- a/src/localisation/simp_chinese/az_organization_l_simp_chinese.yml
+++ b/src/localisation/simp_chinese/az_organization_l_simp_chinese.yml
@@ -1,16 +1,30 @@
 l_simp_chinese:
+  DOH_peoples_bank_of_china: "东煌人民银行"
+  DOH_publicity_department_of_central_committee: "东煌共产党中央委员会宣传部"
+  DOH_sinochem: "东煌化工集团"
+  DOH_china_state_construction_engineering_corporation: "东煌建筑工程总局"
+  DOH_china_railway_construction_corporation: "东煌铁道建筑总公司"
+  DOH_china_national_nuclear_corporation: "东煌核工业总公司"
+  DOH_showa_steel_works: "鞍山炼钢厂"
+  DOH_western_refinery: "西制油厂"
+  DOH_nanjing_wireless_electronics_plant: "南京无线电厂"
+  DOH_china_national_aviation_corporation: "东煌航空公司"
+  DOH_china_merchant_group: "招商局集团"
+  DOH_shanghai_power_company: "上海电力公司"
+  DOH_bank_of_china: "东煌银行"
+  DOH_yongli_chemical_industries: "永利化学工业"
  ##东煌军工组织##
  DOH_shanghai_tank: "上海联合装甲研究所"
+  DOH_first_tractor_company_organization: "洛阳第一拖拉机厂"
  DOH_baotoudiyijixiechang_organization: "包头第一机械厂"
  DOH_dalianzaochuan_organization: "大连造船厂"
  DOH_wuchangzaochuanchang_organization: "武昌船舶研究所"
  DOH_jiangnan_shipyard_group_organization: "江南造船厂"
  DOH_dagu_shipyard_organization: "大沽船坞"
-  DOH_camco_medium_organization: "东煌飞机制造集团-轰炸机分部"
-  DOH_camco_fighter_organization: "东煌飞机制造集团-战斗机分部"
-  DOH_camco_cas_organization: "东煌飞机制造集团-支援机分部"
-  DOH_camco_heavy_organization: "东煌飞机制造集团-大型飞机分部"
-  DOH_tongyonghangkong_organization: "东煌飞机制造集团-通用航空分部"
+  DOH_camco_heavy_organization: "西安飞机制造厂"
+  DOH_camco_fighter_organization: "成都飞机制造厂"
+  DOH_camco_cas_organization: "沈阳飞机制造厂"
+  DOH_harbin_aircraft_industry_group_organization: "哈尔滨飞机制造厂"
  DOH_taiyuan_arsenal_organization: "太原兵工厂"
  DOH_liaoning_arsenal_organization: "辽宁兵工厂"
  DOH_hanyan_arsenal_organization: "汉阳兵工厂"
--- a/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml
+++ b/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml
@@ -834,33 +834,33 @@
  DOH_tangnuwulianghai_name: "唐努乌梁海"
  DOH_wuliyasutai_name: "乌里雅苏台"
  DOH_liuqiu_name: "琉球"
-  VICTORY_POINTS_12043: "唐山"
-  VICTORY_POINTS_5100: "张掖"
-  VICTORY_POINTS_4525: "包头"
-  VICTORY_POINTS_12820: "敦煌"
-  VICTORY_POINTS_12432: "大同"
-  VICTORY_POINTS_5057: "武威"
-  VICTORY_POINTS_2028: "酒泉"
-  VICTORY_POINTS_4205: "威海"
-  VICTORY_POINTS_11931: "洛阳"
-  VICTORY_POINTS_7656: "开封"
-  VICTORY_POINTS_9781: "鞍山"
-  VICTORY_POINTS_9938: "汕头"
-  VICTORY_POINTS_7182: "潮州"
-  VICTORY_POINTS_3895: "本溪"
-  VICTORY_POINTS_9885: "抚顺"
-  VICTORY_POINTS_11808: "铁岭"
-  VICTORY_POINTS_9803: "通化"
-  VICTORY_POINTS_916: "四平"
-  VICTORY_POINTS_1200: "烟台"
-  VICTORY_POINTS_12141: "乐山"
-  VICTORY_POINTS_1367: "绵阳"
-  VICTORY_POINTS_11836: "通辽"
-  VICTORY_POINTS_7109: "保定"
-  VICTORY_POINTS_4205: "威海"
-  VICTORY_POINTS_11801: "承德"
-  VICTORY_POINTS_12055: "徐州"
-  VICTORY_POINTS_1055: "温州"
+  # VICTORY_POINTS_12043: "唐山"
+  # VICTORY_POINTS_5100: "张掖"
+  # VICTORY_POINTS_4525: "包头"
+  # VICTORY_POINTS_12820: "敦煌"
+  # VICTORY_POINTS_12432: "大同"
+  # VICTORY_POINTS_5057: "武威"
+  # VICTORY_POINTS_2028: "酒泉"
+  # VICTORY_POINTS_4205: "威海"
+  # VICTORY_POINTS_11931: "洛阳"
+  # VICTORY_POINTS_7656: "开封"
+  # VICTORY_POINTS_9781: "鞍山"
+  # VICTORY_POINTS_9938: "汕头"
+  # VICTORY_POINTS_7182: "潮州"
+  # VICTORY_POINTS_3895: "本溪"
+  # VICTORY_POINTS_9885: "抚顺"
+  # VICTORY_POINTS_11808: "铁岭"
+  # VICTORY_POINTS_9803: "通化"
+  # VICTORY_POINTS_916: "四平"
+  # VICTORY_POINTS_1200: "烟台"
+  # VICTORY_POINTS_12141: "乐山"
+  # VICTORY_POINTS_1367: "绵阳"
+  # VICTORY_POINTS_11836: "通辽"
+  # VICTORY_POINTS_7109: "保定"
+  # VICTORY_POINTS_4205: "威海"
+  # VICTORY_POINTS_11801: "承德"
+  # VICTORY_POINTS_12055: "徐州"
+  # VICTORY_POINTS_1055: "温州"
  ## 军民融合机制
  DOH_industry_decision_category: "东煌工业品"
  DOH_industry_decision_category_desc: "§C$doh_civ_equipment_1$§!盈余：[?FROM.num_equipment@doh_civ_equipment_1]"