From 1441ac9d6526e17c4a992e50890537046e20bae6 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Thu, 27 Jun 2024 00:31:07 +0800 Subject: [PATCH 01/11] 2024-06-27 00:31:07 From d334588a27c96b90602506d51000f109979a1af9 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Thu, 27 Jun 2024 04:31:05 +0800 Subject: [PATCH 02/11] 2024-06-27 04:31:05 From 3a9770bf6eba988bf9afb76860435013b695d939 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Thu, 27 Jun 2024 08:31:06 +0800 Subject: [PATCH 03/11] 2024-06-27 08:31:06 From 19e1e4449aadca0fbaa0ee410c8944aee5fc3684 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Thu, 27 Jun 2024 12:31:05 +0800 Subject: [PATCH 04/11] 2024-06-27 12:31:05 From b067c56003a2a5187ef46d9428200ca9f3ae1133 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Thu, 27 Jun 2024 16:31:24 +0800 Subject: [PATCH 05/11] 2024-06-27 16:31:24 From a13594afa7ea08ef5f6f8284df0a36f037a38479 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Thu, 27 Jun 2024 20:31:17 +0800 Subject: [PATCH 06/11] 2024-06-27 20:31:17 From c1dc9c32d6ae6db12a8bde1b0a25db8d177279e7 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Fri, 28 Jun 2024 00:31:21 +0800 Subject: [PATCH 07/11] 2024-06-28 00:31:21 From de1dea094b9c0a37ff800a195f944197cab64e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=B4=E5=B7=9D?= Date: Fri, 28 Jun 2024 16:04:21 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/syn?= =?UTF-8?q?c.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/sync.yml b/.gitea/workflows/sync.yml index 11be654..2997994 100644 --- a/.gitea/workflows/sync.yml +++ b/.gitea/workflows/sync.yml @@ -18,7 +18,7 @@ jobs: run: | cd /home/steam/steamcmd ls -lh - ./steamcmd.sh +login ${{ secrets.STEAM_USERNAME }} ${{ secrets.STEAM_PASSWORD }} +workshop_download_item 394360 2249768662 +quit + ./steamcmd.sh +login ${{ secrets.STEAM_USERNAME }} +workshop_download_item 394360 2249768662 +quit - name: clean src and copy to src run: | ls -lh From f08f22bf8131c623b696ccc2d18ffd513a9a71d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=B4=E5=B7=9D?= Date: Mon, 8 Jul 2024 08:06:37 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/syn?= =?UTF-8?q?c.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/sync.yml b/.gitea/workflows/sync.yml index 2997994..11be654 100644 --- a/.gitea/workflows/sync.yml +++ b/.gitea/workflows/sync.yml @@ -18,7 +18,7 @@ jobs: run: | cd /home/steam/steamcmd ls -lh - ./steamcmd.sh +login ${{ secrets.STEAM_USERNAME }} +workshop_download_item 394360 2249768662 +quit + ./steamcmd.sh +login ${{ secrets.STEAM_USERNAME }} ${{ secrets.STEAM_PASSWORD }} +workshop_download_item 394360 2249768662 +quit - name: clean src and copy to src run: | ls -lh From ba10eeb7017bdd513666a4b95c4ba5164af5accb Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Mon, 8 Jul 2024 08:27:30 +0800 Subject: [PATCH 10/11] 2024-07-08 08:27:30 --- src/common/characters/az_DOH_characters.txt | 2 +- src/common/decisions/DOH_decision.txt | 18 +-- src/common/national_focus/donghuang_new.txt | 138 +++++++++--------- src/events/DOH_shijian.txt | 11 ++ src/events/azcollege.txt | 1 - .../simp_chinese/azc_DH1_l_simp_chinese.yml | 16 +- 6 files changed, 96 insertions(+), 90 deletions(-) diff --git a/src/common/characters/az_DOH_characters.txt b/src/common/characters/az_DOH_characters.txt index cc0156e..80932e6 100755 --- a/src/common/characters/az_DOH_characters.txt +++ b/src/common/characters/az_DOH_characters.txt @@ -970,7 +970,7 @@ characters={ is_ai = no } } - traits = { organizer logistics_wizard } + traits = { organizer logistics_wizard hangmu_army } skill = 1 attack_skill = 1 defense_skill = 1 diff --git a/src/common/decisions/DOH_decision.txt b/src/common/decisions/DOH_decision.txt index e1dfac9..792ca01 100755 --- a/src/common/decisions/DOH_decision.txt +++ b/src/common/decisions/DOH_decision.txt @@ -214,15 +214,15 @@ DOH_decision_category = { set_state_name = DOH_boli_name } set_victory_points = { - province = 957 + province = 957 # 符拉迪沃斯托克/海参崴 value = 20 } set_victory_points = { - province = 12189 + province = 12189 # 哈巴罗夫斯克/伯力 value = 20 } set_victory_points = { - province = 4705 + province = 4705 # 赤塔/尼布楚 value = 10 } } @@ -256,11 +256,11 @@ DOH_decision_category = { } hidden_effect = { set_victory_points = { - province = 10627 + province = 10627 # 克孜勒/乌里雅苏台 value = 10 } set_victory_points = { - province = 4801 + province = 4801 # 乌兰巴托 value = 15 } } @@ -301,11 +301,11 @@ DOH_decision_category = { } hidden_effect = { set_victory_points = { - province = 10062 + province = 10062 # 香港 value = 20 } set_victory_points = { - province = 4189 + province = 4189 # 澳门 value = 10 } } @@ -338,11 +338,11 @@ DOH_decision_category = { hidden_effect = { set_victory_points = { - province = 4052 + province = 4052 # 平壤 value = 15 } set_victory_points = { - province = 7125 + province = 7125 # 汉城 value = 20 } } diff --git a/src/common/national_focus/donghuang_new.txt b/src/common/national_focus/donghuang_new.txt index 7ddab78..a15047b 100755 --- a/src/common/national_focus/donghuang_new.txt +++ b/src/common/national_focus/donghuang_new.txt @@ -2247,11 +2247,11 @@ focus_tree = { DOH_dongfangguguo_dengji = yes hidden_effect = { set_victory_points = { - province = 4525 + province = 4525 # 包头 value = 15 } set_victory_points = { - province = 12432 + province = 12432 # 大同 value = 20 } } @@ -2513,61 +2513,57 @@ focus_tree = { } hidden_effect = { set_victory_points = { - province = 7418 + province = 7418 # 西安 value = 30 } set_victory_points = { - province = 2022 + province = 2022 # 兰州 value = 20 } set_victory_points = { - province = 12732 + province = 12732 # 西宁 value = 20 } set_victory_points = { - province = 4709 + province = 4709 # 乌鲁木齐 value = 20 } set_victory_points = { - province = 4823 + province = 4823 # 阿勒泰 value = 10 } set_victory_points = { - province = 8049 + province = 8049 # 延安 value = 15 } set_victory_points = { - province = 2015 + province = 2015 # 喀什 value = 20 } set_victory_points = { - province = 4823 + province = 4823 # 阿勒泰 value = 10 } set_victory_points = { - province = 8127 + province = 8127 # 银川 value = 20 } set_victory_points = { - province = 5100 + province = 5100 # 张掖 value = 10 } set_victory_points = { - province = 12820 + province = 12820 # 敦煌 value = 15 } set_victory_points = { - province = 5057 + province = 5057 # 武威 value = 10 } set_victory_points = { - province = 2028 + province = 2028 # 酒泉 value = 20 } - set_victory_points = { - province = 12820 - value = 10 - } } } } @@ -2700,43 +2696,43 @@ focus_tree = { } hidden_effect = { set_victory_points = { - province = 10000 + province = 10000 # 青岛 value = 20 } set_victory_points = { - province = 7191 + province = 7191 # 杭州 value = 20 } set_victory_points = { - province = 9974 + province = 9974 # 宁波 value = 20 } set_victory_points = { - province = 4196 + province = 4196 # 福州 value = 20 } set_victory_points = { - province = 7071 + province = 7071 # 厦门 value = 20 } set_victory_points = { - province = 9938 + province = 9938 # 汕头 value = 20 } set_victory_points = { - province = 7182 + province = 7182 # 潮州 value = 10 } set_victory_points = { - province = 1055 + province = 1055 # 温州 value = 20 } set_victory_points = { - province = 4205 + province = 4205 # 威海 value = 10 } set_victory_points = { - province = 1200 + province = 1200 # 烟台 value = 10 } } @@ -3828,75 +3824,75 @@ focus_tree = { DOH_neibufenqi_jianqin_effect = yes hidden_effect = { set_victory_points = { - province = 12055 + province = 12055 # 徐州 value = 20 } set_victory_points = { - province = 1519 + province = 1519 # 太原 value = 20 } set_victory_points = { - province = 1069 + province = 1069 # 济南 value = 20 } set_victory_points = { - province = 7097 + province = 7097 # 长沙 value = 20 } set_victory_points = { - province = 1319 + province = 1319 # 昆明 value = 20 } set_victory_points = { - province = 10404 + province = 10404 # 桂林 value = 15 } set_victory_points = { - province = 7137 + province = 7137 # 南宁 value = 20 } set_victory_points = { - province = 3992 + province = 3992 # 南昌 value = 20 } set_victory_points = { - province = 7222 + province = 7222 # 合肥 value = 20 } set_victory_points = { - province = 4619 + province = 4619 # 武汉 value = 40 } set_victory_points = { - province = 7101 + province = 7101 # 常德 value = 20 } set_victory_points = { - province = 9958 + province = 9958 # 郑州 value = 20 } set_victory_points = { - province = 5033 + province = 5033 # 拉萨 value = 20 } set_victory_points = { - province = 7186 + province = 7186 # 台北 value = 30 } set_victory_points = { - province = 12068 + province = 12068 # 高雄 value = 20 } set_victory_points = { - province = 4504 + province = 4504 # 贵阳 value = 15 } set_victory_points = { - province = 7656 + province = 7656 # 开封 value = 15 } set_victory_points = { - province = 11931 + province = 11931 # 洛阳 value = 15 } } @@ -3952,15 +3948,15 @@ focus_tree = { } hidden_effect = { set_victory_points = { - province = 11913 + province = 11913 # 南京 value = 50 } set_victory_points = { - province = 10076 + province = 10076 # 苏州 value = 20 } set_victory_points = { - province = 7014 + province = 7014 # 上海 value = 40 } } @@ -4011,19 +4007,19 @@ focus_tree = { } hidden_effect = { set_victory_points = { - province = 6999 + province = 6999 # 常德 value = 40 } set_victory_points = { - province = 4925 + province = 4925 # 成都 value = 40 } set_victory_points = { - province = 1367 + province = 1367 # 绵阳 value = 15 } set_victory_points = { - province = 12141 + province = 12141 # 乐山 value = 10 } } @@ -4082,23 +4078,23 @@ focus_tree = { } hidden_effect = { set_victory_points = { - province = 9843 + province = 9843 # 北京 value = 50 } set_victory_points = { - province = 10068 + province = 10068 # 天津 value = 20 } set_victory_points = { - province = 12043 + province = 12043 # 唐山 value = 15 } set_victory_points = { - province = 7109 + province = 7109 # 保定 value = 20 } set_victory_points = { - province = 11801 + province = 11801 # 承德 value = 10 } } @@ -4205,43 +4201,43 @@ focus_tree = { } hidden_effect = { set_victory_points = { - province = 11771 + province = 11771 # 奉天/沈阳 value = 20 } set_victory_points = { - province = 1150 + province = 1150 # 大连 value = 30 } set_victory_points = { - province = 10433 + province = 10433 # 哈尔滨 value = 30 } set_victory_points = { - province = 916 + province = 916 # 四平 value = 5 } set_victory_points = { - province = 9803 + province = 9803 # 通化 value = 10 } set_victory_points = { - province = 11808 + province = 11808 # 铁岭 value = 5 } set_victory_points = { - province = 9885 + province = 9885 # 抚顺 value = 15 } set_victory_points = { - province = 3895 + province = 3895 # 本溪 value = 5 } set_victory_points = { - province = 9781 + province = 9781 # 鞍山 value = 15 } set_victory_points = { - province = 11836 + province = 11836 # 通辽 value = 5 } } @@ -4309,7 +4305,7 @@ focus_tree = { } hidden_effect = { set_victory_points = { - province = 1047 + province = 1047 # 广州 value = 40 } } @@ -4468,7 +4464,7 @@ focus_tree = { air_experience = 50 hidden_effect = { set_victory_points = { - province = 1070 + province = 1070 # 海口 value = 20 } } diff --git a/src/events/DOH_shijian.txt b/src/events/DOH_shijian.txt index 640224d..eaa6bc2 100755 --- a/src/events/DOH_shijian.txt +++ b/src/events/DOH_shijian.txt @@ -1207,8 +1207,19 @@ country_event = { uncomplete_children = yes refund_political_power = yes } + uncomplete_national_focus = { + focus = CHY_wushidaojinshen + uncomplete_children = no + refund_political_power = no + } + uncomplete_national_focus = { + focus = CHY_kuangredekuozhangzhuyi + uncomplete_children = yes + refund_political_power = no + } complete_national_focus = CHY_changmen1 unlock_national_focus = CHY_hepinshouhuzhe + unlock_national_focus = CHY_shouhu } remove_opinion_modifier = { target = DOH diff --git a/src/events/azcollege.txt b/src/events/azcollege.txt index 2bf7ab6..696dc02 100755 --- a/src/events/azcollege.txt +++ b/src/events/azcollege.txt @@ -43,7 +43,6 @@ country_event = { category = naval_doctrine } } - } } country_event = { id = azcollege.3 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 4ac5eb6..5cad5fc 100755 --- a/src/localisation/simp_chinese/azc_DH1_l_simp_chinese.yml +++ b/src/localisation/simp_chinese/azc_DH1_l_simp_chinese.yml @@ -221,14 +221,14 @@ DH1_zhongnanbandao_decision: "进攻中南半岛" DH1_nanyacidalu_mission_tooltip: "允许向南亚次大陆远征。" DH1_nanyacidalu_decision: "进攻南亚次大陆" - DH1_future_communism: "东煌海外生产建设兵团" - DH1_future_communism_DEF: "东煌海外生产建设兵团" - DH1_future_democratic: "东煌海外生产建设兵团" - DH1_future_democratic_DEF: "东煌海外生产建设兵团" - DH1_future_neutrality: "东煌海外生产建设兵团" - DH1_future_neutrality_DEF: "东煌海外生产建设兵团" - DH1_future_fascism: "东煌海外生产建设兵团" - DH1_future_fascism_DEF: "东煌海外生产建设兵团" + DH1_future_communism: "东煌南洋生产建设兵团" + DH1_future_communism_DEF: "东煌南洋生产建设兵团" + DH1_future_democratic: "东煌南洋生产建设兵团" + DH1_future_democratic_DEF: "东煌南洋生产建设兵团" + DH1_future_neutrality: "东煌南洋生产建设兵团" + DH1_future_neutrality_DEF: "东煌南洋生产建设兵团" + DH1_future_fascism: "东煌南洋生产建设兵团" + DH1_future_fascism_DEF: "东煌南洋生产建设兵团" DOH_yuanzhengjundeweilai: "远征军的未来" DOH_yuanzhengjundeweilai_desc: "远征军的历史使命已经结束，是时候考虑远征军的未来了。" DOH_chongyingdechaogong: "重樱的朝贡" From 704ee75626bff42fb663b537d798d159b8a3a2d3 Mon Sep 17 00:00:00 2001 From: "actions[bot]" Date: Mon, 8 Jul 2024 08:31:07 +0800 Subject: [PATCH 11/11] 2024-07-08 08:31:07