From e540e3fb2ec81df53eff6f2417874379a231015e Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Sun, 14 Apr 2024 15:14:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scripted_effects/RG_gray_goo_effects.txt  |  2 +-
 .../RG_gray_leader_init_effects.txt           | 36 +------------------
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/common/scripted_effects/RG_gray_goo_effects.txt b/common/scripted_effects/RG_gray_goo_effects.txt
index 57572d2..113e491 100644
--- a/common/scripted_effects/RG_gray_goo_effects.txt
+++ b/common/scripted_effects/RG_gray_goo_effects.txt
@@ -480,7 +480,7 @@ rg_create_gray_warship = {
 rg_create_gray_army = {
 	if = {
 		limit = {
-			has_leader_flag = gray_army_active
+			has_country_flag = gray_army_active
 		}
 	}
 	else = {
diff --git a/common/scripted_effects/RG_gray_leader_init_effects.txt b/common/scripted_effects/RG_gray_leader_init_effects.txt
index 9ae66b6..62cd569 100644
--- a/common/scripted_effects/RG_gray_leader_init_effects.txt
+++ b/common/scripted_effects/RG_gray_leader_init_effects.txt
@@ -1,37 +1,3 @@
-# 避免代码复用原则：
-# 如果你需要在不同的地方重复调用同一套代码，你应当把他们封装在这样的函数里。
-# 避免需要修改代码时需要重复修改n次，或是发生修改了A处忘记修改B处导致bug发生的问题。
-# 当然，这种分块需要到什么程度，我也不知道
-#灰风
-################################
-# 舰R 灰风领袖好感度设定块部分：采样时间戳：2023/6/1 8：17
-# 仅用于留档比对不进行改动
-# wg_affection_wg_gray_system_launch = {
-# 	if = {
-# 		limit = { has_leader_flag = gray_leader }
-# 	set_leader_flag = has_wg_affection
-# 	set_leader_flag = has_wg_affection_wg_gray
-# 	set_leader_flag = wg_affection_auto_change_no
-# 	add_trait_no_notify = leader_trait_wg_gray_affection
-# 	set_variable = { which = affection value = owner.wg_gray_affection }
-# 	set_variable = { which = wg_leader_affection_to_lv2 value = @wg_gray_affection_to_lv2 }
-# 	set_variable = { which = wg_leader_affection_to_lv3 value = @wg_gray_affection_to_lv3 }
-# 	set_variable = { which = wg_leader_affection_to_lv4 value = @wg_gray_affection_to_lv4 }
-# 	set_variable = { which = wg_leader_affection_to_lv5 value = @wg_gray_affection_to_lv5 }
-# 	set_variable = { which = wg_leader_affection_reduce value = @wg_gray_affection_reduce }
-# 	set_variable = { which = wg_leader_affection_increase value = @wg_gray_affection_increase }
-# 	}
-# 
-# }
-# wg_affection_wg_gray_system_check = {
-# 	if = {
-# 		limit = {
-# 			has_leader_flag = has_wg_affection_wg_gray
-# 		}
-# 		set_variable = { which = affection value = owner.wg_gray_affection }
-# 	}
-# }
-################################
 rg_gray_govener_init = {
 	event_target:rg_gray_country = {
 		create_leader = {
@@ -74,7 +40,7 @@ rg_gray_govener_init = {
 							}
 						}
 					}
-					set_leader_flag = "gray_leader"					#某个mod新旧flag混用，我不说是谁。嗯嘿嘿
+					set_leader_flag = "gray_leader"
 					set_leader_flag = gray_leader
 					add_trait_no_notify = leader_trait_governor_gray
 					add_trait_no_notify = RG_leader_trait_ruler_gray