2024-08-03 22:28:17

src/common/autonomous_states/doh_fanshuguo.txt

@@ -1,24 +1,26 @@
 autonomy_state = {
 	id = doh_fanshu
-	default = no
+	default = yes
 	is_puppet = no
-	min_freedom_level = 0.9
 	manpower_influence = 0.5
 	use_overlord_color = yes
 	rule = {
 		can_not_declare_war = yes
 		can_decline_call_to_war = no
-		can_be_spymaster = no
 		contributes_operatives = yes
-		# can_send_volunteers = yes
-		# can_puppet = yes
+		can_puppet = yes
 	}
-	
+	min_freedom_level = 0
 	modifier = {
 		can_master_build_for_us = 1
 		master_ideology_drift = 1
         faction_trade_opinion_factor = 1
 		opinion_gain_monthly_same_ideology_factor = 0.2
+		puppet_cost_factor = -0.3
+		overlord_trade_cost_factor = -0.5
+		industrial_capacity_factory = 0.15
+		industrial_capacity_dockyard = 0.1
+		production_speed_buildings_factor = 0.2
 	}
 	
 	ai_subject_wants_higher = {
@@ -31,7 +33,7 @@ autonomy_state = {
 
 	allowed = {
 		OR = {
-			OVERLORD = { original_tag = DOH }
+			OVERLORD = { tag = DOH }
 			AND = {
 				DOH = {
 					has_completed_focus = DOH_cijichaogongzhongxin
@@ -40,11 +42,22 @@ autonomy_state = {
 			}
 		}
 	}
-
+	allowed_levels_filter = {
+		doh_fanshu
+	}
     can_take_level = {
 		always = no
 	}
 	can_lose_level = {
 		always = no
 	}
+	use_for_peace_conference_weight = {
+		base = 0
+		modifier = {
+			add = 10000
+			DOH = {
+				has_completed_focus = DOH_chaogongzhidu
+			}
+		}
+	}
 }

src/common/autonomous_states/doh_xiaodi.txt

@@ -8,6 +8,7 @@ autonomy_state = {
 		can_not_declare_war = yes
 		can_decline_call_to_war = no
 		can_be_spymaster = no
+		can_puppet = yes
 	}
 	use_overlord_color = yes
 	
@@ -19,13 +20,15 @@ autonomy_state = {
 		cic_to_overlord_factor = 0.75
 		mic_to_overlord_factor = 0.75
 
-		research_sharing_per_country_bonus_factor = -0.5
+		research_sharing_per_country_bonus_factor = -0.9
 	}
 	
 	ai_subject_wants_higher = {
 		factor = 0.0
 	}
-	
+	allowed_levels_filter = {
+		doh_xiaodi
+	}
 	ai_overlord_wants_lower = {
 		factor = 0.0
 	}
@@ -37,4 +40,13 @@ autonomy_state = {
 			OVERLORD = { original_tag = DH1 }
 		}
 	}
+	use_for_peace_conference_weight = {
+		base = 100
+		modifier = {
+			add = -100
+			DOH = {
+				has_completed_focus = DOH_chaogongzhidu
+			}
+		}
+	}
 }

src/common/decisions/DOH_decision.txt

@@ -1623,22 +1623,63 @@ DOH_decision_debug_category = {
 			}
 		}
 	}
