2024-08-01 21:16:39

src/common/decisions/DH1_yuanzheng_decision.txt

@@ -73,7 +73,7 @@ DH1_decision_category = {
 				DH1 = {
 					has_country_flag = DOH_DH1_kaishiyuanzheng_flag
 				}
-				add = 100
+				add = 10
 			}
 			modifier = {
 				DH1 = {
@@ -84,8 +84,8 @@ DH1_decision_category = {
 		}
 		cost = 15
 		fire_only_once = no
-		days_remove = 10
-		days_re_enable = 30
+		days_remove = 5
+		days_re_enable = 10
 		complete_effect = {
 			FROM = {
 				random_controlled_state = {

src/common/ideas/dh1.txt

@@ -1,10 +1,10 @@
 ideas = {
 	hidden_ideas = {
-		DH1_weilai = {
-			modifier = {
-				generate_wargoal_tension = -1
-			}
-		}
+		# DH1_weilai = {
+		# 	modifier = {
+		# 		generate_wargoal_tension = -1
+		# 	}
+		# }
 		DH1_weicao = {
 			allowed_civil_war = {
 				always = yes
@@ -85,15 +85,15 @@ ideas = {
 			allowed_civil_war = {
 				always = yes
 			}
-			cancel = {
-				has_war_with = DOH
-			}
+			# cancel = {
+			# 	has_war_with = DOH
+			# }
 			modifier = {
 				local_resources_factor = 0.25
 				production_speed_arms_factory_factor = 0.1
 				supply_consumption_factor = -0.15
 				no_supply_grace = 5
-				custom_modifier_tooltip = DH1_kaizhanquxiao_ideatt
+			#	custom_modifier_tooltip = DH1_kaizhanquxiao_ideatt
 				custom_modifier_tooltip = az_hidden_ideas
 			}
 		}
@@ -244,6 +244,9 @@ ideas = {
 				trade_opinion_factor = 0.25
 				conscription_factor = 0.1
 				monthly_population = 0.1
+				production_speed_buildings_factor = 0.05
+				industrial_capacity_factory = 0.05
+				supply_factor = 0.1
 			}
 		}
 		DH1_zhonghuaidongxi = {
@@ -271,7 +274,7 @@ ideas = {
 				production_speed_arms_factory_factor = 0.25
 				consumer_goods_factor = -0.3
 				army_org_factor = -0.1
-				army_morale_factor = -0.1
+				
 				supply_consumption_factor = -0.33
 				no_supply_grace = 12
 			}
@@ -374,6 +377,331 @@ ideas = {
 				production_lack_of_resource_penalty_factor = -0.25
 			}
 		}
+		DH1_neizheng_1 = {
+			picture = generic_morale_bonus
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				opinion_gain_monthly_factor = 0.2
+				trade_opinion_factor = 0.25
+				conscription_factor = 0.1
+				monthly_population = 0.1
+
+				compliance_growth = 0.2
+				research_speed_factor = 0.25
+				conscription = 0.01
+				non_core_manpower = 0.25
+				stability_factor = 0.1
+				war_support_factor = 0.1
+				weekly_manpower = 1000
+
+				production_speed_buildings_factor = 0.05
+				industrial_capacity_factory = 0.05
+				supply_factor = 0.1
+			}
+		}
+		DH1_neizheng_2 = {
+			picture = generic_morale_bonus
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				compliance_growth = 0.2
+				research_speed_factor = 0.30
+				conscription = 0.01
+				non_core_manpower = 0.25
+				stability_factor = 0.1
+				war_support_factor = 0.1
+				weekly_manpower = 1000
+				trade_opinion_factor = -0.25
+				conscription_factor = -0.1
+				consumer_goods_factor = -0.2
+			}
+			research_bonus = {
+				synth_resources = 0.25
+			}
+		}
+		DH1_neizheng_11 = {
+			picture = generic_morale_bonus
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				opinion_gain_monthly_factor = 0.2
+				trade_opinion_factor = 0.25
+				conscription_factor = 0.1
+				monthly_population = 0.1
+
+				compliance_growth = 0.2
+				research_speed_factor = 0.25
+				conscription = 0.01
+				non_core_manpower = 0.25
+				stability_factor = 0.1
+				war_support_factor = 0.1
+				weekly_manpower = 1000
+
+				consumer_goods_factor = -0.1
+				min_export = -0.2
+				production_lack_of_resource_penalty_factor = -0.25
+
+				local_resources_factor = 0.25
+				production_speed_arms_factory_factor = 0.1
+				supply_consumption_factor = -0.15
+				no_supply_grace = 5
+
+				production_speed_buildings_factor = 0.05
+				industrial_capacity_factory = 0.05
+				supply_factor = 0.1
+			}
+		}
+		DH1_neizheng_21 = {
+			picture = generic_morale_bonus
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				compliance_growth = 0.2
+				research_speed_factor = 0.30
+				conscription = 0.01
+				non_core_manpower = 0.25
+				stability_factor = 0.1
+				war_support_factor = 0.1
+				weekly_manpower = 1000
+				trade_opinion_factor = -0.25
+				conscription_factor = -0.1
+				consumer_goods_factor = -0.3
+				min_export = -0.2
+				production_lack_of_resource_penalty_factor = -0.25
+
+				local_resources_factor = 0.25
+				production_speed_arms_factory_factor = 0.1
+				supply_consumption_factor = -0.15
+				no_supply_grace = 5
+			}
+			research_bonus = {
+				synth_resources = 0.25
+			}
+		}
+		DH1_neizheng_111 = {
+			picture = generic_morale_bonus
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				opinion_gain_monthly_factor = 0.2
+				trade_opinion_factor = 0.75
+				conscription_factor = 0.1
+				monthly_population = 0.1
+
+				compliance_growth = 0.2
+				research_speed_factor = 0.25
+				conscription = 0.01
+				non_core_manpower = 0.25
+				stability_factor = 0.1
+				war_support_factor = 0.1
+				weekly_manpower = 1000
+
+				consumer_goods_factor = -0.1
+				min_export = -0.1
+				production_lack_of_resource_penalty_factor = -0.25
+
+				local_resources_factor = 0.40
+				production_speed_arms_factory_factor = 0.1
+				supply_consumption_factor = -0.15
+				no_supply_grace = 5
+
+				production_speed_buildings_factor = 0.05
+				industrial_capacity_factory = 0.05
+				supply_factor = 0.1
+			}
+		}
+		DH1_neizheng_211 = {
+			picture = generic_morale_bonus
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				compliance_growth = 0.2
+				research_speed_factor = 0.30
+				conscription = 0.01
+				non_core_manpower = 0.25
+				stability_factor = 0.1
+				war_support_factor = 0.1
+				weekly_manpower = 1000
+				trade_opinion_factor = 0.25
+				conscription_factor = -0.1
+				consumer_goods_factor = -0.3
+				min_export = -0.1
+				production_lack_of_resource_penalty_factor = -0.25
+
+				local_resources_factor = 0.4
+				production_speed_arms_factory_factor = 0.1
+				supply_consumption_factor = -0.15
+				no_supply_grace = 5
+
+			}
+			research_bonus = {
+				synth_resources = 0.25
+			}
+		}
+		DH1_junshi_1 = {
+			picture = generic_victors_of_ww1
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				production_speed_arms_factory_factor = 0.25
+				consumer_goods_factor = -0.3
+				army_org_factor = -0.1
+				
+				supply_consumption_factor = -0.33
+				no_supply_grace = 12
+				acclimatization_hot_climate_gain_factor = 0.50
+			}
+		}
+		DH1_junshi_2 = {
+			picture = generic_victors_of_ww1
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				army_org_factor = 0.1
+				army_morale_factor = 0.15
+				conscription = 0.02
+				experience_gain_army_factor = 0.1 
+				experience_gain_army_unit_factor = 0.15
+				acclimatization_hot_climate_gain_factor = 0.50
+			}
+		}
+		DH1_junshi_11 = {
+			picture = generic_victors_of_ww1
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				army_org_factor = 0.15
+				army_org_regain = 0.25
+				production_speed_arms_factory_factor = 0.25
+				consumer_goods_factor = -0.3
+				
+				supply_consumption_factor = -0.33
+				no_supply_grace = 12
+				acclimatization_hot_climate_gain_factor = 0.50
+			}
+		}
+		DH1_junshi_21 = {
+			picture = generic_victors_of_ww1
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				army_org_factor = 0.35
+				army_org_regain = 0.25
+				army_morale_factor = 0.15
+				conscription = 0.02
+				experience_gain_army_factor = 0.1 
+				experience_gain_army_unit_factor = 0.15
+				acclimatization_hot_climate_gain_factor = 0.50
+			}
+		}
+		DH1_junshi_111 = {
+			picture = generic_victors_of_ww1
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				army_org_factor = 0.15
+				army_org_regain = 0.25
+				production_speed_arms_factory_factor = 0.25
+				consumer_goods_factor = -0.3
+				
+				supply_consumption_factor = -0.33
+				no_supply_grace = 12
+				acclimatization_hot_climate_gain_factor = 0.50
+				send_volunteer_size = 10
+				send_volunteers_tension = -1
+				send_volunteer_divisions_required = -1
+				line_change_production_efficiency_factor = 0.15
+			}
+			equipment_bonus = {
+				armor =  {
+				    soft_attack = 0.05
+					hard_attack = 0.05
+					reliability_factor = 0.05
+					build_cost_ic = -0.10
+					instant = yes
+				}
+			}
+			targeted_modifier = {
+				tag = YUW
+				attack_bonus_against = 0.5
+				defense_bonus_against = 0.5
+			}
+			targeted_modifier = {
+				tag = RAJ
+				attack_bonus_against = 0.5
+				defense_bonus_against = 0.5
+			}
+			targeted_modifier = {
+				tag = CHY
+				attack_bonus_against = 0.5
+				defense_bonus_against = 0.5
+			}
+			targeted_modifier = {
+				tag = HUJ
+				attack_bonus_against = 0.5
+				defense_bonus_against = 0.5
+			}
+		}
+		DH1_junshi_211 = {
+			picture = generic_victors_of_ww1
+			allowed_civil_war = {
+				always = yes
+			}
+			modifier = {
+				army_org_factor = 0.35
+				army_org_regain = 0.25
+				army_morale_factor = 0.15
+				conscription = 0.02
+				experience_gain_army_factor = 0.1 
+				experience_gain_army_unit_factor = 0.15
+				acclimatization_hot_climate_gain_factor = 0.50
+				send_volunteer_size = 10
+				send_volunteers_tension = -1
+				send_volunteer_divisions_required = -1
+				line_change_production_efficiency_factor = 0.15
+			}
+			equipment_bonus = {
+				armor =  {
+				    soft_attack = 0.05
+					hard_attack = 0.05
+					reliability_factor = 0.05
+					build_cost_ic = -0.10
+					instant = yes
+				}
+			}
+			targeted_modifier = {
+				tag = YUW
+				attack_bonus_against = 0.5
+				defense_bonus_against = 0.5
+			}
+			targeted_modifier = {
+				tag = RAJ
+				attack_bonus_against = 0.5
+				defense_bonus_against = 0.5
+			}
+			targeted_modifier = {
+				tag = CHY
+				attack_bonus_against = 0.5
+				defense_bonus_against = 0.5
+			}
+			targeted_modifier = {
+				tag = HUJ
+				attack_bonus_against = 0.5
+				defense_bonus_against = 0.5
+			}
+		}
 	}
 
 	political_advisor = {

src/common/national_focus/donghuangyuanzhengjun.txt

@@ -57,8 +57,8 @@
 		id = DH1_lvyouzhinan
 		icon = GFX_focus_eng_concessions_to_the_trade_unions
 		relative_position_id = DH1_querentongshuai
-		x = 2
-		y = 1
+		x = 4
+		y = 0
 		cost = 5
 		
 		ai_will_do = {
@@ -149,7 +149,16 @@
 		prerequisite = {
 			focus = DH1_querentongshuai
 		}
-		x = 0
+		prerequisite = {
+			focus = DH1_pingdingpanluan
+		}
+		prerequisite = {
+			focus = DH1_lvyouzhinan
+		}
+		prerequisite = {
+			focus = DH1_xuewaiyu
+		}
+		x = 1
 		y = 1
 		cost = 7
 		
@@ -325,7 +334,7 @@
 			focus = DH1_dalikaifakuangchan
 		}
 		x = 1
-		y = 2
+		y = 1
 		cost = 4
 		
 		ai_will_do = {
@@ -391,7 +400,7 @@
 			focus = DH1_zhengdunjunji
 		}
 		x = 0
-		y = 1
+		y = 2
 		cost = 4
 		
 		ai_will_do = {
@@ -527,7 +536,7 @@
 		prerequisite = {
 			focus = DH1_beibeibeiqilexingnang
 		}
-		x = 0
+		x = 1
 		y = 1
 		cost = 4
 		
@@ -553,11 +562,11 @@
 	focus = {
 		id = DH1_shengchanjianshejidi
 		icon = GFX_focus_generic_self_management
-		relative_position_id = DH1_junkenhetuntian
+		relative_position_id = DH1_beibeibeiqilexingnang
 		prerequisite = {
-			focus = DH1_junkenhetuntian
+			focus = DH1_beibeibeiqilexingnang
 		}
-		x = 0
+		x = -1
 		y = 1
 		cost = 4
 		
@@ -595,8 +604,8 @@
 		prerequisite = {
 			focus = DH1_shengchanjianshejidi
 		}
-		x = -3
-		y = 1
+		x = -2
+		y = 2
 		cost = 10
 		
 		ai_will_do = {
@@ -649,19 +658,26 @@
 	focus = {
 		id = DH1_zhonghuaidongxi
 		icon = GFX_focus_generic_agricultural_subsidies
-		relative_position_id = DH1_shengchanjianshejidi
+		relative_position_id = DH1_beibeibeiqilexingnang
 		prerequisite = {
 			focus = DH1_shengchanjianshejidi
 		}
+		prerequisite = {
+			focus = DH1_junkenhetuntian
+		}
 		mutually_exclusive = {
 			focus = DH1_zhonghaodongxi
 		}
 		x = -1
-		y = 1
+		y = 2
 		cost = 10
 		
 		ai_will_do = {
-			factor = 5
+			base = 5
+			modifier = {
+				has_country_flag = DOH_DH1_kaishiyuanzheng_flag
+				add = -5
+			}
 		}
 		available = {
 			#date < 1939.01.01
@@ -718,19 +734,26 @@
 	focus = {
 		id = DH1_zhonghaodongxi
 		icon = GFX_focus_generic_agricultural_subsidies
-		relative_position_id = DH1_shengchanjianshejidi
+		relative_position_id = DH1_beibeibeiqilexingnang
 		prerequisite = {
 			focus = DH1_shengchanjianshejidi
 		}
+		prerequisite = {
+			focus = DH1_junkenhetuntian
+		}
 		mutually_exclusive = {
 			focus = DH1_zhonghuaidongxi
 		}
 		x = 1
-		y = 1
+		y = 2
 		cost = 10
 		
 		ai_will_do = {
-			factor = 5
+			base = 5
+			modifier = {
+				has_country_flag = DOH_DH1_kaishiyuanzheng_flag
+				add = 10
+			}
 		}
 		available = {
 			
@@ -823,7 +846,7 @@
 		prerequisite = {
 			focus = DH1_minshengjianshe
 		}
-		x = -2
+		x = 2
 		y = 1
 		cost = 10
 		
@@ -862,9 +885,9 @@
 		prerequisite = {
 			focus = DH1_jiaohuayuanzhumin
 		}
-		prerequisite = {
-			focus = DH1_qingqiuzhijiao
-		}
+		# prerequisite = {
+		# 	focus = DH1_qingqiuzhijiao
+		# }
 		x = 0
 		y = 2
 		cost = 3
@@ -1058,9 +1081,9 @@
 		icon = GFX_goal_generic_construct_civilian
 		relative_position_id = DH1_minshengjianshe
 		prerequisite = {
-			focus = DH1_minshengjianshe
+			focus = DH1_junkenhetuntian
 		}
-		x = 2
+		x = -2
 		y = 1
 		cost = 4
 		
@@ -1138,8 +1161,8 @@
 		prerequisite = {
 			focus = DH1_qingqiuzhijiao
 		}
-		x = -1
-		y = 2
+		x = 1
+		y = 1
 		cost = 3
 		
 		ai_will_do = {
@@ -1171,17 +1194,32 @@
 	focus = {
 		id = DH1_jiaqianglianluo
 		icon = GFX_goal_generic_improve_relations
-		x = 34
-		y = 0
+		x = 0
+		relative_position_id = DH1_beibeibeiqilexingnang
+		y = 5
 		cost = 5
 		
 		ai_will_do = {
 			factor = 10
 		}
 		available = {
-			
+			has_idea = DH1_idea_baohunpei
+			has_idea = DH1_tongyiyuyan
+			has_idea = DH1_idea_qinfenhaoxue
+			has_idea = DH1_idea_naire
+			OR = {
+				has_idea = DH1_zhonghaodongxi
+				has_idea = DH1_zhonghuaidongxi
+			}
+			OR = {
+				has_idea = DH1_ziligengshengdejundui
+				has_idea = DH1_baozhangjunfei
+			}
+		}
+		prerequisite = {
+			focus = DH1_ziligengshengdejundui
+			focus = DH1_baozhangjunfei
 		}
-		
 		cancel_if_invalid = yes
 		continue_if_invalid = no
 		available_if_capitulated = no
@@ -1190,7 +1228,42 @@
 
 		#search_filters = { FOCUS_FILTER_STABILITY }
 		completion_reward = {
+			add_research_slot = 1
 			add_political_power = 200
+			hidden_effect = {
+				remove_ideas = DH1_idea_baohunpei
+				remove_ideas = DH1_tongyiyuyan
+				remove_ideas = DH1_idea_qinfenhaoxue
+				remove_ideas = DH1_idea_naire
+				remove_ideas = DH1_zhonghaodongxi
+				remove_ideas = DH1_zhonghuaidongxi
+				remove_ideas = DH1_ziligengshengdejundui
+				remove_ideas = DH1_baozhangjunfei
+				if = {
+					limit = {
+						has_completed_focus = DH1_zhonghaodongxi
+					}
+					add_ideas = DH1_neizheng_1
+				}
+				else_if = {
+					limit = {
+						has_completed_focus = DH1_zhonghuaidongxi
+					}
+					add_ideas = DH1_neizheng_2
+				}
+				if = {
+					limit = {
+						has_completed_focus = DH1_ziligengshengdejundui
+					}
+					add_ideas = DH1_junshi_1
+				}
+				else_if = {
+					limit = {
+						has_completed_focus = DH1_baozhangjunfei
+					}
+					add_ideas = DH1_junshi_2
+				}
+			}
 		}
 	}
 	
@@ -1220,6 +1293,7 @@
 		#search_filters = { FOCUS_FILTER_STABILITY }
 		completion_reward = {
 			add_political_power = 100
+			
 			DH1_xinrenjingtidu_up_10 = yes
 		}
 	}
@@ -1256,7 +1330,7 @@
 		id = DH1_gengduoyaoqiu
 		icon = GFX_focus_generic_concessions
 		x = 0
-		y = 1
+		y = 3
 		cost = 5
 		relative_position_id = DH1_jiaqianglianluo
 		prerequisite = {
@@ -1359,8 +1433,8 @@
 	focus = {
 		id = DH1_kuozhankongzhongluxian
 		icon = GFX_focus_generic_air_bases
-		x = -3
-		y = 1
+		x = 4
+		y = 3
 		cost = 3
 		relative_position_id = DH1_gengduoyaoqiu
 		prerequisite = {
@@ -1420,8 +1494,8 @@
 	focus = {
 		id = DH1_kuozhanhaiyunluxian
 		icon = GFX_goal_generic_navy_cruiser
-		x = 3
-		y = 1
+		x = -4
+		y = 3
 		cost = 3
 		relative_position_id = DH1_gengduoyaoqiu
 		prerequisite = {
@@ -1476,15 +1550,18 @@
 	focus = {
 		id = DH1_guojimaoyi
 		icon = GFX_goal_generic_positive_trade_relations
-		x = 0
-		y = 3
+		x = 1
+		y = 1
 		cost = 5
-		relative_position_id = DH1_kuozhanhaiyunluxian
+		relative_position_id = DH1_yuanjiao
+		# prerequisite = {
+		# 	focus = DH1_kuozhanhaiyunluxian
+		# }
+		# prerequisite = {
+		# 	focus = DH1_zousitongdao
+		# }
 		prerequisite = {
-			focus = DH1_kuozhanhaiyunluxian
-		}
-		prerequisite = {
-			focus = DH1_zousitongdao
+			focus = DH1_yuanjiao
 		}
 		ai_will_do = {
 			factor = 6
@@ -1515,7 +1592,7 @@
 	focus = {
 		id = DH1_kuodajunxuyunshu
 		icon = GFX_focus_generic_railroad
-		x = -2
+		x = 2
 		y = 1
 		cost = 5
 		relative_position_id = DH1_ludilianjie
@@ -1553,7 +1630,7 @@
 	focus = {
 		id = DH1_zousitongdao
 		icon = GFX_focus_generic_supply_line
-		x = 2
+		x = -2
 		y = 1
 		cost = 5
 		relative_position_id = DH1_ludilianjie
@@ -1600,23 +1677,33 @@
 		id = DH1_yixiandemiling
 		icon = GFX_focus_yixian
 		x = 0
-		y = 3
+		y = 4
 		cost = 1
-		relative_position_id = DH1_kuozhankongzhongluxian
+		relative_position_id = DH1_gengduoyaoqiu
+		prerequisite = {
+			focus = DH1_kuozhankongzhongluxian
+		}
+		prerequisite = {
+			focus = DH1_kuozhanhaiyunluxian
+		}
+		prerequisite = {
+			focus = DH1_ludilianjie
+		}
 		# prerequisite = {
 		# 	focus = DH1_kuodajunxuyunshu
 		# }
 		# mutually_exclusive = {
 		# 	focus = DH1_jiangzaiwaijunmingyousuobushou
 		# }
-		prerequisite = {
-			focus = DH1_kuozhankongzhongluxian
-		}
+		# prerequisite = {
+		# 	focus = DH1_kuozhankongzhongluxian
+		# }
 		ai_will_do = {
 			factor = 20
 		}
 		available = {
 			has_country_flag = DH1_jieshoushouling
+			has_completed_focus = DH1_kuozhankongzhongluxian
 		}
 		
 		cancel_if_invalid = yes
@@ -1635,18 +1722,18 @@
 	focus = {
 		id = DH1_jiangzaiwaijunmingyousuobushou
 		icon = GFX_focus_renounce_the_treaty_of_trianon
-		x = -2
-		y = 1
+		x = 0
+		y = 5
 		cost = 1
-		relative_position_id = DH1_yixiandemiling
-		prerequisite = {
-			focus = DH1_yixiandemiling
-		}
+		relative_position_id = DH1_jiaohuayuanzhumin
+		# prerequisite = {
+		# 	focus = DH1_yixiandemiling
+		# }
 		mutually_exclusive = {
 			focus = DH1_jugongjincusierhouyi
 		}
 		ai_will_do = {
-			factor = 0
+			base = 0
 			modifier = {
 				has_game_rule = {
 					rule = DH1_ai_behavior
@@ -1670,7 +1757,7 @@
 			}
 		}
 		available = {
-
+			has_completed_focus = DH1_yixiandemiling
 		}
 		
 		cancel_if_invalid = yes
@@ -1690,8 +1777,8 @@
 	focus = {
 		id = DH1_xiangbentuzhengbing
 		icon = GFX_focus_manjiu
-		x = 0
-		y = 1
+		x = 1
+		y = 2
 		cost = 5
 		relative_position_id = DH1_ludilianjie
 		prerequisite = {
@@ -1723,12 +1810,12 @@
 	focus = {
 		id = DH1_zhaopingzhishimanjiu
 		icon = GFX_focus_generic_university_3
-		x = 0
-		y = 1
+		x = -1
+		y = 2
 		cost = 5
-		relative_position_id = DH1_xiangbentuzhengbing
+		relative_position_id = DH1_ludilianjie
 		prerequisite = {
-			focus = DH1_xiangbentuzhengbing
+			focus = DH1_ludilianjie
 		}
 		ai_will_do = {
 			factor = 10
@@ -1753,18 +1840,18 @@
 	focus = {
 		id = DH1_jugongjincusierhouyi
 		icon = GFX_focus_ITA_corpo_volontari_della_liberta
-		x = 2
-		y = 1
+		x = 0
+		y = 3
 		cost = 1
-		relative_position_id = DH1_yixiandemiling
-		prerequisite = {
-			focus = DH1_yixiandemiling
-		}
+		relative_position_id = DH1_chuansongjiaxiangxiaoqu
+		# prerequisite = {
+		# 	focus = DH1_yixiandemiling
+		# }
 		mutually_exclusive = {
 			focus = DH1_jiangzaiwaijunmingyousuobushou
 		}
 		ai_will_do = {
-			factor = 20
+			base = 20
 			modifier = {
 				has_game_rule = {
 					rule = DH1_ai_behavior
@@ -1774,7 +1861,7 @@
 			}
 		}
 		available = {
-			
+			has_completed_focus = DH1_yixiandemiling
 		}
 		
 		cancel_if_invalid = yes
@@ -1802,7 +1889,7 @@
 		id = DH1_jieshouwzhidao
 		icon = GFX_goal_generic_forceful_treaty
 		x = 0
-		y = 1
+		y = 3
 		cost = 4
 		relative_position_id = DH1_jugongjincusierhouyi
 		prerequisite = {
@@ -1832,12 +1919,15 @@
 		id = DH1_yuanzhengjundeweilai
 		icon = GFX_focus_donghuang
 		x = 0
-		y = 4
+		y = 6
 		cost = 7
 		relative_position_id = DH1_jugongjincusierhouyi
 		prerequisite = {
 			focus = DH1_jieshouwzhidao
 		}
+		mutually_exclusive = {
+			focus = DH1_xinanshibian
+		}
 		ai_will_do = {
 			factor = 1
 		}
@@ -1862,7 +1952,7 @@
 				can_puppet = yes
 				can_force_government = yes
 			}
-			add_ideas = DH1_weilai
+			#add_ideas = DH1_weilai
 			DOH = {
 				country_event = DH1_event.7
 			}
@@ -1950,7 +2040,7 @@
 		id = DH1_xinanshibian
 		icon = GFX_goal_generic_major_war
 		x = 0
-		y = 4
+		y = 6
 		cost = 5
 		relative_position_id = DH1_jiangzaiwaijunmingyousuobushou
 		prerequisite = {
@@ -1964,7 +2054,9 @@
 		available = {
 			
 		}
-		
+		mutually_exclusive = {
+			focus = DH1_yuanzhengjundeweilai
+		}
 		cancel_if_invalid = yes
 		continue_if_invalid = no
 		available_if_capitulated = no
@@ -2112,46 +2204,50 @@
 		}
 	}
 
-	focus = {
-		id = DH1_zongtizhan
-		icon = GFX_goal_generic_major_war
-		relative_position_id = DH1_jiaqianglianluo
-		x = 7
-		y = 2
-		cost = 5
-		ai_will_do = {
-			factor = 20
-		}
-		prerequisite = {
-			focus = DH1_gengduoyaoqiu
-		}
+	# focus = {
+	# 	id = DH1_zongtizhan
+	# 	icon = GFX_goal_generic_major_war
+	# 	relative_position_id = DH1_yixiandemiling
+	# 	x = 0
+	# 	y = 2
+	# 	cost = 5
+	# 	ai_will_do = {
+	# 		factor = 20
+	# 	}
+	# 	prerequisite = {
+	# 		focus = DH1_yixiandemiling
+	# 	}
 		
-		cancel_if_invalid = yes
-		continue_if_invalid = no
-		available_if_capitulated = no
+	# 	cancel_if_invalid = yes
+	# 	continue_if_invalid = no
+	# 	available_if_capitulated = no
 
 
 
-		#search_filters = { FOCUS_FILTER_STABILITY }
-		completion_reward = {
-			add_ideas = DH1_zongtizhan_idea
-		}
-	}
+	# 	#search_filters = { FOCUS_FILTER_STABILITY }
+	# 	completion_reward = {
+	# 		add_ideas = DH1_zongtizhan_idea
+	# 	}
+	# }
 	focus = {
 		id = DH1_yuanzhengkaishi
 		icon = GFX_focus_SWE_refuge_from_war
+		relative_position_id = DH1_yixiandemiling
 		x = 0
-		y = 1
-		cost = 5
-		relative_position_id = DH1_zongtizhan
+		y = 2
+		cost = 3
 		prerequisite = {
-			focus = DH1_zongtizhan
+			focus = DH1_yixiandemiling
+			# focus = DH1_yuanzhengjundeweilai
+			# focus = DH1_xinanshibian
 		}
 		ai_will_do = {
 			factor = 20
 		}
 		available = {
-			has_completed_focus = DH1_beibeibeiqilexingnang
+			NOT = {
+				has_war_with = DOH
+			}
 		}
 		
 		cancel_if_invalid = yes
@@ -2164,13 +2260,54 @@
 		completion_reward = {
 			TY_lujunliluntupo = yes
 			set_technology = { guerrilla_tactics_for_doh = 1 popup = no }
+			#add_ideas = DH1_zongtizhan_idea
+			hidden_effect = {
+				remove_ideas = DH1_zousitongdao
+				remove_ideas = DH1_kuodajunxuyunshu
+			}
+			if = {
+					limit = {
+						has_idea = DH1_neizheng_1
+					}
+					swap_ideas = {
+						remove_idea = DH1_neizheng_1
+						add_idea = DH1_neizheng_11
+					}
+				}
+				else_if = {
+					limit = {
+						has_idea = DH1_neizheng_2
+					}
+					swap_ideas = {
+						remove_idea = DH1_neizheng_2
+						add_idea = DH1_neizheng_21
+					}
+				}
+				if = {
+					limit = {
+						has_idea = DH1_junshi_1
+					}
+					swap_ideas = {
+						remove_idea = DH1_junshi_1
+						add_idea = DH1_junshi_11
+					}
+				}
+				else_if = {
+					limit = {
+						has_idea = DH1_junshi_2
+					}
+					swap_ideas = {
+						remove_idea = DH1_neizheng_2
+						add_idea = DH1_neizheng_21
+					}
+				}
 		}
 	}
 
 	focus = {
 		id = DH1_jingong
 		icon = GFX_focus_generic_provoke_border_clashes
-		x = 2
+		x = 3
 		y = 1
 		cost = 5
 		relative_position_id = DH1_yuanzhengkaishi
@@ -2204,7 +2341,7 @@
 		id = DH1_qinsuanzhimingzhe
 		icon = GFX_focus_generic_support_the_left_right
 		x = 0
-		y = 1
+		y = 2
 		cost = 5
 		relative_position_id = DH1_jingong
 		prerequisite = {
@@ -2239,10 +2376,10 @@
 	focus = {
 		id = DH1_nanyacidalu
 		icon = GFX_focus_attack_india
-		x = 1
+		x = 0
 		y = 1
 		cost = 5
-		relative_position_id = DH1_qinsuanzhimingzhe
+		relative_position_id = DH1_donghuangzhiyuanjun
 		prerequisite = {
 			focus = DH1_qinsuanzhimingzhe
 		}
@@ -2318,54 +2455,67 @@
 			custom_effect_tooltip = DH1_zhongnanbandao_mission_tooltip
 		}
 	}
-
 	focus = {
-		id = DH1_fuchifeizhoufanzhimingdouzheng
-		icon = GFX_focus_generic_africa_liberation
-		x = -3
-		y = 1
-		cost = 10
+		id = DH1_donghuangzhiyuanjun
+		icon = GFX_focus_generic_support_the_left_right
+		cost = 3
 		relative_position_id = DH1_qinsuanzhimingzhe
 		prerequisite = {
 			focus = DH1_qinsuanzhimingzhe
 		}
-		prerequisite = {
-			focus = DH1_yuanjiao
-		}
-		ai_will_do = {
-			factor = 5
-		}
 		available = {
-			has_army_manpower = {
-				size > 500000
-			}
+			has_army_manpower = { size > 50000 }
 		}
-		
-		cancel_if_invalid = yes
-		continue_if_invalid = no
-		available_if_capitulated = no
-
-
-
-		#search_filters = { FOCUS_FILTER_STABILITY }
+		x = 1
+		y = 1
 		completion_reward = {
 			add_ideas = DH1_zhiyuanjun_idea
 		}
 	}
+	# focus = {
+	# 	id = DH1_fuchifeizhoufanzhimingdouzheng
+	# 	icon = GFX_focus_generic_africa_liberation
+	# 	x = -3
+	# 	y = 1
+	# 	cost = 10
+	# 	relative_position_id = DH1_qinsuanzhimingzhe
+	# 	# prerequisite = {
+	# 	# 	focus = DH1_qinsuanzhimingzhe
+	# 	# }
+	# 	# prerequisite = {
+	# 	# 	focus = DH1_yuanjiao
+	# 	# }
+	# 	ai_will_do = {
+	# 		factor = 5
+	# 	}
+	# 	available = {
+	# 		has_army_manpower = {
+	# 			size > 500000
+	# 		}
+	# 	}
+		
+	# 	cancel_if_invalid = yes
+	# 	continue_if_invalid = no
+	# 	available_if_capitulated = no
+
+
+
+	# 	#search_filters = { FOCUS_FILTER_STABILITY }
+	# 	completion_reward = {
+	# 		add_ideas = DH1_zhiyuanjun_idea
+	# 	}
+	# }
 
 	focus = {
 		id = DH1_xiananyang
 		icon = GFX_focus_ninghai
 		x = 0
-		y = 2
+		y = 1
 		cost = 10
-		relative_position_id = DH1_qinsuanzhimingzhe
+		relative_position_id = DH1_zhongnanbandao
 		prerequisite = {
 			focus = DH1_zhongnanbandao
 		}
-		prerequisite = {
-			focus = DH1_nanyacidalu
-		}
 		ai_will_do = { 
 			base = 0
 			
@@ -2479,8 +2629,8 @@
 	focus = {
 		id = DH1_yuanjiao
 		icon = GFX_focus_generic_diplomatic_treaty
-		x = -2
-		y = 2
+		x = -3
+		y = 1
 		cost = 5
 		relative_position_id = DH1_yuanzhengkaishi
 		prerequisite = {
@@ -2501,7 +2651,8 @@
 
 		#search_filters = { FOCUS_FILTER_STABILITY }
 		completion_reward = {
-			add_ideas = DH1_yuanjiao_idea
+			add_political_power = 200
+			#add_ideas = DH1_yuanjiao_idea
 		}
 	}
 	focus = {
@@ -2533,7 +2684,7 @@
 	focus = {
 		id = DH1_tiexuezhuangjiajishu
 		icon = GFX_fflag_TIX
-		x = -3
+		x = -1
 		y = 1
 		cost = 10
 		relative_position_id = DH1_qianshuguojixieyi
@@ -2569,7 +2720,7 @@
 		id = DH1_baiyinghangkonggongye
 		icon = GFX_fflag_BYG
 		x = -1
-		y = 1
+		y = 2
 		cost = 10
 		relative_position_id = DH1_qianshuguojixieyi
 		prerequisite = {
@@ -2627,7 +2778,7 @@
 		id = DH1_beiliandazongshenzuozhan
 		icon = GFX_fflag_BFL
 		x = 1
-		y = 1
+		y = 2
 		cost = 10
 		relative_position_id = DH1_qianshuguojixieyi
 		prerequisite = {
@@ -2667,7 +2818,7 @@
 	focus = {
 		id = DH1_laizidongfangdezhichi
 		icon = GFX_fflag_CHY
-		x = 3
+		x = 1
 		y = 1
 		cost = 10
 		relative_position_id = DH1_qianshuguojixieyi
@@ -2713,9 +2864,9 @@
 		prerequisite = {
 			focus = DH1_yuanjiao
 		}
-		prerequisite = {
-			focus = DH1_guojimaoyi
-		}
+		# prerequisite = {
+		# 	focus = DH1_guojimaoyi
+		# }
 		ai_will_do = {
 			factor = 6
 		}
@@ -2734,4 +2885,59 @@
 			add_ideas = DOH_ndhhsygs
 		}
 	}
+	focus = {
+		id = DH1_qianjin
+		icon = GFX_fflag_DOH
+		cost = 1
+		relative_position_id = DH1_yuanzhengkaishi
+		prerequisite = {
+			focus = DH1_qinsuanzhimingzhe
+		}
+		prerequisite = {
+			focus = DH1_qianshuguojixieyi
+		}
+		x = 0
+		y = 6
+		available = {
+			has_idea = DH1_qingsuanzhimingzhe_idea
+			has_idea = DH1_zhiyuanjun_idea
+			has_idea = DOH_ndhhsygs
+			has_idea = TIX_zjscl
+			OR = {
+				OR = {
+					is_ai = yes
+					has_completed_focus = DH1_xiananyang
+				}
+				date > 1943.1.1
+				threat > 0.75
+			}
+		}
+		completion_reward = {
+			hidden_effect = {
+				remove_ideas = DH1_qingsuanzhimingzhe_idea
+				remove_ideas = DH1_zhiyuanjun_idea
+				remove_ideas = DOH_ndhhsygs
+				remove_ideas = TIX_zjscl
+			}
+			if = {
+				limit = {
+					has_idea = DH1_junshi_11
+				}
+				swap_ideas = {
+					remove_idea = DH1_junshi_11
+					add_idea = DH1_junshi_111
+				}
+			}
+			else_if = {
+				limit = {
+					has_idea = DH1_junshi_21
+				}
+				swap_ideas = {
+					remove_idea = DH1_junshi_21
+					add_idea = DH1_junshi_211
+				}
+			}
+			custom_effect_tooltip = "（未完待续）"
+		}
+	}
 }

src/localisation/simp_chinese/azc_DH1_l_simp_chinese.yml

@@ -96,6 +96,8 @@
  DH1_zhaopingzhishimanjiu_desc: "我们应该扩建一所自己的大学。"
  DH1_jugongjincusierhouyi: "鞠躬尽瘁死而后已"
  DH1_jugongjincusierhouyi_desc: "听妈妈的话~"
+ DH1_donghuangzhiyuanjun: "东煌志愿军"
+ DH1_donghuangzhiyuanjun_desc: "我们将帮助所有受压迫的民族。"
  DH1_zongtizhan: "总体战"
  DH1_zongtizhan_desc: "备战备荒为人民！"
  DH1_gongkaizhizeyixian: "公开指责逸仙"
@@ -219,14 +221,14 @@
  DH1_zhongnanbandao_decision: "进攻中南半岛"
  DH1_nanyacidalu_mission_tooltip: "允许向南亚次大陆远征。"
  DH1_nanyacidalu_decision: "进攻南亚次大陆"
- DH1_future_communism: "东煌南洋生产建设兵团"
- DH1_future_communism_DEF: "东煌南洋生产建设兵团"
- DH1_future_democratic: "东煌南洋生产建设兵团"
- DH1_future_democratic_DEF: "东煌南洋生产建设兵团"
- DH1_future_neutrality: "东煌南洋生产建设兵团"
- DH1_future_neutrality_DEF: "东煌南洋生产建设兵团"
- DH1_future_fascism: "东煌南洋生产建设兵团"
- DH1_future_fascism_DEF: "东煌南洋生产建设兵团"
+ DH1_future_communism: "东煌海外生产建设兵团"
+ DH1_future_communism_DEF: "东煌海外生产建设兵团"
+ DH1_future_democratic: "东煌海外生产建设兵团"
+ DH1_future_democratic_DEF: "东煌海外生产建设兵团"
+ DH1_future_neutrality: "东煌海外生产建设兵团"
+ DH1_future_neutrality_DEF: "东煌海外生产建设兵团"
+ DH1_future_fascism: "东煌海外生产建设兵团"
+ DH1_future_fascism_DEF: "东煌海外生产建设兵团"
  DOH_yuanzhengjundeweilai: "远征军的未来"
  DOH_yuanzhengjundeweilai_desc: "远征军的历史使命已经结束，是时候考虑远征军的未来了。"
  DOH_chongyingdechaogong: "重樱的朝贡"
@@ -356,4 +358,30 @@
  az_DH1_yuanzheng_won_defender.a: "好耶"
  az_DH1_yuanzheng_lost_defender.t: "边境冲突失败"
  az_DH1_yuanzheng_lost_defender.d: "我们在[?FROM.FROM.FROM.GetName]地区的边境冲突中失败。"
- az_DH1_yuanzheng_lost_defender.a: "坏"
+ az_DH1_yuanzheng_lost_defender.a: "坏"
+ DH1_neizheng_1: "东煌海外领管理委员会"
+ DH1_neizheng_1_desc: "我们所处的地方气候湿润，土地肥沃，可以种一些经济作物。\n我们将颁布法令统一远征军及其控制区的语言。\n远征军民政处将根据实际情况和个人意愿，为单身蛮啾分配对象。"
+ DH1_neizheng_2: "东煌海外领管理委员会"
+ DH1_neizheng_2_desc: "东南亚地区特别适合种一些坏东西，这些坏东西可以给我们带来巨大的经济利益。\n我们将颁布法令统一远征军及其控制区的语言。\n远征军民政处将根据实际情况和个人意愿，为单身蛮啾分配对象。"
+ DH1_neizheng_11: "东煌海外领管理委员会"
+ DH1_neizheng_11_desc: "我们所处的地方气候湿润，土地肥沃，可以种一些经济作物。\n我们将颁布法令统一远征军及其控制区的语言。\n远征军民政处将根据实际情况和个人意愿，为单身蛮啾分配对象。\n有一些不好搞的东西无法光明正大的流入本土，这时候就需要我们帮忙了。\n前方吃紧，后方要加大运输力度，武器装备摩多摩多！"
+ DH1_neizheng_21: "东煌海外领管理委员会"
+ DH1_neizheng_21_desc: "东南亚地区特别适合种一些坏东西，这些坏东西可以给我们带来巨大的经济利益。\n我们将颁布法令统一远征军及其控制区的语言。\n远征军民政处将根据实际情况和个人意愿，为单身蛮啾分配对象。\n有一些不好搞的东西无法光明正大的流入本土，这时候就需要我们帮忙了。\n前方吃紧，后方要加大运输力度，武器装备摩多摩多！"
+ DH1_neizheng_111: "东煌海外领管理委员会"
+ DH1_neizheng_111_desc: "我们所处的地方气候湿润，土地肥沃，可以种一些经济作物。\n我们将颁布法令统一远征军及其控制区的语言。\n远征军民政处将根据实际情况和个人意愿，为单身蛮啾分配对象。\n有一些不好搞的东西无法光明正大的流入本土，这时候就需要我们帮忙了。\n前方吃紧，后方要加大运输力度，武器装备摩多摩多！"
+ DH1_neizheng_211: "东煌海外领管理委员会"
+ DH1_neizheng_211_desc: "东南亚地区特别适合种一些坏东西，这些坏东西可以给我们带来巨大的经济利益。\n我们将颁布法令统一远征军及其控制区的语言。\n远征军民政处将根据实际情况和个人意愿，为单身蛮啾分配对象。\n有一些不好搞的东西无法光明正大的流入本土，这时候就需要我们帮忙了。\n前方吃紧，后方要加大运输力度，武器装备摩多摩多！"
+ DH1_junshi_1: "东煌远征军"
+ DH1_junshi_1_desc: "军费是一笔很大的开支，我们可以让军队中层领导自己想办法去搞军费。\n我们的部队极其适应炎热的气候。"
+ DH1_junshi_2: "东煌远征军"
+ DH1_junshi_2_desc: "军队一律不许经商！所有军费将有最高军部统一分配，这对军队的命运有很大的影响。\n我们的部队极其适应炎热的气候。"
+ DH1_junshi_11: "东煌远征军"
+ DH1_junshi_11_desc: "军费是一笔很大的开支，我们可以让军队中层领导自己想办法去搞军费。\n我们的部队极其适应炎热的气候。"
+ DH1_junshi_21: "东煌远征军"
+ DH1_junshi_21_desc: "军队一律不许经商！所有军费将有最高军部统一分配，这对军队的命运有很大的影响。\n我们的部队极其适应炎热的气候。"
+ DH1_junshi_111: "东煌远征军"
+ DH1_junshi_111_desc: "军费是一笔很大的开支，我们可以让军队中层领导自己想办法去搞军费。\n我们的部队极其适应炎热的气候。\n殖民者已经大缺大德几百年了，是时候让他们尝尝被压迫人民的铁拳。\n我们学习了铁血先进的装甲技术。"
+ DH1_junshi_211: "东煌远征军"
+ DH1_junshi_211_desc: "军队一律不许经商！所有军费将有最高军部统一分配，这对军队的命运有很大的影响。\n我们的部队极其适应炎热的气候。\n殖民者已经大缺大德几百年了，是时候让他们尝尝被压迫人民的铁拳。\n我们学习了铁血先进的装甲技术。"
+ DH1_qianjin: "前进！"
+ DH1_qianjin_desc: "巨浪，巨浪，不断地增长！"