From d997ede41175e79ba5961eb580da1978f202cbe7 Mon Sep 17 00:00:00 2001 From: Ryifer <107375254+Ryifer@users.noreply.github.com> Date: Wed, 21 Sep 2022 19:44:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BB=8F=E6=B5=8E=E5=91=A8=E6=9C=9F=209/21?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BF=AE=E6=AD=A3=E5=8E=BB=E8=80=A6?= =?UTF-8?q?=E5=90=88=E5=92=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加了若干scripted_modifier以改善经济周期系统的兼容性 --- .../ethic_scripted_modifiers.txt | 65 +++++++++++++++++-- events/ethic_economic.txt | 18 ++++- .../english/ethic_modifiers_l_english.yml | 19 ++++-- .../ethic_modifiers_l_simp_chinese.yml | 19 ++++-- 4 files changed, 108 insertions(+), 13 deletions(-) diff --git a/common/scripted_modifiers/ethic_scripted_modifiers.txt b/common/scripted_modifiers/ethic_scripted_modifiers.txt index d00c24edb..edf4d2a9e 100644 --- a/common/scripted_modifiers/ethic_scripted_modifiers.txt +++ b/common/scripted_modifiers/ethic_scripted_modifiers.txt @@ -26,18 +26,70 @@ trade_value_reduction = { category = planet } -economic_situation_improve_add = { +rec_situation_improve_add = { # 不推荐使用，请使用有更多后缀版本 + icon = mod_cat_economy + good = yes + category = country +} +rec_civic_situation_improve_add = { # 来自体制的经济改善，无危机时 + icon = mod_cat_economy + good = yes + category = country +} +rec_crisis_civic_situation_improve_add = { # 来自体制的经济改善，有危机时 + icon = mod_cat_economy + good = no + category = country +} +rec_edict_situation_improve_add = { # 来自法令的经济改善，不区分危机与否 icon = mod_cat_economy good = yes category = country } -economic_crisis_accumulate_add = { +rec_crisis_accumulate_add = { # 不推荐使用，请使用有更多后缀版本 icon = mod_cat_economy good = no category = country } -economic_crisis_accumulate_decline = { +rec_civic_crisis_accumulate_add = { # 来自体制的危机积累，无危机时 + icon = mod_cat_economy + good = no + category = country +} +rec_crisis_civic_crisis_accumulate_add = { # 来自体制的危机积累，有危机时 + icon = mod_cat_economy + good = no + category = country +} +rec_edict_crisis_accumulate_add = { # 来自法令的危机积累，不区分危机与否 + icon = mod_cat_economy + good = no + category = country +} + +rec_crisis_accumulate_mult = { # 不推荐使用，请使用有更多后缀版本 （实际上也不能用） + icon = mod_cat_economy + percentage = yes + cap_zero_to_one = yes + good = yes + category = country +} +rec_civic_crisis_accumulate_mult = { # 来自体制的积累乘数，无危机时 （实际上也不能用） + icon = mod_cat_economy + percentage = yes + cap_zero_to_one = yes + good = yes + category = country +} +rec_crisis_civic_crisis_accumulate_mult = { # 来自体制的积累乘数，有危机时 （实际上也不能用） + icon = mod_cat_economy + percentage = yes + cap_zero_to_one = yes + good = yes + category = country +} +rec_edict_crisis_accumulate_mult = { # 来自法令的积累乘数，不区分危机与否 （实际上也不能用） icon = mod_cat_economy percentage = yes cap_zero_to_one = yes @@ -45,7 +97,12 @@ economic_crisis_accumulate_decline = { category = country } -economic_crisis_threshold_add = { +rec_crisis_threshold_add = { # 危机阈值增加，无危机时 + icon = mod_cat_economy + neutral = yes + category = country +} +rec_incrisis_crisis_threshold_add = { # 危机阈值增加，有危机时 icon = mod_cat_economy neutral = yes category = country diff --git a/events/ethic_economic.txt b/events/ethic_economic.txt index 685fe0770..4762f322e 100644 --- a/events/ethic_economic.txt +++ b/events/ethic_economic.txt @@ -154,6 +154,14 @@ situation_event = { # 计算情况改善-国策基础 6号 hide_window = yes immediate = { set_variable = { which = rec_situation_add_civic_temp value = 0 } # 初始化经济情况改善 - 国策基础 + if = { # 加载scripted_modifier + limit={ has_situation_flag = economic_crisis } + change_variable = { which = rec_situation_add_civic_temp value = modifier:rec_incrisis_civic_situation_improve_add } + } + else = { + change_variable = { which = rec_situation_add_civic_temp value = modifier:rec_civic_situation_improve_add } + } + # 政策 if = { # 自由市场 +1.0增长 limit={ @@ -373,7 +381,8 @@ situation_event = { # 计算情况改善-法令基础 16号 is_triggered_only = yes hide_window = yes immediate = { - set_variable = { which = rec_situation_add_edict_temp value = 0 } # 初始化经济情况改善 - 法令基础 + set_variable = { which = rec_situation_add_edict_temp value = 0 } # 初始化经济情况改善 - 法令基础国策基础 + change_variable = { which = rec_situation_add_edict_temp value = modifier:rec_edict_situation_improve_add } # 加载scripted_modifier if = { # 发放消费券 +0.3增长 limit = { owner = { has_edict = economic_consumer_coupon } @@ -690,8 +699,12 @@ situation_event = { # 计算危机阈值 2号 if = { # 经济危机乘数 *50%阈值 limit = { has_situation_flag = economic_crisis } + change_variable = { which = rec_crisis_threshold value = modifier:rec_incrisis_crisis_threshold_add } # 加载scripted_modifier multiply_variable = { which = rec_crisis_threshold value = 0.5 } } + else = { + change_variable = { which = rec_crisis_threshold value = modifier:rec_crisis_threshold_add } # 加载scripted_modifier + } set_variable = { which = rec_crisis_threshold_self value = rec_crisis_threshold } if = { # 共同市场危机阈值 @@ -752,6 +765,7 @@ situation_event = { # 计算危机增长-有危机时 3号 } set_variable = { which = rec_crisis_add_civic value = 0 } + change_variable = { which = rec_crisis_add_civic value = modifier:mod_rec_incrisis_civic_crisis_accumulate_add } # 加载scripted_modifier if = { # 受控市场 -0.1增长 limit={ owner = { has_policy_flag = economic_stance_mixed } } change_variable = { which = rec_crisis_add_civic value = -0.1 } @@ -801,6 +815,7 @@ situation_event = { # 计算危机增长-无危机时-国策基础 8号 hide_window = yes immediate = { set_variable = { which = rec_crisis_add_civic value = 0 } # 初始化危机累积增加 - 国策基础 + change_variable = { which = rec_crisis_add_civic value = modifier:mod_rec_civic_crisis_accumulate_add } # 加载scripted_modifier # 政策 if = { # 受控市场 -0.1增长 limit={ @@ -948,6 +963,7 @@ situation_event = { # 计算危机增长-无危机时-法令基础 18号 hide_window = yes immediate = { set_variable = { which = rec_crisis_add_edict value = 0 } # 初始化危机累积增加 - 法令基础 + change_variable = { which = rec_crisis_add_edict value = modifier:mod_rec_edict_crisis_accumulate_add } # 加载scripted_modifier if = { # 福报 +0.1增长 limit={ owner = { has_edict = blessings } diff --git a/localisation/replace/english/ethic_modifiers_l_english.yml b/localisation/replace/english/ethic_modifiers_l_english.yml index 408008129..1d5e43550 100644 --- a/localisation/replace/english/ethic_modifiers_l_english.yml +++ b/localisation/replace/english/ethic_modifiers_l_english.yml @@ -56,10 +56,21 @@ mod_pop_category_slave_consumer_goods_upkeep_mult:0 "$mod_pop_category_slave_consumer_goods_upkeep_add$" mod_pop_category_bio_trophy_consumer_goods_upkeep_mult:0 "$mod_pop_category_bio_trophy_consumer_goods_upkeep_add$" - mod_economic_situation_improve_add:0 "Economic Situation Improve" - mod_economic_crisis_accumulate_add:0 "Economic Crisis Accumulate" - mod_economic_crisis_accumulate_decline:0 "Economic Crisis Accumulate Decline" - mod_economic_crisis_threshold_add:0 "Economic Crisis Threshold" + mod_rec_situation_improve_add:0 "Economic Situation Improve" + mod_rec_civic_situation_improve_add:0 "$mod_rec_situation_improve_add$" + mod_rec_edict_situation_improve_add:0 "$mod_rec_situation_improve_add$" + mod_rec_crisis_accumulate_add:0 "Economic Crisis Accumulate" + mod_rec_civic_crisis_accumulate_add:0 "$mod_rec_crisis_accumulate_add$" + mod_rec_edict_crisis_accumulate_add:0 "$mod_rec_crisis_accumulate_add$" + mod_rec_crisis_accumulate_mult:0 "$mod_rec_crisis_accumulate_add$" #暂用危机积累的本地化 + mod_rec_civic_crisis_accumulate_mult:0 "$mod_rec_crisis_accumulate_mult$" + mod_rec_edict_crisis_accumulate_mult:0 "$mod_rec_crisis_accumulate_mult$" + mod_rec_crisis_threshold_add:0 "Economic Crisis Threshold" + remark_rec_incrisis:0 "(In Crisis)" + mod_rec_incrisis_civic_situation_improve_add:0 "$mod_rec_situation_improve_add$ $remark_rec_incrisis$" + mod_rec_incrisis_civic_crisis_accumulate_add:0 "$mod_rec_crisis_accumulate_add$ $remark_rec_incrisis$" + mod_rec_incrisis_civic_crisis_accumulate_mult:0 "$mod_rec_crisis_accumulate_mult$ $remark_rec_incrisis$" + mod_rec_incrisis_crisis_threshold_add:0 "$mod_rec_crisis_threshold_add$ $remark_rec_incrisis$" mod_planet_metallurgists_produces_mult:0 "£job_foundry£ $job_foundry_plural$ and £job_smelting_workers£ $job_smelting_workers_plural$ Output" mod_planet_artisans_produces_mult:0 "£job_artisan£ $job_artisan_plural$ and £job_smelting_workers£ $job_smelting_workers_plural$ Output" diff --git a/localisation/replace/simp_chinese/ethic_modifiers_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_modifiers_l_simp_chinese.yml index 165ba1c17..9ac3d7e8c 100644 --- a/localisation/replace/simp_chinese/ethic_modifiers_l_simp_chinese.yml +++ b/localisation/replace/simp_chinese/ethic_modifiers_l_simp_chinese.yml @@ -187,10 +187,21 @@ mod_pop_category_slave_consumer_goods_upkeep_mult:0 "$mod_pop_category_slave_consumer_goods_upkeep_add$" mod_pop_category_bio_trophy_consumer_goods_upkeep_mult:0 "$mod_pop_category_bio_trophy_consumer_goods_upkeep_add$" - mod_economic_situation_improve_add:0 "经济状态改善" - mod_economic_crisis_accumulate_add:0 "经济危机积累" - mod_economic_crisis_accumulate_decline:0 "经济危机积累减少" - mod_economic_crisis_threshold_add:0 "经济危机阈值" + mod_rec_situation_improve_add:0 "每月经济状态" + mod_rec_civic_situation_improve_add:0 "$mod_rec_situation_improve_add$" + mod_rec_edict_situation_improve_add:0 "$mod_rec_situation_improve_add$" + mod_rec_crisis_accumulate_add:0 "每月经济危机积累" + mod_rec_civic_crisis_accumulate_add:0 "$mod_rec_crisis_accumulate_add$" + mod_rec_edict_crisis_accumulate_add:0 "$mod_rec_crisis_accumulate_add$" + mod_rec_crisis_accumulate_mult:0 "$mod_rec_crisis_accumulate_add$" #暂用危机积累的本地化 + mod_rec_civic_crisis_accumulate_mult:0 "$mod_rec_crisis_accumulate_mult$" + mod_rec_edict_crisis_accumulate_mult:0 "$mod_rec_crisis_accumulate_mult$" + mod_rec_crisis_threshold_add:0 "经济危机阈值" + remark_rec_incrisis:0 "（经济危机时）" + mod_rec_incrisis_civic_situation_improve_add:0 "$mod_rec_situation_improve_add$$remark_rec_incrisis$" + mod_rec_incrisis_civic_crisis_accumulate_add:0 "$mod_rec_crisis_accumulate_add$$remark_rec_incrisis$" + mod_rec_incrisis_civic_crisis_accumulate_mult:0 "$mod_rec_crisis_accumulate_mult$$remark_rec_incrisis$" + mod_rec_incrisis_crisis_threshold_add:0 "$mod_rec_crisis_threshold_add$$remark_rec_incrisis$" mod_pop_ethic_pacifist_attraction_mult:0 "道德主义思潮吸引力" mod_pop_ethic_militarist_attraction_mult:0 "军国主义思潮吸引力" From a407388078421f4962e95ff0a4670cce7b329ec1 Mon Sep 17 00:00:00 2001 From: Ryifer <107375254+Ryifer@users.noreply.github.com> Date: Fri, 23 Sep 2022 16:05:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=BB=8F=E6=B5=8E=E5=91=A8=E6=9C=9Fv1.6.2?= =?UTF-8?q?=20=E5=8E=BB=E8=80=A6=E5=90=88=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 加入了若干modifier以提高代码的去耦合 --- events/ethic_economic.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/events/ethic_economic.txt b/events/ethic_economic.txt index 4762f322e..e2204a6d2 100644 --- a/events/ethic_economic.txt +++ b/events/ethic_economic.txt @@ -156,10 +156,10 @@ situation_event = { # 计算情况改善-国策基础 6号 set_variable = { which = rec_situation_add_civic_temp value = 0 } # 初始化经济情况改善 - 国策基础 if = { # 加载scripted_modifier limit={ has_situation_flag = economic_crisis } - change_variable = { which = rec_situation_add_civic_temp value = modifier:rec_incrisis_civic_situation_improve_add } + change_variable = { which = rec_situation_add_civic_temp value = owner.modifier:rec_incrisis_civic_situation_improve_add } } else = { - change_variable = { which = rec_situation_add_civic_temp value = modifier:rec_civic_situation_improve_add } + change_variable = { which = rec_situation_add_civic_temp value = owner.modifier:rec_civic_situation_improve_add } } # 政策 @@ -382,7 +382,7 @@ situation_event = { # 计算情况改善-法令基础 16号 hide_window = yes immediate = { set_variable = { which = rec_situation_add_edict_temp value = 0 } # 初始化经济情况改善 - 法令基础国策基础 - change_variable = { which = rec_situation_add_edict_temp value = modifier:rec_edict_situation_improve_add } # 加载scripted_modifier + change_variable = { which = rec_situation_add_edict_temp value = owner.modifier:rec_edict_situation_improve_add } # 加载scripted_modifier if = { # 发放消费券 +0.3增长 limit = { owner = { has_edict = economic_consumer_coupon } @@ -697,13 +697,13 @@ situation_event = { # 计算危机阈值 2号 } } - if = { # 经济危机乘数 *50%阈值 + if = { # 经济危机差分 limit = { has_situation_flag = economic_crisis } - change_variable = { which = rec_crisis_threshold value = modifier:rec_incrisis_crisis_threshold_add } # 加载scripted_modifier + change_variable = { which = rec_crisis_threshold value = owner.modifier:rec_incrisis_crisis_threshold_add } # 加载scripted_modifier multiply_variable = { which = rec_crisis_threshold value = 0.5 } } else = { - change_variable = { which = rec_crisis_threshold value = modifier:rec_crisis_threshold_add } # 加载scripted_modifier + change_variable = { which = rec_crisis_threshold value = owner.modifier:rec_crisis_threshold_add } # 加载scripted_modifier } set_variable = { which = rec_crisis_threshold_self value = rec_crisis_threshold } @@ -765,7 +765,7 @@ situation_event = { # 计算危机增长-有危机时 3号 } set_variable = { which = rec_crisis_add_civic value = 0 } - change_variable = { which = rec_crisis_add_civic value = modifier:mod_rec_incrisis_civic_crisis_accumulate_add } # 加载scripted_modifier + change_variable = { which = rec_crisis_add_civic value = owner.modifier:rec_incrisis_civic_crisis_accumulate_add } # 加载scripted_modifier if = { # 受控市场 -0.1增长 limit={ owner = { has_policy_flag = economic_stance_mixed } } change_variable = { which = rec_crisis_add_civic value = -0.1 } @@ -815,7 +815,7 @@ situation_event = { # 计算危机增长-无危机时-国策基础 8号 hide_window = yes immediate = { set_variable = { which = rec_crisis_add_civic value = 0 } # 初始化危机累积增加 - 国策基础 - change_variable = { which = rec_crisis_add_civic value = modifier:mod_rec_civic_crisis_accumulate_add } # 加载scripted_modifier + change_variable = { which = rec_crisis_add_civic value = owner.modifier:rec_civic_crisis_accumulate_add } # 加载scripted_modifier # 政策 if = { # 受控市场 -0.1增长 limit={ @@ -963,7 +963,7 @@ situation_event = { # 计算危机增长-无危机时-法令基础 18号 hide_window = yes immediate = { set_variable = { which = rec_crisis_add_edict value = 0 } # 初始化危机累积增加 - 法令基础 - change_variable = { which = rec_crisis_add_edict value = modifier:mod_rec_edict_crisis_accumulate_add } # 加载scripted_modifier + change_variable = { which = rec_crisis_add_edict value = owner.modifier:mod_rec_edict_crisis_accumulate_add } # 加载scripted_modifier if = { # 福报 +0.1增长 limit={ owner = { has_edict = blessings } @@ -1109,7 +1109,7 @@ situation_event = { # 计算危机积累 4号 #if = { # 战时经济重整 # limit = { owner = { is_at_war = yes } } - # change_variable = { which = rec_crisis_add_war value = value:crisis_decline_war } # BUG，本该是set_variable，目前不修 + # change_variable = { which = rec_crisis_add_war value = value:crisis_decline_war } #} # 测试新版战争经济-提供少量危机减少 if = { # 战时经济重整-释放危机压力 From d6fef98dc6937dd02bd717e9e6f8431a9b511a51 Mon Sep 17 00:00:00 2001 From: Ryifer <107375254+Ryifer@users.noreply.github.com> Date: Fri, 23 Sep 2022 16:10:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=BA=E6=B0=91=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/edicts/00_communists_edicts.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/edicts/00_communists_edicts.txt b/common/edicts/00_communists_edicts.txt index 420bcc34d..ce63d770b 100644 --- a/common/edicts/00_communists_edicts.txt +++ b/common/edicts/00_communists_edicts.txt @@ -151,6 +151,12 @@ speed_of_people = { category = campaigns upkeep = { unity = 0.6 + multiplier = trigger:num_pops + } + } + resources = { + category = campaigns + upkeep = { minerals = 0.4 multiplier = trigger:num_pops } From 62e310408c69ead4f568e17b602797b784640520 Mon Sep 17 00:00:00 2001 From: Ryifer <107375254+Ryifer@users.noreply.github.com> Date: Fri, 23 Sep 2022 16:38:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E9=A2=84=E9=98=B2?= =?UTF-8?q?=E6=98=9F=E7=90=83=E4=B8=8D=E7=A8=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/static_modifiers/00_pop_static_modifiers.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/common/static_modifiers/00_pop_static_modifiers.txt b/common/static_modifiers/00_pop_static_modifiers.txt index 9245e9d49..ccb9144fb 100644 --- a/common/static_modifiers/00_pop_static_modifiers.txt +++ b/common/static_modifiers/00_pop_static_modifiers.txt @@ -43,8 +43,7 @@ planet_stability_no_happiness_low = { pop_growth_speed_reduction = 0.15 pop_amenities_usage_mult = 0.15 planet_emigration_push_mult = 0.65 - planet_crime_no_happiness_mult = 0.45 - + planet_crime_no_happiness_mult = 0.15 } #稳定度高（格式塔） @@ -58,7 +57,7 @@ planet_stability_no_happiness_high = { planet_stability_low = { planet_jobs_produces_mult = -0.65 pop_growth_speed_reduction = 0.4 - pop_amenities_usage_mult = 0.4 + pop_amenities_usage_mult = -0.5 #低稳定度下减少生活预期 planet_emigration_push_mult = 1 trade_value_mult = -0.8 planet_crime_mult = 0.35 @@ -125,7 +124,7 @@ planet_amenities_high = { # 住房 ( 25% - 200% of required) #拥挤（格式塔） planet_housing_no_happiness_low = { - planet_stability_add = -5 + #planet_stability_add = -5 pop_amenities_usage_mult = 1.85 } @@ -137,8 +136,8 @@ planet_housing_no_happiness_high = { #拥挤 planet_housing_low = { - planet_stability_add = -10 - pop_amenities_usage_mult = 0.85 + #planet_stability_add = -10 + pop_amenities_usage_mult = 0.75 planet_immigration_pull_mult = -0.65 planet_emigration_push_mult = 0.45 pop_growth_speed_reduction = 0.65 From dc156ee4f0bd8e2bf36281736a9e40dda0b6ef87 Mon Sep 17 00:00:00 2001 From: Ryifer <107375254+Ryifer@users.noreply.github.com> Date: Fri, 23 Sep 2022 16:41:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=BB=8F=E6=B5=8E=E5=91=A8=E6=9C=9Fv1.6.2.?= =?UTF-8?q?1=20=E4=BF=AE=E5=A4=8D=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E7=9A=84=E6=9B=B4=E5=A4=9A=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E9=94=99=E8=AF=AF=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- events/ethic_economic_crisis.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/events/ethic_economic_crisis.txt b/events/ethic_economic_crisis.txt index 9d2b1a492..df10eaaf6 100644 --- a/events/ethic_economic_crisis.txt +++ b/events/ethic_economic_crisis.txt @@ -101,7 +101,7 @@ country_event = { # 经济周期控制面板 } } } -situation_event = { # 经济周期帮助面板 +country_event = { # 经济周期帮助面板 id = ethic_economic.99990 is_triggered_only = yes hide_window = no @@ -149,7 +149,7 @@ country_event = { # 经济周期帮助-改善 option = { # 返回帮助面板 name = ethic_economic_help_return_option hidden_effect = { - situation_event = { id = ethic_economic.99990 } + country_event = { id = ethic_economic.99990 } } } } @@ -163,7 +163,7 @@ country_event = { # 经济周期帮助-积累 option = { # 返回帮助面板 name = ethic_economic_help_return_option hidden_effect = { - situation_event = { id = ethic_economic.99990 } + country_event = { id = ethic_economic.99990 } } } } @@ -177,7 +177,7 @@ country_event = { # 经济周期帮助-市场 option = { # 返回帮助面板 name = ethic_economic_help_return_option hidden_effect = { - situation_event = { id = ethic_economic.99990 } + country_event = { id = ethic_economic.99990 } } } } @@ -191,7 +191,7 @@ country_event = { # 经济周期帮助-扩张 option = { # 返回帮助面板 name = ethic_economic_help_return_option hidden_effect = { - situation_event = { id = ethic_economic.99990 } + country_event = { id = ethic_economic.99990 } } } }