-	# DOH_debug_8 = {
-	# 	icon = xingdong
-	# 	cost = 0
-	# 	ai_will_do = {
-	# 		factor = 0
-	# 	}
-	# 	visible = {
-	# 		is_debug = yes
-	# 		is_ai = no
-	# 	}
-	# 	complete_effect = {
-	# 		mio:az_DOH_railway_organization = {
-	# 			complete_mio_trait = DOH_zhiyuanzhuangbei_baozhanghouqin_trait
-	# 		}
-	# 	}
-	# }
+	DOH_debug_8 = {
+		icon = xingdong
+		cost = 0
+		ai_will_do = {
+			factor = 0
+		}
+		visible = {
+			is_debug = yes
+			is_ai = no
+		}
+		complete_effect = {
+			set_autonomy = {
+				target = CHY
+				autonomy_state = doh_fanshu
+			}
+		}
+	}
+
+	DOH_debug_9 = {
+		icon = xingdong
+		cost = 0
+		ai_will_do = {
+			factor = 0
+		}
+		visible = {
+			is_debug = yes
+			is_ai = no
+		}
+		complete_effect = {
+			DOH = {
+				complete_national_focus = DOH_chaogongzhidu
+				country_event = DOH_event.20
+			}
+			CHY = {
+				complete_national_focus = CHY_kuangredekuozhangzhuyi				
+			}
+		}
+	}
+	DOH_debug_10 = {
+		icon = xingdong
+		cost = 0
+		ai_will_do = {
+			factor = 0
+		}
+		visible = {
+			is_debug = yes
+			is_ai = no
+		}
+		complete_effect = {
+			DOH = {
+				country_event = DOH_event.20
+			}
+			CHY = {
+				complete_national_focus = CHY_kuangredekuozhangzhuyi				
+			}
+		}
+	}
 }
 
 DOH_duiwaitouzi_decision_category = {

src/common/dynamic_modifiers/DOH_dynamic_modifiers.txt

@@ -154,6 +154,7 @@ DOH_hedian_state_modifier = {
 	icon = GFX_modifiers_generic_military_plans
 	local_building_slots = 1
 	local_org_regain = 0.2
+	nuclear_production_factor = 0.2
 	local_resources = 0.5
 	local_supplies = 0.3
 }
@@ -175,15 +176,17 @@ az_DOH_shuchu_target_modifier = {
 	cic_to_target_factor = var:shuchu_factor_to_doh
 	mic_to_target_factor = var:shuchu_factor_to_doh
 }
-# az_doh_fanshu_modifier = {
-# 	icon = GFX_idea_DOH_xdh
-# 	cic_to_overlord_factor = var:THIS.autonomy_range
-# 	mic_to_overlord_factor = var:THIS.autonomy_range
-# }
+az_doh_fanshu_modifier = {
+	icon = GFX_idea_DOH_xdh
+	cic_to_overlord_factor = var:ROOT.zizhichengdu
+	mic_to_overlord_factor = var:ROOT.zizhichengdu
+}
 az_doh_kexueyuan_modifier = {
 	icon = GFX_idea_generic_research_bonus
 	research_speed_factor = shared_speed_factor
 	license_subject_master_purchase_cost = -1
+	research_sharing_per_country_bonus = 1
+	research_sharing_per_country_bonus_factor = 1
 	naval_hit_chance = 0.15
 	global_building_slots = 1
 	land_night_attack = 0.1

src/common/ideas/dh1.txt

@@ -14,7 +14,7 @@ ideas = {
 			}
 			modifier = {
 				max_command_power = -5
-				
+				political_power_factor = -0.05
 			}
 		}
 		DH1_idea_dohzhiyuandh1 = {
@@ -195,6 +195,7 @@ ideas = {
 				ai_join_ally_desire_factor = -100
 				production_speed_buildings_factor = 0.15
 				political_power_gain = 0.5
+				ai_desired_divisions_factor = 10
 				can_master_build_for_us = 1
 			}
 		}

src/common/ideas/fazhanfangzhen.txt

@@ -29,6 +29,7 @@ ideas = {
 			modifier = {
 				political_power_cost = 0.5
 				military_industrial_organization_funds_gain = 1
+				military_industrial_organization_policy_cooldown = 5
 				land_doctrine_cost_factor = -0.15
 				air_doctrine_cost_factor = -0.15
 				naval_doctrine_cost_factor = -0.15

src/common/national_focus/donghuang_new.txt

@@ -3943,11 +3943,11 @@ focus_tree = {
 			factor = 1
 		}
 		available = {
-			always = no
+
 		}
 		completion_reward = {
 			custom_effect_tooltip = DOH_chaogongtixi_tooltip
-			custom_effect_tooltip = "（还没做完）"
+			custom_effect_tooltip = doh_fanshu_desc
 		}
 	}
 	focus = {
@@ -3967,11 +3967,10 @@ focus_tree = {
 			factor = 1
 		}
 		available = {
-			always = no
+			
 		}
 		completion_reward = {
 			custom_effect_tooltip = DOH_cijichaogongzhongxin_tooltip
-			custom_effect_tooltip = "（还没做完）"
 		}
 	}
 	focus = {
@@ -5425,7 +5424,7 @@ focus_tree = {
 	focus = {
 		id = DOH_junmingronghe
 		icon = GFX_goal_generic_construct_civilian
-		relative_position_id = DOH_special_force
+		relative_position_id = DOH_wanguolaichao
 		prerequisite = {
 			focus = DOH_huanxingjulong
 			focus = DOH_nanhaidezhuren
@@ -5436,7 +5435,7 @@ focus_tree = {
 			num_of_factories > 300
 		}
 		cost = 5
-		x = 13
+		x = 3
 		y = 1
 		completion_reward = {
 			custom_effect_tooltip = DOH_junmingronghe_tooltip
@@ -5462,7 +5461,7 @@ focus_tree = {
 			has_completed_focus = DOH_liangdanyixing
 		}
 		cost = 5
-		x = -3
+		x = 0
 		y = 1
 		completion_reward = {
 			custom_effect_tooltip = az_DOH_railway_organization_tooltip_2
@@ -5534,35 +5533,35 @@ focus_tree = {
 
 		}
 	}
-	focus = {
-		id = DOH_junmingronghe_fushuguo
-		icon = GFX_focus_DEN_no_regulations
-		relative_position_id = DOH_junmingronghe
-		# prerequisite = {
-		# 	focus = DOH_junmingronghe_jishugaijing
-		# }
-		# prerequisite = {
-		# 	focus = DOH_wanguolaichao
-		# }
-		# prerequisite = {
-		# 	focus = DOH_junmingronghe
-		# }
-		available = {
-			num_subjects > 0
-			OR = {
-				has_completed_focus = DOH_ziguyilai
-				has_completed_focus = DOH_chaogongzhidu
-			}
-			always = no
-		}
-		prerequisite = {
-			focus = DOH_junmingronghe
-		}
-		cost = 5
-		x = 0
-		y = 3
-		completion_reward = {
-			custom_effect_tooltip = "（还没做完）"
-		}
-	}
+	# focus = {
+	# 	id = DOH_junmingronghe_fushuguo
+	# 	icon = GFX_focus_DEN_no_regulations
+	# 	relative_position_id = DOH_junmingronghe
+	# 	# prerequisite = {
+	# 	# 	focus = DOH_junmingronghe_jishugaijing
+	# 	# }
+	# 	# prerequisite = {
+	# 	# 	focus = DOH_wanguolaichao
+	# 	# }
+	# 	# prerequisite = {
+	# 	# 	focus = DOH_junmingronghe
+	# 	# }
+	# 	available = {
+	# 		num_subjects > 0
+	# 		OR = {
+	# 			has_completed_focus = DOH_ziguyilai
+	# 			has_completed_focus = DOH_chaogongzhidu
+	# 		}
+	# 		always = no
+	# 	}
+	# 	prerequisite = {
+	# 		focus = DOH_junmingronghe
+	# 	}
+	# 	cost = 5
+	# 	x = 0
+	# 	y = 3
+	# 	completion_reward = {
+	# 		custom_effect_tooltip = "（还没做完）"
+	# 	}
+	# }
 }

src/common/national_focus/donghuangyuanzhengjun.txt

@@ -77,6 +77,10 @@
 		#search_filters = { FOCUS_FILTER_STABILITY }
 		completion_reward = {
 			add_political_power = 200
+			add_offsite_building = {
+				type = arms_factory
+				level = 2
+			}
 		}
 	}
 	focus = { 
@@ -140,6 +144,10 @@
 		completion_reward = {
 			add_political_power = 300
 			add_ideas = DH1_idea_qinfenhaoxue
+			add_offsite_building = {
+				type = industrial_complex
+				level = 2
+			}
 		}
 	}
 	focus = {
@@ -2588,6 +2596,8 @@
 				transfer_state = 625
 				transfer_state = 627
 				transfer_state = 624
+				transfer_state = 422
+				transfer_state = 281
 
 				add_state_core = 738
 				add_state_core = 668
@@ -2622,6 +2632,8 @@
 				add_state_core = 625
 				add_state_core = 627
 				add_state_core = 624
+				add_state_core = 422
+				add_state_core = 281
 			}
 		}
 	}
@@ -2904,10 +2916,7 @@
 			has_idea = DOH_ndhhsygs
 			has_idea = TIX_zjscl
 			OR = {
-				OR = {
-					is_ai = yes
-					has_completed_focus = DH1_xiananyang
-				}
+				has_completed_focus = DH1_xiananyang
 				date > 1943.1.1
 				threat > 0.75
 			}
@@ -2918,6 +2927,38 @@
 				remove_ideas = DH1_zhiyuanjun_idea
 				remove_ideas = DOH_ndhhsygs
 				remove_ideas = TIX_zjscl
+				if = {
+					limit = {
+						DOH = {
+							has_subject = BHU
+						}
+					}
+					DH1 = {
+						annex_country = {
+							target = BHU
+							transfer_troops = yes
+						}
+					}
+					324 = {
+						add_core_of = DH1
+					}
+				}
+				if = {
+					limit = {
+						DOH = {
+							has_subject = NEP
+						}
+					}
+					DH1 = {
+						annex_country = {
+							target = NEP
+							transfer_troops = yes
+						}
+					}
+					323 = {
+						add_core_of = DH1
+					}
+				}
 			}
 			if = {
 				limit = {
@@ -2937,6 +2978,7 @@
 					add_idea = DH1_junshi_211
 				}
 			}
+			custom_effect_tooltip = DH1_qianjin_tt
 			custom_effect_tooltip = "（未完待续）"
 		}
 	}

