From 0e0f46f2710f4581a9910e5c5ab520d7812d7d70 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Thu, 8 Aug 2024 16:01:48 +0000 Subject: [PATCH] 2024-08-08 16:01:48 --- src/common/autonomous_states/doh_xiaodi.txt | 13 +- src/common/decisions/DOH_DH1_decision.txt | 95 ++++++++++-- .../DOH_DH1_decision_categories.txt | 1 + src/common/national_focus/donghuang_new.txt | 3 + .../national_focus/donghuangyuanzhengjun.txt | 139 +++++++++++------- .../az_DOH_scripted_effects.txt | 31 ++-- .../simp_chinese/azc_DH1_l_simp_chinese.yml | 6 +- .../simp_chinese/azc_DOH_l_simp_chinese.yml | 2 +- 8 files changed, 211 insertions(+), 79 deletions(-) diff --git a/src/common/autonomous_states/doh_xiaodi.txt b/src/common/autonomous_states/doh_xiaodi.txt index f4f36a3..86d06ee 100755 --- a/src/common/autonomous_states/doh_xiaodi.txt +++ b/src/common/autonomous_states/doh_xiaodi.txt @@ -41,7 +41,18 @@ autonomy_state = { } } use_for_peace_conference_weight = { - base = 100 + base = 0 + modifier = { + add = 100 + OR = { + FROM = { + tag = DH1 + } + FROM = { + tag = DOH + } + } + } modifier = { add = -100 DOH = { diff --git a/src/common/decisions/DOH_DH1_decision.txt b/src/common/decisions/DOH_DH1_decision.txt index d628030..8bdb2d3 100755 --- a/src/common/decisions/DOH_DH1_decision.txt +++ b/src/common/decisions/DOH_DH1_decision.txt @@ -24,7 +24,9 @@ DOH_DH1_decision_category = { remove_effect = { custom_effect_tooltip = DOH_DH1_kaishiyuanzheng_tooltip hidden_effect = { - DH1 = { set_country_flag = DOH_DH1_kaishiyuanzheng_flag } + DH1 = { + set_country_flag = DOH_DH1_kaishiyuanzheng_flag + } } } } @@ -45,9 +47,11 @@ DOH_DH1_decision_category = { } } cost = 100 - days_remove = 10 + days_remove = 1 remove_effect = { - DH1 = { add_ideas = DH1_AI_zhongshijingong } + DH1 = { + add_ideas = DH1_AI_zhongshijingong + } set_country_flag = DOH_DH1_xiadalezhishi } } @@ -68,9 +72,11 @@ DOH_DH1_decision_category = { } } cost = 100 - days_remove = 10 + days_remove = 1 remove_effect = { - DH1 = { add_ideas = DH1_AI_zhongshifangyu } + DH1 = { + add_ideas = DH1_AI_zhongshifangyu + } set_country_flag = DOH_DH1_xiadalezhishi } } @@ -91,9 +97,11 @@ DOH_DH1_decision_category = { } } cost = 100 - days_remove = 10 + days_remove = 1 remove_effect = { - DH1 = { add_ideas = DH1_AI_zhongshihaijun } + DH1 = { + add_ideas = DH1_AI_zhongshihaijun + } set_country_flag = DOH_DH1_xiadalezhishi } } @@ -114,9 +122,11 @@ DOH_DH1_decision_category = { } } cost = 100 - days_remove = 10 + days_remove = 1 remove_effect = { - DH1 = { add_ideas = DH1_AI_zhongshikongjun } + DH1 = { + add_ideas = DH1_AI_zhongshikongjun + } set_country_flag = DOH_DH1_xiadalezhishi } } @@ -137,9 +147,11 @@ DOH_DH1_decision_category = { } } cost = 100 - days_remove = 10 + days_remove = 1 remove_effect = { - DH1 = { add_ideas = DH1_AI_xiuyangshengxi } + DH1 = { + add_ideas = DH1_AI_xiuyangshengxi + } set_country_flag = DOH_DH1_xiadalezhishi } } @@ -158,7 +170,7 @@ DOH_DH1_decision_category = { has_country_flag = DOH_DH1_xiadalezhishi } cost = 0 - days_remove = 10 + days_remove = 1 remove_effect = { custom_effect_tooltip = "撤销所有下达的指示。" hidden_effect = { @@ -173,4 +185,61 @@ DOH_DH1_decision_category = { } } } -} \ No newline at end of file + DOH_zhenghe_decision = { + icon = idea_hun_treaty_of_trianon + cost = 500 + days_remove = 3 + target_array = subjects + target_trigger = { + FROM = { + is_subject_of = ROOT + NOT = { + OR = { + tag = BFL + tag = HUJ + tag = SAD + tag = TIX + tag = BYG + tag = CHY + tag = YUW + tag = DOH + tag = DH1 + tag = BLI + tag = SIR + tag = SR1 + tag = SR2 + tag = SR3 + tag = SR4 + } + } + } + } + visible = { + OR = { + DH1 = { + has_completed_focus = DH1_qianjin + } + is_debug = yes + } + } + available = { + + } + complete_effect = { + every_state = { + limit = { + is_fully_controlled_by = FROM + } + add_core_of = DH1 + } + } + remove_effect = { + DH1 = { + annex_country = { + target = FROM + transfer_troops = yes + } + } + } + } +} diff --git a/src/common/decisions/categories/DOH_DH1_decision_categories.txt b/src/common/decisions/categories/DOH_DH1_decision_categories.txt index ea0e57c..1afebc4 100755 --- a/src/common/decisions/categories/DOH_DH1_decision_categories.txt +++ b/src/common/decisions/categories/DOH_DH1_decision_categories.txt @@ -3,6 +3,7 @@ DOH_DH1_decision_category = { priority = 100 visible = { tag = DOH + country_exists = DH1 } allowed = { tag = DOH diff --git a/src/common/national_focus/donghuang_new.txt b/src/common/national_focus/donghuang_new.txt index e639309..3034f07 100755 --- a/src/common/national_focus/donghuang_new.txt +++ b/src/common/national_focus/donghuang_new.txt @@ -3568,6 +3568,9 @@ focus_tree = { available = { has_completed_focus = DOH_dongfangliming country_exists = DH1 + DOH = { + is_subject = no + } OR = { date > 1942.1.1 has_subject = CHY diff --git a/src/common/national_focus/donghuangyuanzhengjun.txt b/src/common/national_focus/donghuangyuanzhengjun.txt index c8c5a26..8408b34 100755 --- a/src/common/national_focus/donghuangyuanzhengjun.txt +++ b/src/common/national_focus/donghuangyuanzhengjun.txt @@ -19,7 +19,7 @@ id = DH1_querentongshuai icon = GFX_focus_generic_treaty x = 20 - y = 0 + y = 1 cost = 7 ai_will_do = { @@ -614,7 +614,7 @@ } x = -2 y = 2 - cost = 10 + cost = 5 ai_will_do = { factor = 7 @@ -678,7 +678,7 @@ } x = -1 y = 2 - cost = 10 + cost = 4 ai_will_do = { base = 5 @@ -718,7 +718,7 @@ } x = 0 y = 1 - cost = 10 + cost = 4 ai_will_do = { factor = 5 @@ -754,7 +754,7 @@ } x = 1 y = 2 - cost = 10 + cost = 4 ai_will_do = { base = 5 @@ -791,7 +791,7 @@ } x = 0 y = 1 - cost = 10 + cost = 4 ai_will_do = { factor = 5 @@ -856,7 +856,7 @@ } x = 2 y = 1 - cost = 10 + cost = 5 ai_will_do = { factor = 8 @@ -1362,7 +1362,7 @@ has_war = yes surrender_progress > 0.1 } - date > 1939.1.1 + date > 1938.3.1 } } @@ -2555,50 +2555,58 @@ completion_reward = { custom_effect_tooltip = DH1_xiananyang_tooltip hidden_effect = { - annex_country = { - target = INS - transfer_troops = yes - } - annex_country = { - target = PHI - transfer_troops = yes - } - - transfer_state = 738 - transfer_state = 668 - transfer_state = 721 + # annex_country = { + # target = INS + # transfer_troops = yes + # } + # annex_country = { + # target = PHI + # transfer_troops = yes + # } transfer_state = 667 - transfer_state = 335 - transfer_state = 672 - transfer_state = 733 - transfer_state = 711 - transfer_state = 523 - transfer_state = 737 - transfer_state = 634 - transfer_state = 673 - transfer_state = 334 - transfer_state = 333 - transfer_state = 669 - transfer_state = 640 - transfer_state = 288 - transfer_state = 671 - transfer_state = 670 - transfer_state = 741 - transfer_state = 286 - transfer_state = 868 - transfer_state = 869 - transfer_state = 289 - transfer_state = 724 - transfer_state = 336 - transfer_state = 623 - transfer_state = 327 transfer_state = 626 - transfer_state = 628 - transfer_state = 625 - transfer_state = 627 - transfer_state = 624 - transfer_state = 422 - transfer_state = 281 + transfer_state = 623 + transfer_state = 333 + transfer_state = 673 + transfer_state = 668 + transfer_state = 738 + transfer_state = 669 + + # transfer_state = 738 + # transfer_state = 668 + # transfer_state = 721 + # transfer_state = 667 + # transfer_state = 335 + # transfer_state = 672 + # transfer_state = 733 + # transfer_state = 711 + # transfer_state = 523 + # transfer_state = 737 + # transfer_state = 634 + # transfer_state = 673 + # transfer_state = 334 + # transfer_state = 333 + # transfer_state = 669 + # transfer_state = 640 + # transfer_state = 288 + # transfer_state = 671 + # transfer_state = 670 + # transfer_state = 741 + # transfer_state = 286 + # transfer_state = 868 + # transfer_state = 869 + # transfer_state = 289 + # transfer_state = 724 + # transfer_state = 336 + # transfer_state = 623 + # transfer_state = 327 + # transfer_state = 626 + # transfer_state = 628 + # transfer_state = 625 + # transfer_state = 627 + # transfer_state = 624 + # transfer_state = 422 + # transfer_state = 281 add_state_core = 738 add_state_core = 668 @@ -2980,7 +2988,36 @@ } } custom_effect_tooltip = DH1_qianjin_tt - custom_effect_tooltip = "（未完待续）" + #custom_effect_tooltip = "（未完待续）" } } + # focus = { + # id = DH1_qianjin_2 + # icon = GFX_fflag_DOH + # cost = 1 + # relative_position_id = DH1_qianjin + # prerequisite = { + # focus = DH1_qianjin + # } + # prerequisite = { + # focus = DH1_baiyinghangkonggongye + # } + # prerequisite = { + # focus = DH1_beiliandazongshenzuozhan + # } + # prerequisite = { + # focus = DH1_xiananyang + # } + # prerequisite = { + # focus = DH1_nanyacidalu + # } + # x = 0 + # y = 1 + # available = { + + # } + # completion_reward = { + + # } + # } } diff --git a/src/common/scripted_effects/az_DOH_scripted_effects.txt b/src/common/scripted_effects/az_DOH_scripted_effects.txt index 69837e1..293eb6d 100755 --- a/src/common/scripted_effects/az_DOH_scripted_effects.txt +++ b/src/common/scripted_effects/az_DOH_scripted_effects.txt @@ -465,24 +465,33 @@ d_DOH_self_duiwaishuchu_init = { } doh_kexueyuan_effect = { - set_variable = { - shared_speed_factor = DOH.num_subjects - } + # set_variable = { + # shared_speed_factor = 0 + # } if = { limit = { - country_exists = DH1 - DH1 = { - has_completed_focus = DH1_qianjin - controls_state = 323 - controls_state = 324 + DOH = { + all_subject_countries = { + if = { + limit = { + num_of_factories > 0 + } + add_to_temp_variable = { + shared_speed_factor_temp = num_of_factories + } + } + } } } - add_to_variable = { - shared_speed_factor = 2 + set_variable = { + var:shared_speed_factor = shared_speed_factor_temp } } multiply_variable = { - shared_speed_factor = 0.16 + shared_speed_factor = 0.01 + } + multiply_variable = { + shared_speed_factor = 0.03 } every_country = { if = { diff --git a/src/localisation/simp_chinese/azc_DH1_l_simp_chinese.yml b/src/localisation/simp_chinese/azc_DH1_l_simp_chinese.yml index 3ebfdbb..512506e 100755 --- a/src/localisation/simp_chinese/azc_DH1_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/azc_DH1_l_simp_chinese.yml @@ -1,5 +1,5 @@ l_simp_chinese: - DH1_xiananyang_tooltip: "获取印度尼西亚、菲律宾和巴布亚领土。" + DH1_xiananyang_tooltip: "获取印度尼西亚、菲律宾和巴布亚领土的核心。" DH1_zhiyuanjun_idea: "东煌志愿军" DH1_yuanjiao_idea: "远交" DH1_weilai: "火力限制解除" @@ -385,4 +385,6 @@ DH1_junshi_211_desc: "军队一律不许经商！所有军费将有最高军部统一分配，这对军队的命运有很大的影响。\n我们的部队极其适应炎热的气候。\n殖民者已经大缺大德几百年了，是时候让他们尝尝被压迫人民的铁拳。\n我们学习了铁血先进的装甲技术。" DH1_qianjin: "前进！" DH1_qianjin_desc: "巨浪，巨浪，不断地增长！" - DH1_qianjin_tt: "§g出于性能和后期游戏体验考虑，如果东煌本土傀儡了尼泊尔和不丹，我们将接管这两个地区。东煌科学院国策不受此影响。§!" \ No newline at end of file + DH1_qianjin_tt: "§g出于性能和后期游戏体验考虑，§!如果东煌本土傀儡了§C非舰娘国§!，我们可以接管这些地区。§g东煌科学院国策不受此影响。§!" + DOH_zhenghe_decision: "整合 [FROM.getname]" + DOH_zhenghe_decision_desc: "拯救CPU0！" 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 af489e3..6e37452 100755 --- a/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml @@ -6,7 +6,7 @@ DOH_kejiaotixi_black: "东煌科教文卫体系" DOH_kejiaotixi_black_desc: "具有东煌特色的科研、教育、文化和卫生体系。" DOH_donghuangkuangyedaxue: "东煌矿业大学" - DOH_donghuangkexueyuan_tooltip: "东煌及其所有附属国都将获得科研速度加成，其效果为§Y每个§!附属国§G+16%§!。此外还将获得其他先进技术加成。" + DOH_donghuangkexueyuan_tooltip: "东煌及其所有附属国都将获得科研速度加成，其效果为§Y所有§!附属国所拥有的工厂总数的§G0.03%§!。此外还将获得其他先进技术加成。" DOH_jinjigaige_red_tooltip: "§C如果§!完成国策§Y人民万岁§!，追加效果" DOH_teseshichangjinji: "东煌社会主义市场经济" DOH_neibufenqi_jianqin_effect_tooltip: "内部分歧§C减轻§!了。"