From 0357e982413276b215bc4a21c2551ba579f9402c Mon Sep 17 00:00:00 2001
From: "FA507RM-KALOSPA\\Kalo" <kalospacer@gmail.com>
Date: Mon, 12 Jun 2023 11:40:30 +0800
Subject: [PATCH] fix

---
 .../scripted_effects/RG_scripted_effects.txt  | 36 +++++++++++++++----
 .../rg_leader_scripted_triggers.txt           |  3 ++
 .../simp_chinese/RG_l_simp_chinese.yml        |  7 ++--
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/common/scripted_effects/RG_scripted_effects.txt b/common/scripted_effects/RG_scripted_effects.txt
index 3325b65..bc0a9b2 100644
--- a/common/scripted_effects/RG_scripted_effects.txt
+++ b/common/scripted_effects/RG_scripted_effects.txt
@@ -2545,9 +2545,21 @@ rg_lcluster_spawn_effect = {
 }
 RG_gray_mod1_effect = {
 	custom_tooltip = rg_levelup_2.tooltip
-	start_situation = {
-		type = situation_rg_gray_mod1
-		target = this
+	if = {
+		limit = {
+			has_global_flag = rg_skip_gray_mod_situation
+		}
+		enable_special_project = {
+			name = RG_GRAY_MOD1
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	else = {
+		start_situation = {
+			type = situation_rg_gray_mod1
+			target = this
+		}
 	}
 	add_resource = {
 		energy = -15000
@@ -2564,9 +2576,21 @@ RG_gray_mod1_effect_project = {
 }
 RG_gray_mod2_effect = {
 	custom_tooltip = rg_levelup_2.tooltip
-	start_situation = {
-		type = situation_rg_gray_mod2
-		target = this
+	if = {
+		limit = {
+			has_global_flag = rg_skip_gray_mod_situation
+		}
+		enable_special_project = {
+			name = RG_GRAY_MOD2
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	else = {
+		start_situation = {
+			type = situation_rg_gray_mod2
+			target = this
+		}
 	}
 	add_resource = {
 		energy = -150000
diff --git a/common/scripted_triggers/rg_leader_scripted_triggers.txt b/common/scripted_triggers/rg_leader_scripted_triggers.txt
index 95aeb40..7d42f70 100644
--- a/common/scripted_triggers/rg_leader_scripted_triggers.txt
+++ b/common/scripted_triggers/rg_leader_scripted_triggers.txt
@@ -58,6 +58,9 @@ RG_gray_mod2_trigger = {
 	NOR = {
 		has_country_flag = rg_gray_level_3
 		has_special_project = RG_GRAY_MOD2
+		any_situation = {
+			is_situation_type = situation_rg_gray_mod2
+		}
 	}
 }
 RG_gray_mod2_allow_trigger = {
diff --git a/localisation/simp_chinese/RG_l_simp_chinese.yml b/localisation/simp_chinese/RG_l_simp_chinese.yml
index 916f579..61d8330 100644
--- a/localisation/simp_chinese/RG_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_l_simp_chinese.yml
@@ -354,6 +354,9 @@
  situation_rg_gray_mod1_monthly_change_tooltip:0 "§Y我们正在稳步推进改造项目。§!"
  situation_rg_gray_mod1_finish_tooltip:0 "§Y我们的计划按部就班地顺利完成。§!"
 
+ situation_rg_gray_mod2_monthly_change_tooltip:0 "§Y我们正在稳步推进改造项目。§!"
+ situation_rg_gray_mod2_finish_tooltip:0 "§Y我们的计划按部就班地顺利完成。§!"
+
  situation_rg_gray_mod1_approach_1:0 "按计划执行"
  situation_rg_gray_mod1_approach_2:0 "暂停执行计划"
  situation_rg_gray_mod1_approach_3:0 "放弃执行计划"
@@ -407,5 +410,5 @@
  rg_gray_mod2_stage1_project:0 "§Y指派首席科学家帮助改造项目§!"
  rg_gray_mod2_stage1_project_desc:0 "为了加快$NAME_Gray$改造项目进度，我们需要指派我们的科学家研究这个项目。嗯，就是这样。"、
 
- rg_gray_mod2_stage4_project:0 "§Y指派首席科学家帮助改造项目§!"
- rg_gray_mod2_stage4_project_desc:0 "为了加快$NAME_Gray$改造项目进度，我们需要指派我们的科学家研究这个项目。嗯，就是这样。"
+ rg_gray_mod2_stage4_project:0 "$rg_gray_mod2_stage1_project$"
+ rg_gray_mod2_stage4_project_desc:0 "$rg_gray_mod2_stage1_project_desc$"