src/common/on_actions/az_doh_dh1.txt

@@ -125,6 +125,16 @@ on_actions = {
 				}
 				doh_kexueyuan_effect = yes
 			}
+			if = {
+				limit = {
+					DOH = {
+						has_completed_focus = DOH_chaogongtixi
+					}
+				}
+				d_DOH_fanshu_reload_effect = yes
+				d_DOH_fanshu_add_effect = yes
+				d_DOH_fanshu_refresh_effect = yes
+			}
 		}
 	}	
 	on_monthly = {

src/common/peace_conference/ai_peace/DOH_fanshu.txt

@@ -0,0 +1,23 @@
+doh_fanshu_peace = {
+	enable = {
+        OR = {
+			AND = {
+				tag = DOH
+				has_completed_focus = DOH_chaogongzhidu
+			}
+			has_autonomy_state = doh_fanshu
+		}
+    }
+	puppet_all = {
+        base = 1000
+    }
+	puppet_state = {
+        base = 100
+	}
+	take_states = {
+		base = 0
+	}
+	annex = {
+        base = 0
+	}
+}

src/common/scripted_effects/az_DOH_scripted_effects.txt

@@ -468,6 +468,19 @@ doh_kexueyuan_effect = {
 	set_variable = {
 		shared_speed_factor = DOH.num_subjects
 	}
+	if = {
+		limit = {
+			country_exists = DH1
+			DH1 = {
+				has_completed_focus = DH1_qianjin
+				controls_state = 323
+				controls_state = 324
+			}
+		}
+		add_to_variable = {
+			shared_speed_factor = 2
+		}
+	}
 	multiply_variable = {
 		shared_speed_factor = 0.16
 	}
@@ -507,49 +520,76 @@ doh_kexueyuan_effect = {
 	}
 }
 
-# d_DOH_fanshu_add_effect = {
-# 	every_country = {
-# 		limit = {
-# 			has_autonomy_state = doh_fanshu
-# 		}
-# 		set_variable = {
-# 			THIS.zizhichengdu = THIS.autonomy_ratio
-# 		}
-# 		multiply_variable = {
-# 			THIS.zizhichengdu = -1
-# 		}
-# 		add_to_variable = {
-# 			THIS.zizhichengdu = 1
-# 		}
-# 		multiply_variable = {
-# 			THIS.zizhichengdu = 0.3
-# 		}
-# 		add_dynamic_modifier = {
-# 			modifier = az_doh_fanshu_modifier
-# 			scope = THIS.overlord
-# 		}
-# 	}
-# }
-# d_DOH_fanshu_refresh_effect = {
-# 	every_country = {
-# 		limit = {
-# 			has_autonomy_state = doh_fanshu
-# 		}
-# 		set_variable = {
-# 			THIS.zizhichengdu = THIS.autonomy_ratio
-# 		}
-# 		multiply_variable = {
-# 			THIS.zizhichengdu = -1
-# 		}
-# 		add_to_variable = {
-# 			THIS.zizhichengdu = 1
-# 		}
-# 		multiply_variable = {
-# 			THIS.zizhichengdu = 0.3
-# 		}
-# 	}
-# }
+d_DOH_fanshu_add_effect = {
+	every_country = {
+		limit = {
+			has_autonomy_state = doh_fanshu
+			NOT = {
+				has_dynamic_modifier = {
+					modifier = az_doh_fanshu_modifier
+				}
+			}
+		}
+		add_dynamic_modifier = {
+			modifier = az_doh_fanshu_modifier
+			#scope = THIS.overlord
+		}
+	}
+}
+d_DOH_fanshu_refresh_effect = {
+	every_country = {
+		limit = {
+			has_dynamic_modifier = {
+				modifier = az_doh_fanshu_modifier
+			}
+		}
+		set_variable = {
+			THIS.zizhichengdu = THIS.autonomy_ratio
+		}
+		multiply_variable = {
+			THIS.zizhichengdu = -1
+		}
+		add_to_variable = {
+			THIS.zizhichengdu = 1
+		}
+		multiply_variable = {
+			THIS.zizhichengdu = 0.4
+		}
+	}
+}
 
+d_DOH_fanshu_reload_effect = {
+	every_country = {
+		limit = {
+			DOH = {
+				has_completed_focus = DOH_chaogongtixi
+			}
+			is_subject_of = DOH
+			NOT = {
+				has_autonomy_state = doh_fanshu
+			}
+		}
+		set_autonomy = {
+			target = THIS
+			autonomy_state = doh_fanshu
+		}
+	}
+	every_country = {
+		limit = {
+			DOH = {
+				has_completed_focus = DOH_cijichaogongzhongxin
+			}
+			is_subject = yes
+			OVERLORD = {
+				has_autonomy_state = doh_fanshu
+			}
+		}
+		set_autonomy = {
+			target = THIS
+			autonomy_state = doh_fanshu
+		}
+	}
+}
 
 DOH_neibufenqi_jianqin_effect = {
 	multiply_variable = {

src/events/DH1_shijian.txt

@@ -478,8 +478,8 @@ country_event = {
 		}
 		hidden_effect = {
 			set_victory_points = {
-				province = 1492
-				value = 20
+				province = 640
+				value = 30
 			}
 		}
 	}
@@ -495,6 +495,12 @@ country_event = {
 				state = 439
 			}
 		}
+		hidden_effect = {
+			set_victory_points = {
+				province = 439
+				value = 30
+			}
+		}
 	}
 	option = {
 		name = DH1_event.7.ac
@@ -508,6 +514,12 @@ country_event = {
 				state = 289
 			}
 		}
