From fd841beb5b545a78d996f0c01803d8027df6a997 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Thu, 25 Jul 2024 00:31:10 +0800 Subject: [PATCH] 2024-07-25 00:31:10 --- .../ai_strategy_plans/az_doh_focusplan.txt | 6 +- src/common/autonomous_states/az_puppet.txt | 3 +- .../autonomous_states/doh_fanshuguo.txt | 6 +- src/common/bookmarks/the_gathering_storm.txt | 2 +- src/common/decisions/DOH_decision.txt | 604 +++++++++--------- .../DOH_dynamic_modifiers.txt | 86 ++- src/common/ideas/doh.txt | 77 ++- src/common/national_focus/donghuang_new.txt | 67 +- src/interface/az_pt_window.gui | 2 +- src/interface/az_xmp_window.gui | 6 +- .../simp_chinese/azc_DOH_l_simp_chinese.yml | 10 + 11 files changed, 487 insertions(+), 382 deletions(-) diff --git a/src/common/ai_strategy_plans/az_doh_focusplan.txt b/src/common/ai_strategy_plans/az_doh_focusplan.txt index 1eb6d45..29fe9c2 100755 --- a/src/common/ai_strategy_plans/az_doh_focusplan.txt +++ b/src/common/ai_strategy_plans/az_doh_focusplan.txt @@ -86,7 +86,7 @@ DOH_historical = { DOH_yuanyanghaijun DOH_yunshujiandui - DOH_aoranzili + #DOH_aoranzili DOH_baochiweishe # #1936 # DOH_junshigaige #49 @@ -164,7 +164,7 @@ DOH_red = { } } abort = { - has_completed_focus = DOH_shikejingjie + has_completed_focus = DOH_xianchuyiqie } ai_national_focuses = { @@ -262,7 +262,7 @@ DOH_red = { } } abort = { - has_completed_focus = DOH_shikejingjie + has_completed_focus = DOH_xianchuyiqie } ai_national_focuses = { diff --git a/src/common/autonomous_states/az_puppet.txt b/src/common/autonomous_states/az_puppet.txt index 29b09a6..c26accd 100755 --- a/src/common/autonomous_states/az_puppet.txt +++ b/src/common/autonomous_states/az_puppet.txt @@ -1,12 +1,11 @@ autonomy_state = { id = az_yuw_kuileiguo - icon = autonomy_collaboration_government default = yes is_puppet = yes use_overlord_color = yes min_freedom_level = 0.2 - manpower_influence = 1.2 + manpower_influence = 1.0 rule = { can_not_declare_war = yes diff --git a/src/common/autonomous_states/doh_fanshuguo.txt b/src/common/autonomous_states/doh_fanshuguo.txt index d6014fe..48811cb 100755 --- a/src/common/autonomous_states/doh_fanshuguo.txt +++ b/src/common/autonomous_states/doh_fanshuguo.txt @@ -10,17 +10,15 @@ autonomy_state = { can_decline_call_to_war = no can_be_spymaster = no contributes_operatives = yes - can_send_volunteers = yes - can_puppet = yes + # can_send_volunteers = yes + # can_puppet = yes } modifier = { can_master_build_for_us = 1 - master_ideology_drift = 1 faction_trade_opinion_factor = 1 opinion_gain_monthly_same_ideology_factor = 0.2 - } ai_subject_wants_higher = { diff --git a/src/common/bookmarks/the_gathering_storm.txt b/src/common/bookmarks/the_gathering_storm.txt index f2c6c78..af6f5a6 100755 --- a/src/common/bookmarks/the_gathering_storm.txt +++ b/src/common/bookmarks/the_gathering_storm.txt @@ -103,7 +103,7 @@ bookmarks = { focuses = { DOH_huanxingjulong DOH_dulizizhudejungong - DOH_guguodejueze + DOH_ninghaixiaxiyang } } "SAD"={ diff --git a/src/common/decisions/DOH_decision.txt b/src/common/decisions/DOH_decision.txt index f026178..8028875 100755 --- a/src/common/decisions/DOH_decision.txt +++ b/src/common/decisions/DOH_decision.txt @@ -1151,308 +1151,308 @@ DOH_industry_decision_category = { } DOH_decision_debug_category = { - DOH_decision_add_touzi = { - icon = xingdong - ai_will_do = { - factor = 0 - } - visible = { - OR = { - is_debug = yes - has_completed_focus = DOH_jinjigaige - } - } - cost = 10 - available = { - num_of_civilian_factories_available_for_projects > 0 - } - complete_effect = { - custom_effect_tooltip = "增加1点投资" - effect_tooltip = { - add_dynamic_modifier = { - modifier = DOH_fake_add_touzi - } - } - add_to_variable = { - var:DOH_touzi = 1 - } - DOH_mofifier_effect = yes - DOH_zhichilvchengfa_effect = yes - } - } - DOH_decision_rm_touzi = { - icon = xingdong - ai_will_do = { - factor = 0 - } - visible = { - OR = { - is_debug = yes - AND = { - check_variable = { - var:DOH_touzi > 0 - } - has_completed_focus = DOH_jinjigaige - } - } - } - cost = 10 - complete_effect = { - custom_effect_tooltip = "减少1点投资" - effect_tooltip = { - remove_dynamic_modifier = { - modifier = DOH_fake_add_touzi - } - } - add_to_variable = { - var:DOH_touzi = -1 - } - DOH_mofifier_effect = yes - DOH_zhichilvchengfa_effect = yes - } - } - DOH_decision_add_gonggongkaizhi = { - icon = xingdong - ai_will_do = { - factor = 0 - } - visible = { - OR = { - is_debug = yes - has_completed_focus = DOH_shehuibaozhang - } - } - cost = 10 - available = { - num_of_civilian_factories_available_for_projects > 0 - } - complete_effect = { - custom_effect_tooltip = "增加1点公共开支" - effect_tooltip = { - add_dynamic_modifier = { - modifier = DOH_fake_add_gonggongkaizhi - } - } - add_to_variable = { - var:DOH_gonggongkaizhi = 1 - } - DOH_mofifier_effect = yes - DOH_zhichilvchengfa_effect = yes - } - } - DOH_decision_rm_gonggongkaizhi = { - icon = xingdong - ai_will_do = { - factor = 0 - } - visible = { - OR = { - is_debug = yes - AND = { - check_variable = { - var:DOH_gonggongkaizhi > 0 - } - has_completed_focus = DOH_shehuibaozhang - } - } - } - cost = 10 - complete_effect = { - custom_effect_tooltip = "减少1点公共开支" - effect_tooltip = { - remove_dynamic_modifier = { - modifier = DOH_fake_add_gonggongkaizhi - } - } - add_to_variable = { - var:DOH_gonggongkaizhi = -1 - } - DOH_mofifier_effect = yes - DOH_zhichilvchengfa_effect = yes - } - } - DOH_decision_add_keyanjinfei = { - icon = xingdong - ai_will_do = { - factor = 0 - } - visible = { - OR = { - is_debug = yes - has_completed_focus = DOH_rencaiyinjin - } - } - cost = 10 - available = { - num_of_civilian_factories_available_for_projects > 0 - } - complete_effect = { - custom_effect_tooltip = "增加1点额外科研经费" - effect_tooltip = { - add_dynamic_modifier = { - modifier = DOH_fake_add_keyanjinfen - } - } - add_to_variable = { - var:DOH_keyanjinfei = 1 - } - DOH_mofifier_effect = yes - DOH_zhichilvchengfa_effect = yes - } - } - DOH_decision_rm_keyanjinfei = { - icon = xingdong - ai_will_do = { - factor = 0 - } - visible = { - OR = { - is_debug = yes - AND = { - check_variable = { - var:DOH_keyanjinfei > 0 - } - has_completed_focus = DOH_rencaiyinjin - } - } - } - cost = 10 - complete_effect = { - custom_effect_tooltip = "减少1点额外科研经费" - effect_tooltip = { - remove_dynamic_modifier = { - modifier = DOH_fake_add_keyanjinfen - } - } - add_to_variable = { - var:DOH_keyanjinfei = -1 - } - DOH_mofifier_effect = yes - DOH_zhichilvchengfa_effect = yes - } - } - DOH_decision_add_junshijinfei = { - icon = xingdong - ai_will_do = { - factor = 0 - } - available = { - num_of_civilian_factories_available_for_projects > 0 - } - visible = { - OR = { - is_debug = yes - has_completed_focus = DOH_jinjigaige - } - } - cost = 10 - complete_effect = { - custom_effect_tooltip = "增加1点额外生产经费" - effect_tooltip = { - add_dynamic_modifier = { - modifier = DOH_fake_add_junshijinfei - } - } - add_to_variable = { - var:DOH_junshijinfei = 1 - } - DOH_mofifier_effect = yes - DOH_zhichilvchengfa_effect = yes - } - } - DOH_decision_rm_junshijinfei = { - icon = xingdong - ai_will_do = { - factor = 0 - } - visible = { - OR = { - is_debug = yes - AND = { - check_variable = { - var:DOH_junshijinfei > 0 - } - has_completed_focus = DOH_jinjigaige - } - } - } - cost = 10 - complete_effect = { - custom_effect_tooltip = "减少1点额外生产经费" - effect_tooltip = { - remove_dynamic_modifier = { - modifier = DOH_fake_add_junshijinfei - } - } - add_to_variable = { - var:DOH_junshijinfei = -1 - } - DOH_mofifier_effect = yes - DOH_zhichilvchengfa_effect = yes - } - } - DOH_decision_add_shichang = { - icon = xingdong - ai_will_do = { - factor = 0 - } - visible = { - OR = { - is_debug = yes - AND = { - check_variable = { - var:DOH_shichang < 15 - } - has_completed_focus = DOH_shichanghuanjishu - } - } - } - cost = 10 - complete_effect = { - custom_effect_tooltip = "增加1点市场开放程度" - effect_tooltip = { - add_dynamic_modifier = { - modifier = DOH_fake_add_shichangkaifang - } - } - add_to_variable = { - var:DOH_shichang = 1 - } - DOH_mofifier_effect = yes - DOH_zhichilvchengfa_effect = yes - } - } - DOH_decision_rm_shichang = { - icon = xingdong - ai_will_do = { - factor = 0 - } - visible = { - OR = { - is_debug = yes - AND = { - check_variable = { - var:DOH_shichang > 0 - } - has_completed_focus = DOH_shichanghuanjishu - } - } - } - cost = 10 - complete_effect = { - custom_effect_tooltip = "减少1点市场开放程度" - effect_tooltip = { - remove_dynamic_modifier = { - modifier = DOH_fake_add_shichangkaifang - } - } - add_to_variable = { - var:DOH_shichang = -1 - } - DOH_mofifier_effect = yes - DOH_zhichilvchengfa_effect = yes - } - } +# DOH_decision_add_touzi = { +# icon = xingdong +# ai_will_do = { +# factor = 0 +# } +# visible = { +# OR = { +# is_debug = yes +# has_completed_focus = DOH_jinjigaige +# } +# } +# cost = 10 +# available = { +# num_of_civilian_factories_available_for_projects > 0 +# } +# complete_effect = { +# custom_effect_tooltip = "增加1点投资" +# effect_tooltip = { +# add_dynamic_modifier = { +# modifier = DOH_fake_add_touzi +# } +# } +# add_to_variable = { +# var:DOH_touzi = 1 +# } +# DOH_mofifier_effect = yes +# DOH_zhichilvchengfa_effect = yes +# } +# } +# DOH_decision_rm_touzi = { +# icon = xingdong +# ai_will_do = { +# factor = 0 +# } +# visible = { +# OR = { +# is_debug = yes +# AND = { +# check_variable = { +# var:DOH_touzi > 0 +# } +# has_completed_focus = DOH_jinjigaige +# } +# } +# } +# cost = 10 +# complete_effect = { +# custom_effect_tooltip = "减少1点投资" +# effect_tooltip = { +# remove_dynamic_modifier = { +# modifier = DOH_fake_add_touzi +# } +# } +# add_to_variable = { +# var:DOH_touzi = -1 +# } +# DOH_mofifier_effect = yes +# DOH_zhichilvchengfa_effect = yes +# } +# } +# DOH_decision_add_gonggongkaizhi = { +# icon = xingdong +# ai_will_do = { +# factor = 0 +# } +# visible = { +# OR = { +# is_debug = yes +# has_completed_focus = DOH_shehuibaozhang +# } +# } +# cost = 10 +# available = { +# num_of_civilian_factories_available_for_projects > 0 +# } +# complete_effect = { +# custom_effect_tooltip = "增加1点公共开支" +# effect_tooltip = { +# add_dynamic_modifier = { +# modifier = DOH_fake_add_gonggongkaizhi +# } +# } +# add_to_variable = { +# var:DOH_gonggongkaizhi = 1 +# } +# DOH_mofifier_effect = yes +# DOH_zhichilvchengfa_effect = yes +# } +# } +# DOH_decision_rm_gonggongkaizhi = { +# icon = xingdong +# ai_will_do = { +# factor = 0 +# } +# visible = { +# OR = { +# is_debug = yes +# AND = { +# check_variable = { +# var:DOH_gonggongkaizhi > 0 +# } +# has_completed_focus = DOH_shehuibaozhang +# } +# } +# } +# cost = 10 +# complete_effect = { +# custom_effect_tooltip = "减少1点公共开支" +# effect_tooltip = { +# remove_dynamic_modifier = { +# modifier = DOH_fake_add_gonggongkaizhi +# } +# } +# add_to_variable = { +# var:DOH_gonggongkaizhi = -1 +# } +# DOH_mofifier_effect = yes +# DOH_zhichilvchengfa_effect = yes +# } +# } +# DOH_decision_add_keyanjinfei = { +# icon = xingdong +# ai_will_do = { +# factor = 0 +# } +# visible = { +# OR = { +# is_debug = yes +# has_completed_focus = DOH_rencaiyinjin +# } +# } +# cost = 10 +# available = { +# num_of_civilian_factories_available_for_projects > 0 +# } +# complete_effect = { +# custom_effect_tooltip = "增加1点额外科研经费" +# effect_tooltip = { +# add_dynamic_modifier = { +# modifier = DOH_fake_add_keyanjinfen +# } +# } +# add_to_variable = { +# var:DOH_keyanjinfei = 1 +# } +# DOH_mofifier_effect = yes +# DOH_zhichilvchengfa_effect = yes +# } +# } +# DOH_decision_rm_keyanjinfei = { +# icon = xingdong +# ai_will_do = { +# factor = 0 +# } +# visible = { +# OR = { +# is_debug = yes +# AND = { +# check_variable = { +# var:DOH_keyanjinfei > 0 +# } +# has_completed_focus = DOH_rencaiyinjin +# } +# } +# } +# cost = 10 +# complete_effect = { +# custom_effect_tooltip = "减少1点额外科研经费" +# effect_tooltip = { +# remove_dynamic_modifier = { +# modifier = DOH_fake_add_keyanjinfen +# } +# } +# add_to_variable = { +# var:DOH_keyanjinfei = -1 +# } +# DOH_mofifier_effect = yes +# DOH_zhichilvchengfa_effect = yes +# } +# } +# DOH_decision_add_junshijinfei = { +# icon = xingdong +# ai_will_do = { +# factor = 0 +# } +# available = { +# num_of_civilian_factories_available_for_projects > 0 +# } +# visible = { +# OR = { +# is_debug = yes +# has_completed_focus = DOH_jinjigaige +# } +# } +# cost = 10 +# complete_effect = { +# custom_effect_tooltip = "增加1点额外生产经费" +# effect_tooltip = { +# add_dynamic_modifier = { +# modifier = DOH_fake_add_junshijinfei +# } +# } +# add_to_variable = { +# var:DOH_junshijinfei = 1 +# } +# DOH_mofifier_effect = yes +# DOH_zhichilvchengfa_effect = yes +# } +# } +# DOH_decision_rm_junshijinfei = { +# icon = xingdong +# ai_will_do = { +# factor = 0 +# } +# visible = { +# OR = { +# is_debug = yes +# AND = { +# check_variable = { +# var:DOH_junshijinfei > 0 +# } +# has_completed_focus = DOH_jinjigaige +# } +# } +# } +# cost = 10 +# complete_effect = { +# custom_effect_tooltip = "减少1点额外生产经费" +# effect_tooltip = { +# remove_dynamic_modifier = { +# modifier = DOH_fake_add_junshijinfei +# } +# } +# add_to_variable = { +# var:DOH_junshijinfei = -1 +# } +# DOH_mofifier_effect = yes +# DOH_zhichilvchengfa_effect = yes +# } +# } +# DOH_decision_add_shichang = { +# icon = xingdong +# ai_will_do = { +# factor = 0 +# } +# visible = { +# OR = { +# is_debug = yes +# AND = { +# check_variable = { +# var:DOH_shichang < 15 +# } +# has_completed_focus = DOH_shichanghuanjishu +# } +# } +# } +# cost = 10 +# complete_effect = { +# custom_effect_tooltip = "增加1点市场开放程度" +# effect_tooltip = { +# add_dynamic_modifier = { +# modifier = DOH_fake_add_shichangkaifang +# } +# } +# add_to_variable = { +# var:DOH_shichang = 1 +# } +# DOH_mofifier_effect = yes +# DOH_zhichilvchengfa_effect = yes +# } +# } +# DOH_decision_rm_shichang = { +# icon = xingdong +# ai_will_do = { +# factor = 0 +# } +# visible = { +# OR = { +# is_debug = yes +# AND = { +# check_variable = { +# var:DOH_shichang > 0 +# } +# has_completed_focus = DOH_shichanghuanjishu +# } +# } +# } +# cost = 10 +# complete_effect = { +# custom_effect_tooltip = "减少1点市场开放程度" +# effect_tooltip = { +# remove_dynamic_modifier = { +# modifier = DOH_fake_add_shichangkaifang +# } +# } +# add_to_variable = { +# var:DOH_shichang = -1 +# } +# DOH_mofifier_effect = yes +# DOH_zhichilvchengfa_effect = yes +# } +# } DOH_debug_1 = { icon = xingdong cost = 0 diff --git a/src/common/dynamic_modifiers/DOH_dynamic_modifiers.txt b/src/common/dynamic_modifiers/DOH_dynamic_modifiers.txt index ba6770c..3b44885 100755 --- a/src/common/dynamic_modifiers/DOH_dynamic_modifiers.txt +++ b/src/common/dynamic_modifiers/DOH_dynamic_modifiers.txt @@ -104,48 +104,48 @@ 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 +# 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 -} +# 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 @@ -170,10 +170,6 @@ DOH_guomuyixian = { army_attack_factor = DOH_guomuyixian_var_army_attack_factor army_defence_factor = DOH_guomuyixian_var_army_defence_factor } -# DOH_nciv_to_ship_dynamic_modifier = { -# icon = GFX_decision_xingdong2 -# industrial_capacity_dockyard = FROM.nciv_to_ship_dynamic_pre_day -# } az_DOH_shuchu_target_modifier = { icon = GFX_idea_DOH_xdh cic_to_target_factor = var:shuchu_factor_to_doh diff --git a/src/common/ideas/doh.txt b/src/common/ideas/doh.txt index 617f3f1..9e7d6d0 100755 --- a/src/common/ideas/doh.txt +++ b/src/common/ideas/doh.txt @@ -973,17 +973,80 @@ ideas = { conscription = 0.01 } } - DOH_gmyx = { - picture = FRA_national_mobilization_focus + # DOH_gmyx = { + # picture = FRA_national_mobilization_focus + # allowed_civil_war = { + # always = no + # } + # modifier = { + # political_power_factor = 0.2 + # conscription = 0.025 + # army_core_attack_factor = 0.2 + # army_core_defence_factor = 0.2 + # } + # } + DOH_guomuyixian_idea_0_DOH_guodayixianquanli = { + picture = DOH_guomuyixian allowed_civil_war = { - always = no + always = yes } modifier = { - political_power_factor = 0.2 - conscription = 0.025 - army_core_attack_factor = 0.2 - army_core_defence_factor = 0.2 + political_power_gain = 0.5 + } + } + DOH_guomuyixian_idea_1_DOH_ducuyixian = { + picture = DOH_guomuyixian + allowed_civil_war = { + always = yes + } + modifier = { + political_power_gain = 0.5 + research_speed_factor = 0.15 + max_command_power = 50 + } + } + DOH_guomuyixian_idea_1_DOH_zhangkongsanjun = { + picture = DOH_guomuyixian + allowed_civil_war = { + always = yes + } + modifier = { + political_power_gain = 0.5 + army_morale_factor = 0.08 + land_reinforce_rate = 0.1 + planning_speed = 0.15 + } + } + DOH_guomuyixian_idea_1_complete = { + picture = DOH_guomuyixian + allowed_civil_war = { + always = yes + } + modifier = { + political_power_gain = 0.5 + army_morale_factor = 0.08 + land_reinforce_rate = 0.1 + planning_speed = 0.15 + research_speed_factor = 0.15 + max_command_power = 50 + } + } + DOH_guomuyixian_idea_2_yixianwansui = { + picture = DOH_guomuyixian + allowed_civil_war = { + always = yes + } + modifier = { + political_power_gain = 0.5 + political_power_factor = 0.1 + army_morale_factor = 0.08 + land_reinforce_rate = 0.1 + planning_speed = 0.15 + research_speed_factor = 0.15 + max_command_power = 50 + army_attack_factor = 0.25 + army_defence_factor = 0.25 } } DOH_yxdyjzh = { diff --git a/src/common/national_focus/donghuang_new.txt b/src/common/national_focus/donghuang_new.txt index 93bca24..0786486 100755 --- a/src/common/national_focus/donghuang_new.txt +++ b/src/common/national_focus/donghuang_new.txt @@ -1558,9 +1558,10 @@ focus_tree = { # } completion_reward = { - add_dynamic_modifier = { - modifier = DOH_guomuyixian - } + # add_dynamic_modifier = { + # modifier = DOH_guomuyixian + # } + add_ideas = DOH_guomuyixian_idea_0_DOH_guodayixianquanli add_popularity = { ideology = fascism popularity = 0.2 } set_politics = { ruling_party = fascism @@ -1609,10 +1610,27 @@ focus_tree = { completion_reward = { add_popularity = { ideology = fascism popularity = 0.25 } - add_to_variable = { DOH_guomuyixian_var_army_morale_factor = 0.08 } - add_to_variable = { DOH_guomuyixian_var_land_reinforce_rate = 0.1 } - add_to_variable = { DOH_guomuyixian_var_planning_speed = 0.15 } - custom_effect_tooltip = DOH_zhangkongsanjun_tt + # add_to_variable = { DOH_guomuyixian_var_army_morale_factor = 0.08 } + # add_to_variable = { DOH_guomuyixian_var_land_reinforce_rate = 0.1 } + # add_to_variable = { DOH_guomuyixian_var_planning_speed = 0.15 } + # custom_effect_tooltip = DOH_zhangkongsanjun_tt + if = { + limit = { + DOH = { + has_completed_focus = DOH_ducuyixian + } + } + swap_ideas = { + remove_idea = DOH_guomuyixian_idea_1_DOH_ducuyixian + add_idea = DOH_guomuyixian_idea_1_complete + } + } + else = { + swap_ideas = { + remove_idea = DOH_guomuyixian_idea_0_DOH_guodayixianquanli + add_idea = DOH_guomuyixian_idea_1_DOH_zhangkongsanjun + } + } } } focus = { @@ -1637,9 +1655,26 @@ focus_tree = { getzhg_event_dixingtezhi_se = yes getzhg_event_xidetezhi_se = yes } - add_to_variable = { DOH_guomuyixian_var_research_speed_factor = 0.15 } - add_to_variable = { DOH_guomuyixian_var_max_command_power = 50 } - custom_effect_tooltip = DOH_ducuyixian_tt + # # add_to_variable = { DOH_guomuyixian_var_research_speed_factor = 0.15 } + # # add_to_variable = { DOH_guomuyixian_var_max_command_power = 50 } + # custom_effect_tooltip = DOH_ducuyixian_tt + if = { + limit = { + DOH = { + has_completed_focus = DOH_zhangkongsanjun + } + } + swap_ideas = { + remove_idea = DOH_guomuyixian_idea_1_DOH_zhangkongsanjun + add_idea = DOH_guomuyixian_idea_1_complete + } + } + else = { + swap_ideas = { + remove_idea = DOH_guomuyixian_idea_0_DOH_guodayixianquanli + add_idea = DOH_guomuyixian_idea_1_DOH_ducuyixian + } + } } } focus = { @@ -1701,10 +1736,14 @@ focus_tree = { } add_political_power = 350 add_stability = 0.25 - add_to_variable = { DOH_guomuyixian_var_political_power_factor = 0.1 } - add_to_variable = { DOH_guomuyixian_var_army_attack_factor = 0.25 } - add_to_variable = { DOH_guomuyixian_var_army_defence_factor = 0.25 } - custom_effect_tooltip = DOH_yixianwansui_tt + # add_to_variable = { DOH_guomuyixian_var_political_power_factor = 0.1 } + # add_to_variable = { DOH_guomuyixian_var_army_attack_factor = 0.25 } + # add_to_variable = { DOH_guomuyixian_var_army_defence_factor = 0.25 } + # custom_effect_tooltip = DOH_yixianwansui_tt + swap_ideas = { + remove_idea = DOH_guomuyixian_idea_1_complete + add_idea = DOH_guomuyixian_idea_2_yixianwansui + } hidden_effect = { news_event = aznews.13 } } } diff --git a/src/interface/az_pt_window.gui b/src/interface/az_pt_window.gui index 126749e..3708d68 100755 --- a/src/interface/az_pt_window.gui +++ b/src/interface/az_pt_window.gui @@ -167,7 +167,7 @@ guiTypes = { name = "az_PT_1" position = { x= 110 y = 70 } spriteType = "GFX_az_PT_1" - Orientation = CENTER + Orientation = UPPER_LEFT } iconType = { diff --git a/src/interface/az_xmp_window.gui b/src/interface/az_xmp_window.gui index d194c22..41064c1 100755 --- a/src/interface/az_xmp_window.gui +++ b/src/interface/az_xmp_window.gui @@ -46,7 +46,7 @@ guiTypes = { name ="az_xmp_main_window_picture" spriteType = "GFX_az_xmp_picture_1" position = { x= 0 y = 60 } - Orientation = "CENTER" + Orientation = "UPPER_LEFT" pdx_tooltip = "buzhihuo_icon_tooltip" } @@ -106,14 +106,14 @@ guiTypes = { name ="az_xmp_zuanshi_icon1" spriteType = "GFX_az_misc_icon_1" position = { x = 610 y = 400 } - Orientation = "CENTER" + Orientation = "UPPER_LEFT" } iconType ={ name ="az_xmp_zuanshi_icon2" spriteType = "GFX_az_misc_icon_2" position = { x = 10 y = 400 } - Orientation = "CENTER" + Orientation = "UPPER_LEFT" } instantTextboxType = { diff --git a/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml b/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml index 4ccb934..5a5492b 100755 --- a/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml @@ -546,6 +546,16 @@ doh_weilai_focus: "[DH1.getleader]获得特质§Y引风者§!。" DOH_guomuyixian: "国母逸仙" DOH_guomuyixian_desc: "作为东煌之国母，逸仙拥有无可匹敌的能力！" + DOH_guomuyixian_idea_0_DOH_guodayixianquanli: "国母逸仙" + DOH_guomuyixian_idea_0_DOH_guodayixianquanli_desc: "作为东煌之国母，逸仙拥有无可匹敌的能力！" + DOH_guomuyixian_idea_1_DOH_ducuyixian: "国母逸仙" + DOH_guomuyixian_idea_1_DOH_ducuyixian_desc: "作为东煌之国母，逸仙拥有无可匹敌的能力！" + DOH_guomuyixian_idea_1_DOH_zhangkongsanjun: "国母逸仙" + DOH_guomuyixian_idea_1_DOH_zhangkongsanjun_desc: "作为东煌之国母，逸仙拥有无可匹敌的能力！" + DOH_guomuyixian_idea_1_complete: "国母逸仙" + DOH_guomuyixian_idea_1_complete_desc: "作为东煌之国母，逸仙拥有无可匹敌的能力！" + DOH_guomuyixian_idea_2_yixianwansui: "国母逸仙" + DOH_guomuyixian_idea_2_yixianwansui_desc: "作为东煌之国母，逸仙拥有无可匹敌的能力！" DOH_guomuyixian_add_tt: "§Y$DOH_guomuyixian$§!追加效果：" DOH_ducuyixian_tt: "$DOH_guomuyixian_add_tt$\n£research_speed_texticon 科研速度：§G+15%§!\n£command_power_max_texticon 最大指挥点数提高：§G+50§!\n\n" DOH_zhangkongsanjun_tt: "$DOH_guomuyixian_add_tt$\n£organization_gain_texticon 陆军组织度恢复：§G+8%§!\n£reinforce_texticon 增援率：§G+10%§!\n£planning_speed_texticon 计划速度：§G+10%§!\n\n"