2024-10-08 16:31:15

2024-10-08 16:31:15 +00:00
parent 22e71fc96b
commit 937f3b23aa
8 changed files with 516 additions and 437 deletions
--- a/src/common/decisions/DOH_decision.txt
+++ b/src/common/decisions/DOH_decision.txt
@@ -38,29 +38,7 @@ DOH_decision_category = {
 			activate_mission = DOH_gongyeguihua_mission
 			set_country_flag = DOH_gongyeguihua_doing
 			set_variable = {
-				var:DOH_gongyeguihua_doing_goal = 1.1
-			}
-			if = {
-				limit = {
-					check_variable = {
-						DOH.num_of_factories < 450
-					}
-				}
-				set_variable = {
-					var:DOH_gongyeguihua_doing_goal = 450
-				}
-				subtract_from_variable = {
-					var:DOH_gongyeguihua_doing_goal = DOH.num_of_factories
-				}
-				multiply_variable = {
-					var:DOH_gongyeguihua_doing_goal = 0.001
-				}
-				add_to_variable = {
-					var:DOH_gongyeguihua_doing_goal = 1.1
-				}
-			}
-			multiply_variable = {
-				var:DOH_gongyeguihua_doing_goal = DOH.num_of_factories
+				var:DOH_gongyeguihua_doing_goal = mtth:DOH_gongyemubiao_mtth
 			}
 			round_variable = var:DOH_gongyeguihua_doing_goal
 		}
