From e48ced289395436b0a4093a41271cfd41897eef5 Mon Sep 17 00:00:00 2001
From: "FA507RM-KALOSPA\\Kalo" <kalospacer@gmail.com>
Date: Sun, 11 Jun 2023 15:56:54 +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

---
 common/situations/rg_gray_situations.txt      | 32 +++++++++----------
 .../!_RG_projects_distant_stars.txt           |  9 ------
 events/RG_events.txt                          |  9 ++++++
 .../simp_chinese/RG_l_simp_chinese.yml        |  2 +-
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/common/situations/rg_gray_situations.txt b/common/situations/rg_gray_situations.txt
index ce01425..fb858a7 100644
--- a/common/situations/rg_gray_situations.txt
+++ b/common/situations/rg_gray_situations.txt
@@ -56,14 +56,6 @@ situation_rg_gray_mod1 = {
 					}
 				}
 			}
-			triggered_modifier = {
-				potential = {
-					has_situation_flag = situation_rg_gray_mod1_stage_2_booster
-				}
-				modifier = {
-					country_engineering_research_produces_mult = -1
-				}
-			}
 		}
 		situation_rg_gray_mod1_stage_3 = {
 			icon = GFX_situation_stage_3
@@ -103,14 +95,6 @@ situation_rg_gray_mod1 = {
 					}
 				}
 			}
-			triggered_modifier = {
-				potential = {
-					has_situation_flag = situation_rg_gray_mod1_stage_5_booster
-				}
-				modifier = {
-					country_physics_research_produces_mult = -1
-				}
-			}
 		}
 		situation_rg_gray_mod1_stage_6 = {
 			icon = GFX_situation_stage_6
@@ -150,6 +134,22 @@ situation_rg_gray_mod1 = {
 			}
 			custom_tooltip = situation_rg_gray_mod1_approach_1_tooltip
 		}
+		triggered_modifier = {
+			potential = {
+				has_situation_flag = situation_rg_gray_mod1_stage_5_booster
+			}
+			modifier = {
+				country_physics_research_produces_mult = -1
+			}
+		}
+		triggered_modifier = {
+			potential = {
+				has_situation_flag = situation_rg_gray_mod1_stage_2_booster
+			}
+			modifier = {
+				country_engineering_research_produces_mult = -1
+			}
+		}
 	}
 	approach = {
 		name = situation_rg_gray_mod1_approach_2
diff --git a/common/special_projects/!_RG_projects_distant_stars.txt b/common/special_projects/!_RG_projects_distant_stars.txt
index 1db6083..3325470 100644
--- a/common/special_projects/!_RG_projects_distant_stars.txt
+++ b/common/special_projects/!_RG_projects_distant_stars.txt
@@ -87,15 +87,6 @@ special_project = {
 			country_event = {
 				id = rg_event.11
 			}
-			random_situation = {
-				limit = {
-					is_situation_type = situation_rg_gray_mod1
-				}
-				remove_situation_flag = situation_rg_gray_mod1_stage_6_booster
-				remove_situation_flag = rg_stage6_locked
-				set_situation_locked = no
-				remove_situation_flag = locked
-			}
 		}
 	}
 }
diff --git a/events/RG_events.txt b/events/RG_events.txt
index af8ef41..c07bb52 100644
--- a/events/RG_events.txt
+++ b/events/RG_events.txt
@@ -625,6 +625,15 @@ country_event = {
 				assign_leader = event_target:gray_leader_admiral
 			}
 		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			remove_situation_flag = situation_rg_gray_mod1_stage_6_booster
+			remove_situation_flag = rg_stage6_locked
+			set_situation_locked = no
+			remove_situation_flag = locked
+		}
 	}
 	option = {
 		name = OK
diff --git a/localisation/simp_chinese/RG_l_simp_chinese.yml b/localisation/simp_chinese/RG_l_simp_chinese.yml
index 53960d5..d3ced30 100644
--- a/localisation/simp_chinese/RG_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_l_simp_chinese.yml
@@ -351,7 +351,7 @@
 
  situation_rg_gray_mod1_approach_1:0 "按计划执行"
  situation_rg_gray_mod1_approach_2:0 "暂停执行计划"
- situation_rg_gray_mod1_approach_2:0 "放弃执行计划"
+ situation_rg_gray_mod1_approach_3:0 "放弃执行计划"
  situation_rg_gray_mod1_approach_1_tooltip:0 "§G我们的项目将会按计划按部就班执行。§!"
  situation_rg_gray_mod1_approach_2_tooltip:0 "§Y迫于外部压力，我们需要暂缓执行改造项目。§!"
  situation_rg_gray_mod1_approach_3_tooltip:0 "§R我们遇到了使计划难以为继的困难，不得不暂时中止计划等待下一个时机。§!"