From 4ac1c95081874a138847749535f36dc0b3fcdc9e Mon Sep 17 00:00:00 2001
From: "actions[bot]" <actions[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 00:01:13 +0800
Subject: [PATCH] 2024-07-26 00:01:13

---
 src/common/decisions/DOH_decision.txt         | 13 +++++---
 src/events/DOH_shijian.txt                    | 33 +++++++++----------
 .../simp_chinese/azc_DOH_l_simp_chinese.yml   |  1 +
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/common/decisions/DOH_decision.txt b/src/common/decisions/DOH_decision.txt
index 8028875..5e057dd 100755
--- a/src/common/decisions/DOH_decision.txt
+++ b/src/common/decisions/DOH_decision.txt
@@ -649,14 +649,19 @@ DOH_decision_category = {
 			}
 		}
 		available = {
-			OR = {
-				BFL = {
+			AND = {
+				OR = {
+					BFL = {
+						NOT = {
+							has_government = communism
+						}
+					}
 					NOT = {
-						has_government = communism
+						country_exists = BFL
 					}
 				}
 				NOT = {
-					country_exists = BFL
+					has_country_flag = DOH_BFL_bifenggang_flag
 				}
 			}
 		}
diff --git a/src/events/DOH_shijian.txt b/src/events/DOH_shijian.txt
index 0e0b989..d2c696b 100755
--- a/src/events/DOH_shijian.txt
+++ b/src/events/DOH_shijian.txt
@@ -1274,23 +1274,20 @@ country_event = {
 	title = DOH_loong_event.3002.t
 	desc = DOH_loong_event.3002.d
 	trigger = {
-		tag = DOH
-		has_country_flag = DOH_BFL_bifenggang_flag
-		BFL = {
-			has_government = communism
+		AND = {
+			tag = DOH
+			DOH = {
+				has_completed_focus = DOH_hongsedengta
+			}
+			has_country_flag = DOH_BFL_bifenggang_flag
+			BFL = {
+				has_government = communism
+			}
+			country_exists = BFL
 		}
 	}
 	option = {
 		name = DOH_loong_event.3002.a
-		trigger = {
-			CHY = {
-				has_focus_tree = chongying_new_focus
-				OR = {
-					has_completed_focus = CHY_chichen1
-					is_debug = yes
-				}
-			}
-		}
 		ai_chance = {
 			base = 10
 		}
@@ -1302,19 +1299,19 @@ country_event = {
 		}
 		DOH = {
 			BFL_sayousi = {
-				set_nationality = DOH
+				set_nationality = BFL
 			}
 			BFL_afuleer = {
-				set_nationality = DOH
+				set_nationality = BFL
 			}
 			BFL_shuixingjinian = {
-				set_nationality = DOH
+				set_nationality = BFL
 			}
 			BFL_kalangshitade = {
-				set_nationality = DOH
+				set_nationality = BFL
 			}
 			BFL_luoxiya = {
-				set_nationality = DOH
+				set_nationality = BFL
 			}
 		}
 		hidden_effect = {
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 5a5492b..5c56551 100755
--- a/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml
+++ b/src/localisation/simp_chinese/azc_DOH_l_simp_chinese.yml
@@ -929,6 +929,7 @@
   #先进舰娘的避风港
   DOH_BFL_bifenggang_decision: "先进舰娘的避风港"
   DOH_BFL_bifenggang_decision_desc: "其他国家的共产主义舰娘将视本国政治局势转移至东煌，并在本国建立起红色政权后回归。"
+  DOH_BFL_bifenggang_flag: "北联舰娘已经来到东煌"
   #对外输出
   DOH_duiwaitouzi_decision_category: "东煌对外投资机制"
   DOH_duiwaitouzi_decision_category_desc: "我们可以将工业品投资给别国，并要求他们用工厂分成和资源来交换工业品。\n当前投资工业品总数§Y[?var:DOH_has_shuchu_civ]§!，折合工厂数§Y[?var:DOH_has_shuchu_factroies]§!\n当前投资工业占目标国工业比例：§Y[?var:shuchu_factor|%]§!，我们可以获得0.5倍该比例的目标国工业，至多60%。\n当该比例大于§C60%§!时，我们可以要求目标国家臣服。\n视双方§Y军事§!力量对比，§R该要求这可能导致战争§!。"