@@ -1390,7 +1368,7 @@ DOH_decision_debug_category = {
 # 			add_to_variable = {
 # 				var:DOH_touzi = 1
 # 			}
-# 			DOH_mofifier_effect = yes
+# 			DOH_modifier_effect = yes
 # 			DOH_zhichilvchengfa_effect = yes
 # 		}
 # 	}
@@ -1421,7 +1399,7 @@ DOH_decision_debug_category = {
 # 			add_to_variable = {
 # 				var:DOH_touzi = -1
 # 			}
-# 			DOH_mofifier_effect = yes
+# 			DOH_modifier_effect = yes
 # 			DOH_zhichilvchengfa_effect = yes
 # 		}
 # 	}
@@ -1450,7 +1428,7 @@ DOH_decision_debug_category = {
 # 			add_to_variable = {
 # 				var:DOH_gonggongkaizhi = 1
 # 			}
-# 			DOH_mofifier_effect = yes
+# 			DOH_modifier_effect = yes
 # 			DOH_zhichilvchengfa_effect = yes
 # 		}
 # 	}
@@ -1481,7 +1459,7 @@ DOH_decision_debug_category = {
 # 			add_to_variable = {
 # 				var:DOH_gonggongkaizhi = -1
 # 			}
-# 			DOH_mofifier_effect = yes
+# 			DOH_modifier_effect = yes
 # 			DOH_zhichilvchengfa_effect = yes
 # 		}
 # 	}
@@ -1510,7 +1488,7 @@ DOH_decision_debug_category = {
 # 			add_to_variable = {
 # 				var:DOH_keyanjinfei = 1
 # 			}
-# 			DOH_mofifier_effect = yes
+# 			DOH_modifier_effect = yes
 # 			DOH_zhichilvchengfa_effect = yes
 # 		}
 # 	}
@@ -1541,7 +1519,7 @@ DOH_decision_debug_category = {
 # 			add_to_variable = {
 # 				var:DOH_keyanjinfei = -1
 # 			}
-# 			DOH_mofifier_effect = yes
+# 			DOH_modifier_effect = yes
 # 			DOH_zhichilvchengfa_effect = yes
 # 		}
 # 	}
@@ -1570,7 +1548,7 @@ DOH_decision_debug_category = {
 # 			add_to_variable = {
 # 				var:DOH_junshijinfei = 1
 # 			}
-# 			DOH_mofifier_effect = yes
+# 			DOH_modifier_effect = yes
 # 			DOH_zhichilvchengfa_effect = yes
 # 		}
 # 	}
@@ -1601,7 +1579,7 @@ DOH_decision_debug_category = {
 # 			add_to_variable = {
 # 				var:DOH_junshijinfei = -1
 # 			}
-# 			DOH_mofifier_effect = yes
+# 			DOH_modifier_effect = yes
 # 			DOH_zhichilvchengfa_effect = yes
 # 		}
 # 	}
@@ -1632,7 +1610,7 @@ DOH_decision_debug_category = {
 # 			add_to_variable = {
 # 				var:DOH_shichang = 1
 # 			}
-# 			DOH_mofifier_effect = yes
+# 			DOH_modifier_effect = yes
 # 			DOH_zhichilvchengfa_effect = yes
 # 		}
 # 	}
@@ -1663,7 +1641,7 @@ DOH_decision_debug_category = {
 # 			add_to_variable = {
 # 				var:DOH_shichang = -1
 # 			}
-# 			DOH_mofifier_effect = yes
+# 			DOH_modifier_effect = yes
 # 			DOH_zhichilvchengfa_effect = yes
 # 		}
 # 	}
--- a/src/common/dynamic_modifiers/DOH_dynamic_modifiers.txt
+++ b/src/common/dynamic_modifiers/DOH_dynamic_modifiers.txt
@@ -4,52 +4,53 @@ DOH_donghuangshiwu_idea = {
 	party_popularity_stability_factor = 1
 	stability_factor = -1
 	stability_weekly = -0.005
-	consumer_goods_factor = var:DOH_xiaofeipingyinxiang
-	local_resources_factor = DOH_touzi_effect
-	production_speed_buildings_factor = DOH_touzi_effect
-	cic_construction_boost = DOH_touzi_effect

-	research_speed_factor = DOH_keyanjinfei_effect
-	political_power_factor = DOH_keyanjinfei_effect
+	consumer_goods_factor = mtth:DOH_xiaofeipingyinxiang_mtth
 	
-	industrial_capacity_factory = DOH_junshijinfei_effect
-	industrial_capacity_dockyard = DOH_junshijinfei_effect
+	## 投资
+	local_resources_factor = mtth:DOH_modifier_touzi_effect_1_mtth
+	production_speed_buildings_factor = mtth:DOH_modifier_touzi_effect_1_mtth
+	cic_construction_boost = mtth:DOH_modifier_touzi_effect_1_mtth

-	boost_ideology_mission_factor = DOH_gonggongkaizhi_effect
-	intel_network_gain_factor = DOH_gonggongkaizhi_effect
-	naval_morale_factor = DOH_gonggongkaizhi_effect
-	intelligence_agency_defense = DOH_gonggongkaizhi_effect
-	industry_free_repair_factor = DOH_gonggongkaizhi_effect
-	enemy_operative_detection_chance_factor = DOH_gonggongkaizhi_effect
-	encryption_factor = DOH_gonggongkaizhi_effect
-	decryption_factor = DOH_gonggongkaizhi_effect
-	line_change_production_efficiency_factor = DOH_gonggongkaizhi_effect
-	industry_air_damage_factor = DOH_gonggongkaizhi_effect_m
-	own_operative_detection_chance_factor = DOH_gonggongkaizhi_effect_m
-	land_reinforce_rate = DOH_gonggongkaizhi_effect_2
-	repair_speed_factor = DOH_gonggongkaizhi_effect
-	stability_weekly_factor = DOH_gonggongkaizhi_effect_3
+	## 科研
+	research_speed_factor = mtth:DOH_modifier_keyanjinfei_effect_1_mtth
+	political_power_factor = mtth:DOH_modifier_keyanjinfei_effect_1_mtth
+	
+	## 生产
+	industrial_capacity_factory = mtth:DOH_modifier_shengchanjinfei_effect_1_mtth
+	industrial_capacity_dockyard = mtth:DOH_modifier_shengchanjinfei_effect_1_mtth

-	min_export = DOH_shichang_effect
-	trade_opinion_factor = DOH_shichang_effect
-	research_speed_factor = DOH_shichang_effect
+	## 规模效应（生产）
+	industrial_capacity_factory = mtth:DOH_modifier_guimoxiaoying_effect_mtth
+	industrial_capacity_dockyard = mtth:DOH_modifier_guimoxiaoying_effect_mtth

-	industrial_capacity_factory = DOH_guimoxiaoyin_effect
-	industrial_capacity_dockyard = DOH_guimoxiaoyin_effect
-	consumer_goods_factor = extra_xiaofeiping
-	consumer_goods_factor = DOH_shichang_effect_m
-	trade_opinion_factor = DOH_shichang_effect_m
+	## 市场
+	min_export = mtth:DOH_modifier_shichang_effect_1_mtth
+	trade_opinion_factor = mtth:DOH_modifier_shichang_effect_1_mtth
+	research_speed_factor = mtth:DOH_modifier_shichang_effect_1_mtth

-	consumer_goods_factor = var:DOH_hedian_counter
-}
-DOH_fake_add_touzi = {
-	icon = GFX_idea_DOH_xdh
-    enable = { always = yes }
-	consumer_goods_factor = var:DOH_xiaofeipingyinxiang_factor
-	production_speed_buildings_factor = 0.04
-	local_resources_factor = 0.04
-	cic_construction_boost = 0.04
+
+	## 公共
+	boost_ideology_mission_factor = mtth:DOH_modifier_gonggongkaizhi_effect_1_mtth
+	intel_network_gain_factor = mtth:DOH_modifier_gonggongkaizhi_effect_1_mtth
+	naval_morale_factor = mtth:DOH_modifier_gonggongkaizhi_effect_1_mtth
+	intelligence_agency_defense = mtth:DOH_modifier_gonggongkaizhi_effect_1_mtth
+	industry_free_repair_factor = mtth:DOH_modifier_gonggongkaizhi_effect_1_mtth
+	enemy_operative_detection_chance_factor = mtth:DOH_modifier_gonggongkaizhi_effect_1_mtth
+	encryption_factor = mtth:DOH_modifier_gonggongkaizhi_effect_1_mtth
+	decryption_factor = mtth:DOH_modifier_gonggongkaizhi_effect_1_mtth
+	repair_speed_factor = mtth:DOH_modifier_gonggongkaizhi_effect_1_mtth
+	production_factory_efficiency_gain_factor = mtth:DOH_modifier_gonggongkaizhi_effect_1_mtth
+	line_change_production_efficiency_factor = mtth:DOH_modifier_gonggongkaizhi_effect_1_mtth
+
+	land_reinforce_rate = mtth:DOH_modifier_gonggongkaizhi_effect_2_mtth
+
+	stability_weekly_factor = mtth:DOH_modifier_gonggongkaizhi_effect_3_mtth
+
+	industry_air_damage_factor = mtth:DOH_modifier_gonggongkaizhi_effect_4_mtth
+	own_operative_detection_chance_factor = mtth:DOH_modifier_gonggongkaizhi_effect_4_mtth
 }
+
 DOH_donghuangkuangyedaxue = {
 	icon = GFX_idea_DOH_xdh
    enable = { always = yes }
@@ -105,52 +106,6 @@ DOH_kejiaotixi_black = {
 	country_resource_chromium = var:DOH_hechenglianyouchang_counter_2
 }

-# DOH_fake_add_gonggongkaizhi = {
-# 	icon = GFX_idea_DOH_xdh
-#     enable = { always = yes }
-# 	consumer_goods_factor = var:DOH_xiaofeipingyinxiang_factor
-	
-# 	boost_ideology_mission_factor = 0.05
-# 	intel_network_gain_factor = 0.05
-# 	naval_morale_factor = 0.05
-# 	intelligence_agency_defense = 0.05
-# 	encryption_factor = 0.05
-# 	decryption_factor = 0.05
-# 	industry_free_repair_factor = 0.05
-# 	line_change_production_efficiency_factor = 0.05
-# 	industry_air_damage_factor = -0.05
-# 	own_operative_detection_chance_factor = -0.05
-# 	enemy_operative_detection_chance_factor = 0.05
-# 	land_reinforce_rate = 0.01
-# 	repair_speed_factor = 0.05
-# 	stability_weekly_factor = 0.001
-# }
-# DOH_fake_add_keyanjinfen = {
-# 	icon = GFX_idea_DOH_xdh
-#     enable = { always = yes }
-# 	consumer_goods_factor = var:DOH_xiaofeipingyinxiang_factor
-# 	research_speed_factor = 0.035
-# 	political_power_factor = 0.035
-# }
-# DOH_fake_add_junshijinfei = {
-# 	icon = GFX_idea_DOH_xdh
-#     enable = { always = yes }
-# 	consumer_goods_factor = var:DOH_xiaofeipingyinxiang_factor
-# 	industrial_capacity_factory = 0.035
-# 	industrial_capacity_dockyard = 0.035
-# }
-# DOH_fake_add_shichangkaifang = {
-# 	icon = GFX_idea_DOH_xdh
-#     enable = { always = yes }
-# 	min_export = 0.03
-# 	research_speed_factor = 0.03
-# 	consumer_goods_factor = -0.03
-# 	trade_opinion_factor = 0.03
-# }
-# DOH_hedian_modifier = {
-# 	icon = GFX_nuclear_reactor_medium
-# 	consumer_goods_factor = var:DOH_hedian_counter
-# }
 DOH_hedian_state_modifier = {
 	icon = GFX_modifiers_generic_military_plans
 	local_building_slots = 1
--- a/src/common/ideas/gongzuozhidu.txt
+++ b/src/common/ideas/gongzuozhidu.txt
@@ -137,7 +137,10 @@ ideas = {
 			available = {
 					num_of_factories > 499
 					num_researched_technologies > 150
-					amount_research_slots > 5
+					OR = {
+						amount_research_slots > 5
+						has_completed_focus = DOH_guangronghemengxiangdeyuanzheng
+					}
 				
 			}
 			ai_will_do = {
--- a/src/common/mtth/az_DOH_mtth.txt
+++ b/src/common/mtth/az_DOH_mtth.txt
@@ -0,0 +1,325 @@
+DOH_zongjikaizhi_mtth = {
+	base = 0
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = var:DOH_touzi
+		}
+		add = t
+	}
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			k = var:DOH_keyanjinfei
+		}
+		add = k
+	}
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			j = var:DOH_junshijinfei
+		}
+		add = j
+	}
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			g = var:DOH_gonggongkaizhi
+		}
+		add = g
+	}
+}
+DOH_guimoxiaoyin_mtth = {
+	base = 0
+	modifier = {
+		AND = {
+			DOH = {
+				has_completed_focus = DOH_donghuanggongyetixi
+			}
+			DOH = {
+				num_of_factories > 299
+			}
+		}
+		add = DOH.num_of_civilian_factories
+	}
+	modifier = {
+		AND = {
+			DOH = {
+				has_completed_focus = DOH_donghuanggongyetixi
+			}
+			DOH = {
+				num_of_factories > 299
+			}
+		}
+		add = -299
+	}
+	modifier = {
+		always = yes
+		factor = 0.01
+	}
+}
+DOH_xiaofeipingyinxiang_factor_mtth = {
+	base = 0.08
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = mtth:DOH_guimoxiaoyin_mtth
+		}
+		multiply_temp_variable = {
+			t = 0.006
+		}
+		add = t
+	}
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = mtth:DOH_gexinshengchanli_mtth
+		}
+		divide_temp_variable = {
+			1 = t
+		}
+		factor = t
+	}
+}
+DOH_gexinshengchanli_mtth = {
+	base = 0
+	modifier = {
+		has_completed_focus = DOH_guangronghemengxiangdeyuanzheng
+		add = modifier@research_speed_factor
+	}
+	modifier = {
+		has_completed_focus = DOH_guangronghemengxiangdeyuanzheng
+		factor = DOH_gexinshengchanli
+	}
+	modifier = {
+		has_completed_focus = DOH_guangronghemengxiangdeyuanzheng
+		factor = 0.2
+	}
+	modifier = {
+		always = yes
+		add = 1
+	}
+}
+DOH_heqishengcai_mtth = {
+	base = 0
+	modifier = {
+		has_completed_focus = DOH_heqishengcai
+		set_temp_variable = {
+			t = DOH.stability
+		}
+		multiply_temp_variable = {
+			t = -0.2
+		}
+		add = t
+	}
+	modifier = {
+		has_completed_focus = DOH_heqishengcai
+		set_temp_variable = {
+			t = DOH.num_of_civilian_factories
+		}
+		multiply_temp_variable = {
+			t = -0.002
+		}
+		add = t
+	}
+}
+
+# 总计消费品
+DOH_xiaofeipingyinxiang_mtth = {
+	base = 0
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = mtth:DOH_zongjikaizhi_mtth
+		}
+		add = t
+	}
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = mtth:DOH_xiaofeipingyinxiang_factor_mtth
+		}
+		factor = t
+	}
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = mtth:DOH_heqishengcai_mtth
+		}
+		add = t
+	}
+	modifier = {
+		has_completed_focus = DOH_liangdanyixing
+		set_temp_variable = {
+			t = var:DOH_hedian_counter
+		}
+		add = t
+	}
+	modifier = {
+		has_completed_focus = DOH_shichanghuanjishu
+		set_temp_variable = {
+			t = var:DOH_shichang
+		}
+		multiply_temp_variable = {
+			t =  -0.04
+		}
+		add = t
+	}
+}
+
+# 投资效果
+DOH_modifier_touzi_effect_1_mtth = {
+	base = 0
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = var:DOH_touzi
+		}
+		multiply_temp_variable = {
+			t = 0.04
+		}
+		add = t
+	}
+}
+
+# 科研效果
+DOH_modifier_keyanjinfei_effect_1_mtth = {
+	base = 0
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = var:DOH_keyanjinfei
+		}
+		multiply_temp_variable = {
+			t = 0.04
+		}
+		add = t
+	}
+}
+
+# 公共开支
+DOH_modifier_gonggongkaizhi_effect_1_mtth = {
+	base = 0
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = var:DOH_gonggongkaizhi
+		}
+		multiply_temp_variable = {
+			t = 0.05
+		}
+		add = t
+	}
+}
+
+DOH_modifier_gonggongkaizhi_effect_2_mtth = {
+	base = 0
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = var:DOH_gonggongkaizhi
+		}
+		multiply_temp_variable = {
+			t = 0.01
+		}
+		add = t
+	}
+}
+
+DOH_modifier_gonggongkaizhi_effect_3_mtth = {
+	base = 0
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = var:DOH_gonggongkaizhi
+		}
+		multiply_temp_variable = {
+			t = 0.001
+		}
+		add = t
+	}
+}
+
+DOH_modifier_gonggongkaizhi_effect_4_mtth = {
+	base = 0
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = var:DOH_gonggongkaizhi
+		}
+		multiply_temp_variable = {
+			t = -0.05
+		}
+		add = t
+	}
+}
+# 生产经费
+DOH_modifier_shengchanjinfei_effect_1_mtth = {
+	base = 0
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = var:DOH_junshijinfei
+		}
+		multiply_temp_variable = {
+			t = 0.04
+		}
+		add = t
+	}
+}
+# 规模效应额外产能
+DOH_modifier_guimoxiaoying_effect_mtth = {
+	base = 0
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = mtth:DOH_guimoxiaoyin_mtth
+		}
+		multiply_temp_variable = {
+			t = 0.2
+		}
+		add = t
+	}
+}
+## 市场
+DOH_modifier_shichang_effect_1_mtth = {
+	base = 0
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = mtth:DOH_shichang
+		}
+		multiply_temp_variable = {
+			t = 0.4
+		}
+		add = t
+	}
+}
+
+## 工业目标
+DOH_gongyemubiao_mtth = {
+	base = 0
+	modifier = {
+		always = yes
+		set_temp_variable = {
+			t = var:DOH.num_of_factories
+		}
+		add = t
+	}
+	modifier = {
+		always = yes
+		factor = 1.1
+	}
+	modifier = {
+		has_war = no
+		factor = 1.1
+	}
+	modifier = {
+		has_completed_focus = DOH_junmingronghe
+		factor = 1.1
+	}
+	modifier = {
+		has_completed_focus = DOH_guangronghemengxiangdeyuanzheng
+		factor = 1.1
+	}
+}
--- a/src/common/on_actions/az_doh_dh1.txt
+++ b/src/common/on_actions/az_doh_dh1.txt
@@ -1,92 +1,38 @@
 on_actions = {
 	on_startup = {
 		effect = {
+			DOH_point_weekly_limit = yes
 			DOH = {
 				set_variable = {
 					var = DOH_touzi
 					value = 0
 					tooltip = "投资"
 				}
-				set_variable = {
-					var = DOH_touzi_effect
-					value = 0
-					tooltip = "投资影响"
-				}
 				set_variable = {
 					var = DOH_keyanjinfei
 					value = 0
 					tooltip = "额外科研经费"
 				}
-				set_variable = {
-					var = DOH_keyanjinfei_effect
-					value = 0
-					tooltip = "额外科研经费影响"
-				}
 				set_variable = {
 					var = DOH_junshijinfei
 					value = 0
 					tooltip = "额外生产经费"
 				}
-				set_variable = {
-					var = DOH_junshijinfei_effect
-					value = 0
-					tooltip = "额外生产经费影响"
-				}
 				set_variable = {
 					var = DOH_gonggongkaizhi
 					value = 0
 					tooltip = "公共开支"
 				}
-				set_variable = {
-					var = DOH_gonggongkaizhi_effect
-					value = 0
-					tooltip = "公共开支影响"
-				}
 				set_variable = {
 					var = DOH_shichang
 					value = 0
 					tooltip = "市场开放程度"
 				}
-				set_variable = {
-					var = DOH_shichang_effect
-					value = 0
-					tooltip = "市场开放程度影响"
-				}
-				set_variable = {
-					var = DOH_guimoxiaoyin
-					value = 0
-					tooltip = "规模效应"
-				}
-				set_variable = {
-					var = DOH_guimoxiaoyin_effect
-					value = 0
-					tooltip = "规模效应影响"
-				}
-				set_variable = {
-					var = DOH_zongjikaizhi
-					value = 0
-					tooltip = "总计开支"
-				}
-				set_variable = {
-					var = DOH_xiaofeipingyinxiang
-					value = 0
-					tooltip = "对消费品系数影响"
-				}
-				set_variable = {
-					var = DOH_xiaofeipingyinxiang_factor
-					value = 0.08
-					tooltip = "对消费品系数影响系数"
-				}
 				set_variable = {
 					var = DOH_zhichiduchengfa
 					value = -1
 					tooltip = "异议（原始）"
 				}
-				set_variable = {
-					var = extra_xiaofeiping
-					value = 0
-					tooltip = "额外消费品系数修正"
-				}
 				set_variable = {
 					var = DOH_gexinshengchanli
 					value = 0
@@ -97,7 +43,8 @@ on_actions = {
 	}
 	on_weekly = {
 		effect = {
-			DOH_mofifier_effect = yes
+			DOH_modifier_effect = yes
+			DOH_point_weekly_limit = yes
 			if = {
 				limit = {
 					DOH = {
--- a/src/common/scripted_effects/az_DOH_scripted_effects.txt
+++ b/src/common/scripted_effects/az_DOH_scripted_effects.txt
@@ -1,148 +1,26 @@
-DOH_mofifier_effect = {
+DOH_modifier_effect = {
+	## 显示用
 	set_variable = {
-		var = DOH_zongjikaizhi
-		value = 0
+		DOH_zongjikaizhi_mtth_display = mtth:DOH_zongjikaizhi_mtth
 	}
 	set_variable = {
-		var = DOH_xiaofeipingyinxiang
-		value = 0
-	}
-	add_to_variable = { var:DOH_zongjikaizhi = var:DOH_touzi }
-	add_to_variable = { var:DOH_zongjikaizhi = var:DOH_keyanjinfei }
-	add_to_variable = { var:DOH_zongjikaizhi = var:DOH_junshijinfei }
-	add_to_variable = { var:DOH_zongjikaizhi = var:DOH_gonggongkaizhi }
-	set_variable = { var:DOH_xiaofeipingyinxiang = var:DOH_zongjikaizhi }
-	multiply_variable = { var:DOH_xiaofeipingyinxiang = var:DOH_xiaofeipingyinxiang_factor }
-	set_variable = { var:DOH_touzi_effect = var:DOH_touzi }
-	multiply_variable = { var:DOH_touzi_effect = 0.04 }
-	set_variable = { var:DOH_keyanjinfei_effect = var:DOH_keyanjinfei }
-	multiply_variable = { var:DOH_keyanjinfei_effect = 0.035 }
-	set_variable = { var:DOH_junshijinfei_effect = var:DOH_junshijinfei }
-	multiply_variable = { var:DOH_junshijinfei_effect = 0.035 }
-	set_variable = { var:DOH_gonggongkaizhi_effect = var:DOH_gonggongkaizhi }
-	multiply_variable = { var:DOH_gonggongkaizhi_effect = 0.05 }
-	set_variable = { var:DOH_gonggongkaizhi_effect_m = var:DOH_gonggongkaizhi_effect }
-	multiply_variable = { var:DOH_gonggongkaizhi_effect_m = -1 }
-	set_variable = { var:DOH_gonggongkaizhi_effect_2 = var:DOH_gonggongkaizhi }
-	multiply_variable = { var:DOH_gonggongkaizhi_effect_2 = 0.01 }
-	set_variable = { var:DOH_gonggongkaizhi_effect_3 = var:DOH_gonggongkaizhi }
-	multiply_variable = { var:DOH_gonggongkaizhi_effect_3 = 0.001 }
-	set_variable = { var:DOH_shichang_effect = var:DOH_shichang }
-	multiply_variable = { var:DOH_shichang_effect = 0.03 }
-	set_variable = { var:DOH_shichang_effect_m = var:DOH_shichang_effect }
-	multiply_variable = { var:DOH_shichang_effect_m = -1 }
-	set_variable = {
-		var = DOH_xiaofeipingyinxiang_factor
-		value = 0.08
+		DOH_modifier_guimoxiaoying_effect_mtth_display = mtth:DOH_modifier_guimoxiaoying_effect_mtth
 	}
 	set_variable = {
-		var:DOH_zhichiduchengfa_effect = DOH_zhichiduchengfa
+		DOH_guimoxiaoyin_mtth_display = mtth:DOH_guimoxiaoyin_mtth
 	}
-	multiply_variable = { var:DOH_zhichiduchengfa_effect = -0.01 }
-	if = {
-		limit = {
-			DOH = {
-				has_completed_focus = DOH_donghuanggongyetixi
-			}
-		}
-		set_variable = {
-			var = DOH_guimoxiaoyin
-			value = DOH.num_of_civilian_factories
-		}
-		multiply_variable = { var:DOH_guimoxiaoyin = 0.01 }
-		set_variable = {
-			var = DOH_guimoxiaoyin_effect
-			value = DOH_guimoxiaoyin
-		}
-		multiply_variable = { var:DOH_guimoxiaoyin_effect = 0.05 }
-		set_variable = {
-			var = DOH_guimoxiaoyin_effect_2
-			value = DOH_guimoxiaoyin
-		}
-		multiply_variable = { var:DOH_guimoxiaoyin_effect_2 = 0.006 }
-		if = {
-			limit = {
-				check_variable = {
-					DOH_guimoxiaoyin_effect_2 > 0.018 # 大于300民用厂
-				}
-			}
-			add_to_variable = {
-				var = DOH_xiaofeipingyinxiang_factor
-				value = DOH_guimoxiaoyin_effect_2
-			}
-			add_to_variable = {
-				var = DOH_xiaofeipingyinxiang_factor
-				value = -0.018
-			}
-		}
-		# 革新生产力
-		set_variable = {
-			DOH_keyansudu_all = 0
-		}
-		if = {
-			limit = {
-				has_completed_focus = DOH_guangronghemengxiangdeyuanzheng
-			}
-			DOH_gexinshengchanli_effect = yes
-		}
-		multiply_variable = {
-			DOH_keyansudu_all = 0.2
-		}
-		add_to_variable = {
-			DOH_keyansudu_all = 1
-		}
-		divide_variable = {
-			DOH_xiaofeipingyinxiang_factor = DOH_keyansudu_all
-		}
+	set_variable = {
+		DOH_heqishengcai_mtth_display = mtth:DOH_heqishengcai_mtth
 	}
-	if = {
-		limit = {
-			has_completed_focus = DOH_heqishengcai
-		}
-		set_variable = {
-			extra_xiaofeiping = DOH.stability
-		}
-		multiply_variable = {
-			extra_xiaofeiping = -0.2
-		}
-		set_variable = {
-			extra_xiaofeiping_11 = DOH.num_of_civilian_factories
-		}
-		multiply_variable = {
-			extra_xiaofeiping_11 = -0.002
-		}
-		add_to_variable = {
-			extra_xiaofeiping = extra_xiaofeiping_11
-		}
+	set_variable = {
+		DOH_xiaofeipingyinxiang_factor_mtth_display = mtth:DOH_xiaofeipingyinxiang_factor_mtth
 	}
 	## 工业目标
 	set_variable = {
-		var:DOH_gongyeguihua_doing_goal_display = 1.1
-	}
-	if = {
-		limit = {
-			check_variable = {
-				DOH.num_of_factories < 450
-			}
-		}
-		set_variable = {
-			var:DOH_gongyeguihua_doing_goal_display = 450
-		}
-		subtract_from_variable = {
-			var:DOH_gongyeguihua_doing_goal_display = DOH.num_of_factories
-		}
-		multiply_variable = {
-			var:DOH_gongyeguihua_doing_goal_display = 0.001
-		}
-		add_to_variable = {
-			var:DOH_gongyeguihua_doing_goal_display = 1.1
-		}
-	}
-	multiply_variable = {
-		var:DOH_gongyeguihua_doing_goal_display = DOH.num_of_factories
+		var:DOH_gongyeguihua_doing_goal_display = mtth:DOH_gongyemubiao_mtth
 	}
 	round_variable = var:DOH_gongyeguihua_doing_goal_display
-	##核电站
+	## 核电站
 	DOH = {
 		every_owned_state = {
 			if = {
@@ -181,6 +59,7 @@ DOH_mofifier_effect = {
 		}
 	}

+	### 以下东煌工业品
 	if = {
 		limit = {
 			has_country_flag = DOH_auto_conv_com_arm
@@ -252,8 +131,9 @@ DOH_mofifier_effect = {
 			days = 10
 		}
 	}
+	### 以上东煌工业品

-	#东煌矿业大学
+	### 东煌矿业大学
 	if = {
 		limit = {
 			DOH = {
@@ -305,42 +185,6 @@ DOH_mofifier_effect = {
 			}
 		}
 	}
-
-	# if = {
-	# 	limit = {
-	# 		has_country_flag = DOH_auto_conv_cic_civ
-	# 		has > 10000
-	# 	}
-	# 	set_temp_variable = {
-	# 		temp_var:az_doh_clr_equ = var:cic
-	# 	}
-	# 	divide_temp_variable = {
-	# 		temp_var:az_doh_clr_equ = 1800
-	# 	}
-	# 	round_temp_variable = temp_var:az_doh_clr_equ
-	# 	set_temp_variable = {
-	# 		temp_var:az_doh_factroies_add = temp_var:az_doh_clr_equ
-	# 	}
-	# 	multiply_temp_variable = {
-	# 		temp_var:az_doh_clr_equ = -1800
-	# 	}
-	# 	add_equipment_to_stockpile = {
-	# 		type = doh_civ_equipment_1
-	# 		amount = temp_var:az_doh_clr_equ
-	# 	}
-	# 	add_offsite_building = {
-	# 		type = arms_factory
-	# 		level = temp_var:az_doh_factroies_add
-	# 	}
-	# 	add_offsite_building = {
-	# 		type = industrial_complex
-	# 		level = temp_var:az_doh_factroies_add
-	# 	}
-	# 	add_timed_idea = {
-	# 		idea = DOH_czdswgy
-	# 		days = 10
-	# 	}
-	# }
 }

 DOH_zhichilvchengfa_effect = {
@@ -348,29 +192,9 @@ DOH_zhichilvchengfa_effect = {
 		ideology = neutrality
 		popularity = DOH_zhichiduchengfa_effect
 	}
-	# if = {
-	# 	limit = { has_completed_focus = DOH_renminwansui }
-	# 	add_popularity = {
-	# 		ideology = communism
-	# 		popularity = DOH_zhichiduchengfa_effect
-	# 	}
-	# }
-	# if = {
-	# 	limit = { has_completed_focus = DOH_yinruwaizi }
-	# 	add_popularity = {
-	# 		ideology = democratic
-	# 		popularity = DOH_zhichiduchengfa_effect
-	# 	}
-	# }
-	# if = {
-	# 	limit = { has_completed_focus = DOH_yixianwansui }
-	# 	add_popularity = {
-	# 		ideology = fascism
-	# 		popularity = DOH_zhichiduchengfa_effect
-	# 	}
-	# }
 }

+### 以下对外输出
 DOH_duiwaishuchu_effect = {
 	# 工厂数目
 	set_variable = {
@@ -463,7 +287,9 @@ d_DOH_self_duiwaishuchu_init = {
 		DOH_duiwaishuchu_effect = yes
 	}
 }
+### 以上对外输出

+### 科学院
 doh_kexueyuan_effect = {
 	# set_variable = {
 	# 	shared_speed_factor = 0
@@ -529,6 +355,7 @@ doh_kexueyuan_effect = {
 	}
 }

+### 朝贡制度
 d_DOH_fanshu_add_effect = {
 	every_country = {
 		limit = {
@@ -619,28 +446,6 @@ DOH_neibufenqi_jiazhong_effect = {
 	custom_effect_tooltip = DOH_neibufenqi_jiazhong_effect_tooltip
 }

-DOH_gexinshengchanli_effect = {
-	DOH = {
-		set_variable = {
-			DOH_keyansudu_single = modifier@research_speed_factor
-		}
-		set_variable = {
-			DOH_keyancao_all = amount_research_slots
-		}
-		add_to_variable = {
-			DOH_keyancao_all = DOH_gexinshengchanli			
-		}
-		divide_variable = {
-			DOH_keyansudu_single = DOH_keyancao_all
-		}
-		set_variable = {
-			DOH_keyansudu_all = DOH_keyansudu_single
-		}
-		multiply_variable = {
-			DOH_keyansudu_all = DOH_gexinshengchanli
-		}
-	}
-}
 DOH_guocehejueyikaifa_effect = {
 	756 = {
 		set_state_flag = DOH_guocehejueyikaifa
@@ -708,4 +513,19 @@ DOH_guocehejueyikaifa_effect = {
 	743 = {
 		set_state_flag = DOH_guocehejueyikaifa
 	}
+}
+DOH_point_weekly_limit = {
+	## 堵死bug
+	set_variable = {
+		DOH_add_touzi_weekly_limit = 0
+	}
+	set_variable = {
+		DOH_add_gonggongkaizhi_weekly_limit = 0
+	}
+	set_variable = {
+		DOH_add_keyanjinfei_weekly_limit = 0
+	}
+	set_variable = {
+		DOH_add_junshijinfei_weekly_limit = 0
+	}
 }
--- a/src/common/scripted_guis/az_doh_guis.txt
+++ b/src/common/scripted_guis/az_doh_guis.txt
@@ -11,10 +11,16 @@ scripted_gui = {
 			az_doh_gui_touzi_add_one_click_enabled = {
 				has_completed_focus = DOH_jinjigaige
 				num_of_civilian_factories_available_for_projects > 5
+				check_variable = {
+					DOH_add_touzi_weekly_limit < 16
+				}
 			}
 			az_doh_gui_touzi_add_5_click_enabled = {
 				has_completed_focus = DOH_jinjigaige
 				num_of_civilian_factories_available_for_projects > 15
+				check_variable = {
+					DOH_add_touzi_weekly_limit < 16
+				}
 			}
 			az_doh_gui_touzi_subtract_one_click_enabled = {
 				has_completed_focus = DOH_jinjigaige
@@ -32,10 +38,16 @@ scripted_gui = {
 			az_doh_gui_gonggongkaizhi_add_one_click_enabled = {
 				has_completed_focus = DOH_shehuibaozhang
 				num_of_civilian_factories_available_for_projects > 5
+				check_variable = {
+					DOH_add_gonggongkaizhi_weekly_limit < 16
+				}
 			}
 			az_doh_gui_gonggongkaizhi_add_5_click_enabled = {
 				has_completed_focus = DOH_shehuibaozhang
 				num_of_civilian_factories_available_for_projects > 15
+				check_variable = {
+					DOH_add_gonggongkaizhi_weekly_limit < 16
+				}
 			}
 			az_doh_gui_gonggongkaizhi_subtract_one_click_enabled = {
 				has_completed_focus = DOH_shehuibaozhang
@@ -54,14 +66,20 @@ scripted_gui = {
 				has_completed_focus = DOH_rencaiyinjin
 				num_of_civilian_factories_available_for_projects > 5
 				check_variable = {
-					var:DOH_keyanjinfei < 30
+					var:DOH_keyanjinfei < 100
+				}
+				check_variable = {
+					DOH_add_keyanjinfei_weekly_limit < 16
 				}
 			}
 			az_doh_gui_keyanjinfei_add_5_click_enabled = {
 				has_completed_focus = DOH_rencaiyinjin
 				num_of_civilian_factories_available_for_projects > 15
 				check_variable = {
-					var:DOH_keyanjinfei < 26
+					var:DOH_keyanjinfei < 96
+				}
+				check_variable = {
+					DOH_add_keyanjinfei_weekly_limit < 16
 				}
 			}
 			az_doh_gui_keyanjinfei_subtract_one_click_enabled = {
@@ -80,10 +98,16 @@ scripted_gui = {
 			az_doh_gui_junshijinfei_add_one_click_enabled = {
 				has_completed_focus = DOH_donghuanggongyetixi
 				num_of_civilian_factories_available_for_projects > 5
+				check_variable = {
+					DOH_add_junshijinfei_weekly_limit < 16
+				}
 			}
 			az_doh_gui_junshijinfei_add_5_click_enabled = {
 				has_completed_focus = DOH_donghuanggongyetixi
 				num_of_civilian_factories_available_for_projects > 15
+				check_variable = {
+					DOH_add_junshijinfei_weekly_limit < 16
+				}
 			}
 			az_doh_gui_junshijinfei_subtract_one_click_enabled = {
 				has_completed_focus = DOH_donghuanggongyetixi
@@ -100,14 +124,14 @@ scripted_gui = {

 			az_doh_gui_shichang_add_one_click_enabled = {
 				check_variable = {
-					var:DOH_shichang < 15
+					var:DOH_shichang < 30
 				}
 				has_completed_focus = DOH_shichanghuanjishu
 			}
 			az_doh_gui_shichang_add_5_click_enabled = {
 				has_completed_focus = DOH_jinjigaige
 				check_variable = {
-					var:DOH_shichang < 10
+					var:DOH_shichang < 25
 				}
 				has_completed_focus = DOH_shichanghuanjishu
 			}
@@ -155,14 +179,20 @@ scripted_gui = {
 				add_to_variable = {
 					var:DOH_touzi = 1
 				}
-				DOH_mofifier_effect = yes
+				add_to_variable = {
+					var:DOH_add_touzi_weekly_limit = 1
+				}
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 			}
 			az_doh_gui_touzi_add_5_click = {
 				add_to_variable = {
 					var:DOH_touzi = 5
 				}
-				DOH_mofifier_effect = yes
+				add_to_variable = {
+					var:DOH_add_touzi_weekly_limit = 5
+				}
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
@@ -173,14 +203,14 @@ scripted_gui = {
 				add_to_variable = {
 					var:DOH_touzi = -1
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 			}
 			az_doh_gui_touzi_subtract_5_click = {
 				add_to_variable = {
 					var:DOH_touzi = -5
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
@@ -192,14 +222,20 @@ scripted_gui = {
 				add_to_variable = {
 					var:DOH_gonggongkaizhi = 1
 				}
-				DOH_mofifier_effect = yes
+				add_to_variable = {
+					var:DOH_add_gonggongkaizhi_weekly_limit = 1
+				}
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 			}
 			az_doh_gui_gonggongkaizhi_add_5_click = {
 				add_to_variable = {
 					var:DOH_gonggongkaizhi = 5
 				}
-				DOH_mofifier_effect = yes
+				add_to_variable = {
+					var:DOH_add_gonggongkaizhi_weekly_limit = 5
+				}
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
@@ -210,14 +246,14 @@ scripted_gui = {
 				add_to_variable = {
 					var:DOH_gonggongkaizhi = -1
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 			}
 			az_doh_gui_gonggongkaizhi_subtract_5_click = {
 				add_to_variable = {
 					var:DOH_gonggongkaizhi = -5
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
@@ -229,14 +265,20 @@ scripted_gui = {
 				add_to_variable = {
 					var:DOH_keyanjinfei = 1
 				}
-				DOH_mofifier_effect = yes
+				add_to_variable = {
+					var:DOH_add_keyanjinfei_weekly_limit = 1
+				}
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 			}
 			az_doh_gui_keyanjinfei_add_5_click = {
 				add_to_variable = {
 					var:DOH_keyanjinfei = 5
 				}
-				DOH_mofifier_effect = yes
+				add_to_variable = {
+					var:DOH_add_keyanjinfei_weekly_limit = 5
+				}
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
@@ -247,14 +289,14 @@ scripted_gui = {
 				add_to_variable = {
 					var:DOH_keyanjinfei = -1
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 			}
 			az_doh_gui_keyanjinfei_subtract_5_click = {
 				add_to_variable = {
 					var:DOH_keyanjinfei = -5
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
@@ -266,14 +308,20 @@ scripted_gui = {
 				add_to_variable = {
 					var:DOH_junshijinfei = 1
 				}
-				DOH_mofifier_effect = yes
+				add_to_variable = {
+					var:DOH_add_junshijinfei_weekly_limit = 1
+				}
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 			}
 			az_doh_gui_junshijinfei_add_5_click = {
 				add_to_variable = {
 					var:DOH_junshijinfei = 5
 				}
-				DOH_mofifier_effect = yes
+				add_to_variable = {
+					var:DOH_add_junshijinfei_weekly_limit = 5
+				}
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
@@ -284,14 +332,14 @@ scripted_gui = {
 				add_to_variable = {
 					var:DOH_junshijinfei = -1
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 			}
 			az_doh_gui_junshijinfei_subtract_5_click = {
 				add_to_variable = {
 					var:DOH_junshijinfei = -5
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
@@ -303,14 +351,14 @@ scripted_gui = {
 				add_to_variable = {
 					var:DOH_shichang = 1
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 			}
 			az_doh_gui_shichang_add_5_click = {
 				add_to_variable = {
 					var:DOH_shichang = 5
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
@@ -321,14 +369,14 @@ scripted_gui = {
 				add_to_variable = {
 					var:DOH_shichang = -1
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 			}
 			az_doh_gui_shichang_subtract_5_click = {
 				add_to_variable = {
 					var:DOH_shichang = -5
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
@@ -343,7 +391,7 @@ scripted_gui = {
 				DOH = {
 					add_research_slot = -1
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 			}
 			az_doh_gui_gexinshengchanli_add_5_click = {
@@ -353,7 +401,7 @@ scripted_gui = {
 				DOH = {
 					add_research_slot = -5
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
@@ -367,7 +415,7 @@ scripted_gui = {
 				DOH = {
 					add_research_slot = 1
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 			}
 			az_doh_gui_gexinshengchanli_subtract_5_click = {
@@ -377,7 +425,7 @@ scripted_gui = {
 				DOH = {
 					add_research_slot = 5
 				}
-				DOH_mofifier_effect = yes
+				DOH_modifier_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes
 				DOH_zhichilvchengfa_effect = yes