+		hidden_effect = {
+			set_victory_points = {
+				province = 289
+				value = 30
+			}
+		}
 	}
 	option = {
 		name = DH1_event.7.next
@@ -533,6 +545,12 @@ country_event = {
 				state = 286
 			}
 		}
+		hidden_effect = {
+			set_victory_points = {
+				province = 286
+				value = 30
+			}
+		}
 	}
 	option = {
 		name = DH1_event.7.ae
@@ -546,6 +564,12 @@ country_event = {
 				state = 671
 			}
 		}
+		hidden_effect = {
+			set_victory_points = {
+				province = 671
+				value = 30
+			}
+		}
 	}
 	option = {
 		name = DH1_event.7.af
@@ -559,6 +583,12 @@ country_event = {
 				state = 327
 			}
 		}
+		hidden_effect = {
+			set_victory_points = {
+				province = 327
+				value = 30
+			}
+		}
 	}
 	option = {
 		name = DH1_event.7.next
@@ -584,6 +614,12 @@ country_event = {
 				state = 525
 			}
 		}
+		hidden_effect = {
+			set_victory_points = {
+				province = 525
+				value = 30
+			}
+		}
 	}
 	option = {
 		name = DH1_event.7.ah
@@ -599,8 +635,8 @@ country_event = {
 		}
 		hidden_effect = {
 			set_victory_points = {
-				province = 7371
-				value = 20
+				province = 333
+				value = 30
 			}
 		}
 	}

