From 63e04f34f9338b0565ea9e1bf3e3277d62e257fa Mon Sep 17 00:00:00 2001
From: "FA507RM-KALOSPA\\Kalo" <kalospacer@gmail.com>
Date: Mon, 29 May 2023 11:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 events/!_RG_distant_stars_events_3.txt |  3 +++
 events/!_RG_gray_goo_events.txt        | 22 +++++++++++++++-------
 events/RG_events.txt                   |  1 +
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/events/!_RG_distant_stars_events_3.txt b/events/!_RG_distant_stars_events_3.txt
index 3ee5a22..ddade9c 100644
--- a/events/!_RG_distant_stars_events_3.txt
+++ b/events/!_RG_distant_stars_events_3.txt
@@ -55,6 +55,9 @@ country_event = {
 		trigger = {
 			OR = {
 				has_origin = origin_rg_gray
+				has_origin = origin_gray
+				has_origin = origin_lclusterplus_gatebuilders
+				has_origin = origin_lclusterplus_gatebuilders_advanced
 			}
 		}
 	}
diff --git a/events/!_RG_gray_goo_events.txt b/events/!_RG_gray_goo_events.txt
index 5dd677c..e6906c2 100644
--- a/events/!_RG_gray_goo_events.txt
+++ b/events/!_RG_gray_goo_events.txt
@@ -794,6 +794,7 @@ country_event = {
 
 	picture_event_data = {
 		portrait = event_target:gray_species
+		planet_background = event_target:gray_homeworld
 		room = "ethic_spaceship_room"
 	}
 
@@ -853,6 +854,7 @@ country_event = {
 
 	picture_event_data = {
 		portrait = event_target:gray_species
+		planet_background = event_target:gray_homeworld
 		room = "ethic_spaceship_room"
 	}
 
@@ -876,6 +878,7 @@ country_event = {
 
 	picture_event_data = {
 		portrait = event_target:gray_species
+		planet_background = event_target:gray_homeworld
 		room = "ethic_spaceship_room"
 	}
 
@@ -899,6 +902,7 @@ country_event = {
 
 	picture_event_data = {
 		portrait = event_target:gray_species
+		planet_background = event_target:gray_homeworld
 		room = "ethic_spaceship_room"
 	}
 
@@ -922,6 +926,7 @@ country_event = {
 
 	picture_event_data = {
 		portrait = event_target:gray_species
+		planet_background = event_target:gray_homeworld
 		room = "ethic_spaceship_room"
 	}
 
@@ -957,7 +962,8 @@ country_event = {
 
 	picture_event_data = {
 		portrait = event_target:gray_governor
-		room = "ethic_spaceship_room"
+		planet_background = event_target:gray_homeworld
+		room = ship_room
 	}
 
 	event_window_type = leader_recruit
@@ -1080,7 +1086,8 @@ country_event = {
 	diplomatic = yes
 
 	picture_event_data = {
-		portrait = event_target:gray_species
+		portrait = event_target:gray_governor
+		planet_background = root.capital_scope
 		room = "ethic_spaceship_room"
 	}
 
@@ -1186,9 +1193,9 @@ country_event = {
 	diplomatic = yes
 
 	picture_event_data = {
-		portrait = event_target:gray_species
+		portrait = event_target:gray_governor
 		planet_background = event_target:gray_governor_planet
-		room = ethic_spaceship_room
+		room = root
 	}
 
 	is_triggered_only = yes
@@ -1297,7 +1304,7 @@ country_event = {
 	diplomatic = yes
 
 	picture_event_data = {
-		portrait = event_target:gray_species
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 
@@ -1636,7 +1643,7 @@ country_event = {
 	diplomatic = yes
 
 	picture_event_data = {
-		portrait = event_target:gray_species
+		portrait = event_target:gray_leader_general
 		room = "ethic_spaceship_room"
 	}
 
@@ -1949,6 +1956,7 @@ country_event = {
 			alloys = -50000
 		}
 		remove_country_flag = gray_reforming
+		remove_modifier = "gray_scattered"
 	}
 }
 
@@ -1964,7 +1972,7 @@ country_event = {
 	diplomatic = yes
 
 	picture_event_data = {
-		portrait = event_target:gray_species
+		portrait = event_target:gray_leader_scientist
 		room = "ethic_spaceship_room"
 	}
 
diff --git a/events/RG_events.txt b/events/RG_events.txt
index bb1a0a9..c919aa5 100644
--- a/events/RG_events.txt
+++ b/events/RG_events.txt
@@ -40,6 +40,7 @@ country_event = {
 	immediate = {
 		hidden_effect = {
 			rg_create_gray_species = yes
+			rg_gray_govener_init = yes
 		}
 	}