src/events/DOH_shijian.txt

@@ -546,11 +546,11 @@ country_event = {
 		add_war_support = 0.2
 		set_autonomy = {
 			target = NEP
-			autonomy_state = autonomy_reichsprotectorate
+			autonomy_state = doh_xiaodi
 		}
 		set_autonomy = {
 			target = BHU
-			autonomy_state = autonomy_reichsprotectorate
+			autonomy_state = doh_xiaodi
 		}
 
 			

src/interface/az_DOH.gfx

@@ -19,4 +19,16 @@ spriteTypes = {
 	# 	name = "GFX_doh_civ_naval_equipment_medium"
 	# 	texturefile = "gfx/interface/technologies/support_equipment_1.dds"
 	# }
+	spriteType = {
+		name = "GFX_doh_xiaodi_icon"
+		textureFile = "gfx/interface/autonomy/autonomy_collaboration_government.dds"
+	}
+	spriteType = {
+		name = "GFX_doh_yuanzhengjun_icon"
+		textureFile = "gfx/interface/autonomy/autonomy_freedom_icon.dds"
+	}
+	spriteType = {
+		name = "GFX_doh_fanshu_icon"
+		textureFile = "gfx/interface/autonomy/doh_fanshu.png"
+	}
 }

src/localisation/simp_chinese/az_beijing_l_simp_chinese.yml

@@ -234,7 +234,10 @@
  BLI_democratic_party:0 "布里民主党"
  BLI_fascism_party:1 "布里武装党"
  BLI_neutrality_party:0 "布里中立党" 
- 
+ DH1_communism_party:0 "东煌共产党海外支部"
+ DH1_democratic_party:0 "东煌民主同盟会海外支部"
+ DH1_fascism_party:1 "东煌帝国党海外支部"
+ DH1_neutrality_party:0 "临时政府"
  ####
  
  #####难度设置####

src/localisation/simp_chinese/azc_DH1_l_simp_chinese.yml

@@ -385,3 +385,4 @@
  DH1_junshi_211_desc: "军队一律不许经商！所有军费将有最高军部统一分配，这对军队的命运有很大的影响。\n我们的部队极其适应炎热的气候。\n殖民者已经大缺大德几百年了，是时候让他们尝尝被压迫人民的铁拳。\n我们学习了铁血先进的装甲技术。"
  DH1_qianjin: "前进！"
  DH1_qianjin_desc: "巨浪，巨浪，不断地增长！"
+ DH1_qianjin_tt: "§g出于性能和后期游戏体验考虑，如果东煌本土傀儡了尼泊尔和不丹，我们将接管这两个地区。东煌科学院国策不受此影响。§!"

src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml

@@ -882,7 +882,7 @@
   az_doh_xiaofeipingyinxiang_factor_text_tt: "即总开支§Y对消费品系数的影响因子§!"
   az_doh_xiaofeipingyinxiang_factor_text_delay_tt: "基础值为8%，受§Y规模效应§!的影响而增大§g（边际效应递减）§!，可通过§Y革新生产力§!降低。"
   az_doh_hedian_counter_text: "§Y核工业§!效果：[?DOH_hedian_counter|%]"
-  az_doh_hedian_counter_text_tt: "由于§Y能源供应充足§!，每座核反应堆提供额外的2%消费品系数减免。"
+  az_doh_hedian_counter_text_tt: "由于§Y能源供应充足§!，每座核反应堆提供额外的2%消费品系数减免（§g仅限核心领土§）。"
   az_doh_hedian_counter_text_tt_delay: "§R需要§!完成国策§Y核工业§!"
   az_doh_guimoxiaoyin_text: "§Y规模效应§!：[?DOH_guimoxiaoyin]"
   az_doh_guimoxiaoyin_effect_text: "§Y额外产能§!：[?DOH_guimoxiaoyin_effect|%]"
@@ -959,3 +959,5 @@
   DOH_loong_event.3002.t: "北联的重建"
   DOH_loong_event.3002.d: "红色北方联合已经重建，北联舰娘向我们道别。"
   DOH_loong_event.3002.a: "山高水远，江湖再见！"
+  az_doh_fanshu_modifier: "现代朝贡体系"
+  doh_fanshu_desc: "按照§C自治程度§!向宗主国上贡工业产能（至多40%），宗主国在朝贡体系内协调资源和为所有成员国提供安全保证。"