ZC

This reverts commit c0f8d6f8da.

README.md

@@ -1,9 +1,2 @@
 # Real-Gray
 Stellaris mod real gray page.
-3.12卫星
-单槽虚空辉光舰 高射速不间断T槽武器
-灰风堕落帝国
-灰风狗开
-灰风机仆
-绑定银河机仆数量的灰风意识完整度系统
-终局天灾纳迪沙协议

common/scripted_effects/RG_fallen_empire_effects.txt

@@ -1,3 +1,99 @@
+rg_create_fallen_empire_species_effect = {
+	create_species = {
+		name = 纳米构造体
+		class = RG_MACHINE
+		portrait = "rg_machine_maid"
+		traits = {
+			trait = trait_machine_unit
+			trait = rg_machine_maid_trait
+			trait = trait_robot_mass_produced
+			trait = ramdom_trait
+		}
+		extra_trait_points = 3
+		allow_negative_traits = no
+		namelist = MACHINE3
+		effect = {
+			save_event_target_as = rg_fallen_maid_species
+		}
+	}
+}
+
+rg_create_fallen_empire_country_effect = {
+	create_country = {
+		name = 德萨努-纳迪沙协议
+		type = fallen_empire
+		flag = {
+			icon = {
+				category = "special"
+				file = "gray_goo.dds"
+			}
+			background = {
+				category = "backgrounds"
+				file = "sinus.dds"
+			}
+			colors = {
+				"grey"
+				"dark_grey"
+				"null"
+				"null"
+			}
+		}
+		ignore_initial_colony_error = yes
+		authority = auth_machine_intelligence
+		civics = {
+			civic = civic_machine_remnants
+			civic = civic_custodian_directives
+		}
+		species = last_created_species
+		ethos = {
+			ethic = ethic_gestalt_consciousness
+		}
+		origin = "origin_fallen_empire"
+		effect = {
+			set_built_species = last_created_species
+			save_global_event_target_as = rg_scion_fe
+			set_country_flag = rg_fallen_empire_machine
+			add_resource = {
+				minerals = 10000
+				energy = 10000
+				food = 1000
+				influence = 500
+			}
+			if = {
+				limit = { host_has_dlc = "Apocalypse" }
+				give_technology = {
+					tech = tech_colossus
+					message = no
+				}
+			}
+			# must initialize global designs here
+			add_global_ship_design = "NAME_Gray_Omega"
+			add_global_ship_design = "NAME_Gray_Alpha"
+			add_global_ship_design = "NAME_Gray_Beta"
+			add_global_ship_design = "NAME_Gray_Gamma"
+			add_global_ship_design = "NAME_Gray_Theta"
+			add_global_ship_design = "NAME_Gray_Tau"
+			add_global_ship_design = "NAME_Gray_Sigma"
+			add_global_ship_design = "NAME_Gray_FE_Starbase"
+			if = {
+				limit = {
+					NOT = {
+						exist = event_target:rg_gray_country_leader
+					}
+				}
+				rg_gray_country_leader_init = yes
+				set_leader = last_created_leader
+			}
+			else = {
+				set_leader = last_created_leader
+			}
+			ruler = {
+				add_skill = 9
+			}
+		}
+	}
+}
+
 rg_create_fallen_empire_reinforcements = {
 	create_fleet = {
 		effect = {

common/scripted_effects/RG_gray_goo_effects.txt

@@ -75,7 +75,7 @@ rg_global_gray_location_check = {
 				any_owned_planet = {
 					exists = sector.leader
 					sector.leader = {
-						has_leader_flag = gray_official
+						has_leader_flag = gray_governor
 					}
 				}
 			}
@@ -83,7 +83,7 @@ rg_global_gray_location_check = {
 				limit = {
 					exists = sector.leader
 					sector.leader = {
-						has_leader_flag = gray_official
+						has_leader_flag = gray_governor
 					}
 				}
 				save_global_event_target_as = global_gray_location
@@ -219,16 +219,16 @@ rg_create_gray_governor = {
 		#把娘家的总督领袖接回来
 		if = {
 			limit = {
-				exists = event_target:gray_official
+				exists = event_target:gray_governor
 			}
-			event_target:gray_official = {
+			event_target:gray_governor = {
 				set_owner = event_target:gray_owner
 				remove_leader_flag = rg_gray_leader_temp
 			}
 		}
 		#如果不存在总督备份，现场变一个
 		else = {
-			rg_gray_offical_init = yes
+			rg_gray_govener_init = yes
 		}
 		#设置总督已启用标识
 		set_country_flag = gray_official_active #新版flag
@@ -241,7 +241,7 @@ rg_create_gray_governor = {
 		#等级导入，把存储的领袖等级赋予到领袖身上
 		random_owned_leader = {
 			limit = {
-				has_leader_flag = gray_official
+				has_leader_flag = gray_governor
 			}
 			set_skill = owner.rg_gray_level
 		}
@@ -331,16 +331,16 @@ rg_create_gray_governor_habitat = {
 		#把娘家的总督领袖接回来
 		if = {
 			limit = {
-				exists = event_target:gray_official
+				exists = event_target:gray_governor
 			}
-			event_target:gray_official = {
+			event_target:gray_governor = {
 				set_owner = event_target:gray_owner
 				remove_leader_flag = rg_gray_leader_temp
 			}
 		}
 		#如果不存在总督备份，现场变一个
 		else = {
-			rg_gray_offical_init = yes
+			rg_gray_govener_init = yes
 		}
 		rg_juggernaut_habitat_init = yes
 		#设置总督已启用标识
@@ -355,7 +355,7 @@ rg_create_gray_governor_habitat = {
 		#等级导入，把存储的领袖等级赋予到领袖身上
 		random_owned_leader = {
 			limit = {
-				has_leader_flag = gray_official
+				has_leader_flag = gray_governor
 			}
 			set_skill = owner.rg_gray_level
 		}
@@ -406,15 +406,15 @@ rg_create_gray_warship = {
 		}
 		if = {
 			limit = {
-				exists = event_target:gray_official
+				exists = event_target:gray_leader_admiral
 			}
-			event_target:gray_official = {
+			event_target:gray_leader_admiral = {
 				set_owner = event_target:gray_owner
 				remove_leader_flag = rg_gray_leader_temp
 			}
 		}
 		else = {
-			rg_gray_offical_init = yes
+			rg_gray_commander_init = yes
 		}
 		set_country_flag = gray_warship_active
 		if = {
@@ -469,7 +469,7 @@ rg_create_gray_warship = {
 		remove_country_flag = gray_army_active
 		random_owned_leader = {
 			limit = {
-				has_leader_flag = gray_official
+				has_leader_flag = gray_admiral
 			}
 			set_skill = owner.rg_gray_level
 		}
@@ -519,15 +519,15 @@ rg_create_gray_army = {
 		}
 		if = {
 			limit = {
-				exists = event_target:gray_official
+				exists = event_target:gray_leader_general
 			}
-			event_target:gray_official = {
+			event_target:gray_leader_general = {
 				set_owner = event_target:gray_owner
 				remove_leader_flag = rg_gray_leader_temp
 			}
 		}
 		else = {
-			rg_gray_offical_init = yes
+			rg_gray_commander_init = yes
 		}
 		create_ship_design = {
 			design = "NAME_RG_armed_transport_ship"
@@ -553,7 +553,7 @@ rg_create_gray_army = {
 			}
 		}
 		last_created_army = {
-			assign_leader = event_target:gray_official
+			assign_leader = event_target:gray_leader_general
 		}
 		every_owned_fleet = {
 			limit = {
@@ -583,7 +583,7 @@ rg_create_gray_army = {
 		remove_ship_design = last_created_design
 		random_owned_leader = {
 			limit = {
-				has_leader_flag = gray_official
+				has_leader_flag = gray_general
 			}
 			set_skill = owner.rg_gray_level
 		}
@@ -633,15 +633,15 @@ rg_create_gray_const = {
 		}
 		if = {
 			limit = {
-				exists = event_target:gray_official
+				exists = event_target:gray_leader_scientist
 			}
-			event_target:gray_official = {
+			event_target:gray_leader_scientist = {
 				set_owner = event_target:gray_owner
 				remove_leader_flag = rg_gray_leader_temp
 			}
 		}
 		else = {
-			rg_gray_offical_init = yes
+			rg_gray_scientist_init = yes
 		}
 		set_country_flag = gray_constship_active
 		create_fleet = {
@@ -671,7 +671,7 @@ rg_create_gray_const = {
 				set_fleet_flag = gray_constship
 				save_global_event_target_as = global_gray_constship
 				set_cloaking_active = yes
-				assign_leader = event_target:gray_official
+				assign_leader = event_target:gray_leader_scientist
 			}
 		}
 		every_owned_fleet = {
@@ -703,7 +703,7 @@ rg_create_gray_const = {
 		remove_country_flag = gray_official_active
 		random_owned_leader = {
 			limit = {
-				has_leader_flag = gray_official
+				has_leader_flag = gray_scientist
 			}
 			set_skill = owner.rg_gray_level
 		}

common/scripted_effects/RG_gray_leader_init_effects.txt

@@ -1,128 +1,3 @@
-#灰风
-rg_gray_offical_init = {
-	event_target:rg_gray_country = {
-		create_leader = {
-			class = rg_nanite_leader
-			species = event_target:gray_species
-			name = "NAME_Gray"
-			gender = female
-			immortal = yes
-			event_leader = yes
-			skip_background_generation = yes
-			randomize_traits = no
-			custom_catch_phrase = gray_catch_phrase
-			custom_description = gray_backstory
-			background_ethic = ethic_gestalt_consciousness
-			hide_age = yes
-			skill = 10
-			set_age = 18
-			traits = {
-				0 = RG_leader_trait_offical_gray
-			}
-			effect = {
-				save_global_event_target_as = gray_official
-				set_leader_flag = gray_governor
-				set_leader_flag = gray_official
-				set_leader_flag = legendary_leader
-				set_leader_flag = immune_to_negative_traits
-				set_leader_flag = rg_gray_leader
-				if = {
-					limit = {
-						owner = {
-							has_global_flag = has_wsg_mod
-						}
-					}
-					set_leader_flag = not_has_wg_affection_normal
-				}
-				if = {
-					limit = {
-						owner = {
-							OR = {
-								has_global_flag = has_wsg_mod
-								has_global_flag = kdc_event_mod_active
-							}
-						}
-					}
-					set_leader_flag = "gray_leader"
-					set_leader_flag = gray_leader
-					add_trait_no_notify = leader_trait_governor_gray
-					if = {
-						limit = {
-							owner = {
-								has_country_flag = origin_gray_weaken
-								has_country_flag = origin_gray_country
-							}
-						}
-						remove_trait = leader_trait_governor_gray
-						add_trait_no_notify = leader_trait_governor_gray_weak
-					}
-				}
-				add_trait_no_notify = RG_leader_trait_offical_gray
-				add_trait_no_notify = RG_leader_trait_ruler_gray
-				add_trait_no_notify = RG_leader_trait_admiral_nanorebuild_gray
-				add_trait_no_notify = subclass_official_governor
-				add_trait_no_notify = subclass_commander_councilor
-				add_trait_no_notify = subclass_scientist_explorer
-				add_trait_no_notify = trait_ruler_architectural_sense_3
-				add_trait_no_notify = leader_trait_distribution_lines_2
-				add_trait_no_notify = leader_trait_carrier_specialization
-				add_trait_no_notify = leader_trait_juryrigger_2
-				add_trait_no_notify = leader_trait_reinforcer_2
-				add_trait_no_notify = leader_trait_engineering_focus_2
-				add_trait_no_notify = leader_trait_salvager_3
-			}
-		}
-		last_created_leader = {
-			set_owner = event_target:gray_owner
-		}
-	}
-	last_created_leader = {
-		set_leader_flag = has_gained_level_trait
-	}
-	random_owned_leader = {
-		limit = {
-			has_leader_flag = gray_official
-		}
-		if = {
-			limit = {
-				owner = {
-					OR = {
-						has_global_flag = has_wsg_mod
-						has_global_flag = kdc_event_mod_active
-					}
-				}
-			}
-			if = {
-				limit = {
-					has_leader_flag = has_wg_affection_wg_gray
-				}
-				if = {
-					limit = {
-						owner = { has_country_flag = married_gray }
-					}
-					set_leader_flag = married
-				}
-				set_variable = { which = affection value = owner.wg_gray_affection }
-			}
-			# if = {
-			# 	limit = {
-			# 		owner = {
-			# 			has_country_flag = gray_encountered_the_loop
-			# 		}
-			# 	}
-			# 	add_trait_no_notify = leader_trait_governor_wg_the_loop
-			# }
-			set_gray_portrait = yes
-			# add_special_leader_affection_trait = { LEADER = gray LEADER_CLASS = governor MARRIED_FLAG = married_gray }
-		}
-		else = {
-			rg_set_gray_portrait = yes
-		}
-	}
-	RG_leader_trait_admiral_nanorebuild_gray_counter_init_effect = yes
-	RG_leader_trait_general_tempest_incoming_counter_init_effect = yes
-}
-
 rg_gray_govener_init = {
 	event_target:rg_gray_country = {
 		create_leader = {
@@ -239,6 +114,7 @@ rg_gray_govener_init = {
 			rg_set_gray_portrait = yes
 		}
 	}
+	
 }
 
 rg_gray_commander_init = {

common/scripted_effects/rg_gray_warship_init_effects.txt

@@ -31,7 +31,7 @@ rg_warship_init_mod1 = {
 			}
 			set_fleet_flag = gray_fleet
 			save_global_event_target_as = gray_warship
-			assign_leader = event_target:gray_official
+			assign_leader = event_target:gray_leader_admiral
 			if = {
 				limit = {
 					has_global_flag = kdc_event_mod_active
@@ -75,7 +75,7 @@ rg_warship_init_mod2 = {
 			}
 			set_fleet_flag = gray_fleet
 			save_global_event_target_as = gray_warship
-			assign_leader = event_target:gray_official
+			assign_leader = event_target:gray_leader_admiral
 			if = {
 				limit = {
 					has_global_flag = kdc_event_mod_active
@@ -163,7 +163,7 @@ rg_warship_init_mod0 = {
 			}
 			set_fleet_flag = gray_fleet
 			save_global_event_target_as = gray_warship
-			assign_leader = event_target:gray_official
+			assign_leader = event_target:gray_leader_admiral
 			if = {
 				limit = {
 					has_global_flag = kdc_event_mod_active

common/scripted_triggers/rg_leader_scripted_triggers.txt

@@ -1,5 +1,5 @@
 RG_gray_mod1_trigger = {
-	event_target:gray_official = {
+	event_target:gray_leader_admiral = {
 		has_skill >= 10
 	}
 	NOR = {
@@ -34,7 +34,7 @@ RG_gray_mod1_allow_trigger = {
 	}
 	custom_tooltip = {
 		fail_text = requires_rg_graylevel_higherthan_25
-		event_target:gray_official = {
+		event_target:gray_leader_admiral = {
 			has_skill >= 10
 		}
 	}
@@ -50,7 +50,7 @@ RG_gray_mod1_allow_trigger = {
 
 RG_gray_mod2_trigger = {
 	AND = {
-		event_target:gray_official = {
+		event_target:gray_leader_admiral = {
 			has_skill >= 10
 		}
 		has_country_flag = rg_gray_level_2
@@ -91,7 +91,7 @@ RG_gray_mod2_allow_trigger = {
 		}
 		custom_tooltip = {
 			fail_text = requires_rg_graylevel_higherthan_20
-			event_target:gray_official = {
+			event_target:gray_leader_admiral = {
 				has_skill >= 20
 			}
 		}

common/solar_system_initializers/RG_fallen_empire_initializers.txt

@@ -49,96 +49,9 @@ rg_fallen_machine = {
 				center = this.solar_system
 			}
 
-			create_species = {
+			rg_create_fallen_empire_species_effect = yes
-				name = 纳米构造体
+			rg_create_fallen_empire_country_effect = yes
-				class = RG_MACHINE
+
-				portrait = "rg_machine_maid"
-				traits = {
-					trait = trait_machine_unit
-					trait = rg_machine_maid_trait
-					trait = trait_robot_mass_produced
-					trait = ramdom_trait
-				}
-				extra_trait_points = 3
-				allow_negative_traits = no
-				namelist = MACHINE3
-				effect = {
-					save_event_target_as = rg_fallen_maid_species
-				}
-			}
-			create_country = {
-				name = 德萨努-纳迪沙协议
-				type = fallen_empire
-				flag = {
-					icon = {
-						category = "special"
-						file = "gray_goo.dds"
-					}
-					background = {
-						category = "backgrounds"
-						file = "sinus.dds"
-					}
-					colors = {
-						"grey"
-						"dark_grey"
-						"null"
-						"null"
-					}
-				}
-				ignore_initial_colony_error = yes
-				authority = auth_machine_intelligence
-				civics = {
-					civic = civic_machine_remnants
-					civic = civic_custodian_directives
-				}
-				species = last_created_species
-				ethos = {
-					ethic = ethic_gestalt_consciousness
-				}
-				origin = "origin_fallen_empire"
-				effect = {
-					set_built_species = last_created_species
-					save_global_event_target_as = rg_scion_fe
-					set_country_flag = rg_fallen_empire_machine
-					add_resource = {
-						minerals = 10000
-						energy = 10000
-						food = 1000
-						influence = 500
-					}
-					if = {
-						limit = { host_has_dlc = "Apocalypse" }
-						give_technology = {
-							tech = tech_colossus
-							message = no
-						}
-					}
-					# must initialize global designs here
-					add_global_ship_design = "NAME_Gray_Omega"
-					add_global_ship_design = "NAME_Gray_Alpha"
-					add_global_ship_design = "NAME_Gray_Beta"
-					add_global_ship_design = "NAME_Gray_Gamma"
-					add_global_ship_design = "NAME_Gray_Theta"
-					add_global_ship_design = "NAME_Gray_Tau"
-					add_global_ship_design = "NAME_Gray_Sigma"
-					add_global_ship_design = "NAME_Gray_FE_Starbase"
-					if = {
-						limit = {
-							NOT = {
-								exist = event_target:rg_gray_country_leader
-							}
-						}
-						rg_gray_country_leader_init = yes
-						set_leader = last_created_leader
-					}
-					else = {
-						set_leader = last_created_leader
-					}
-					ruler = {
-						add_skill = 9
-					}
-				}
-			}
 			set_planet_flag = fallen_empire_world
 			prevent_anomaly = yes
 			set_owner = event_target:rg_scion_fe
@@ -342,3 +255,653 @@ rg_fallen_machine = {
 	# }
 }
 
+
+rg_fallen_machine_1 = {
+	usage = fallen_empire_init
+	name = 芬里尔III
+	class = "rl_standard_stars"
+
+	flags = {
+		ring_world_built
+	}
+
+	planet = {
+		class = star
+		orbit_distance = 0
+		orbit_angle = 0
+	}
+
+	change_orbit = 45
+
+	planet = {
+		class = "pc_ringworld_tech"
+		name = 外环
+		orbit_angle = -30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_seam"
+		name = 泡芙碗
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_habitable"
+		name = 菠萝包工厂
+		orbit_angle = 30
+		orbit_distance = 0
+		deposit_blockers = none
+		modifiers = none
+
+		init_effect = {
+
+			create_cluster = {
+				id = fe_mach_cluster
+				radius = 80
+				center = this.solar_system
+			}
+
+			rg_create_fallen_empire_species_effect = yes
+			rg_create_fallen_empire_country_effect = yes
+
+			set_planet_flag = fallen_empire_world
+			prevent_anomaly = yes
+			set_owner = event_target:rg_scion_fe
+			set_controller = event_target:rg_scion_fe
+			set_capital = yes
+
+			add_building = building_ancient_control_center
+			add_building = building_nourishment_center
+			add_building = building_nourishment_center
+			add_building = building_nourishment_center
+			add_building = building_nourishment_center
+			add_building = building_ancient_palace
+			add_building = building_affluence_center
+			add_building = building_affluence_center
+			add_building = building_affluence_center
+			add_building = building_affluence_center
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+
+			while = {
+				count = 5
+				add_district = district_rw_science
+			}
+			while = {
+				count = 5
+				add_district = district_rw_nexus
+			}
+			while = {
+				count = 105
+				create_pop = {
+					species = owner_main_species
+				}
+			}
+
+			while = {
+				count = 94
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
+			}
+
+			rg_create_fallen_empire_starting_navy = yes
+
+			while = {
+				count = 40
+				create_army = {
+					name = random
+					owner = event_target:rg_scion_fe
+					type = "gray_army"
+				}
+			}
+		}
+	}
+
+	init_effect = {
+		spawn_megastructure = {
+			type = "ring_world_ruined"
+			orbit_angle = -90
+			orbit_distance = 45
+		}
+		# rg_create_fe_citadel = yes
+		set_star_flag = lgate
+		spawn_megastructure = {
+			type = lgate_base
+			orbit_angle = 225
+			orbit_distance = 30
+		}
+	
+		rg_create_fe_citadel = yes
+	}
+
+	planet = {
+		class = "pc_ringworld_tech"
+		name = 中环
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_seam"
+		name = 烤面包机
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_habitable"
+		name = 可颂工厂
+		orbit_angle = 30
+		orbit_distance = 0
+		deposit_blockers = none
+		modifiers = none
+
+		init_effect = {
+
+			set_planet_flag = fallen_empire_world
+			prevent_anomaly = yes
+			set_owner = event_target:rg_scion_fe
+
+			add_building = building_ancient_control_center
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+
+			while = {
+				count = 5
+				add_district = district_rw_nexus
+			}
+			while = {
+				count = 50
+				create_pop = {
+					species = owner_main_species
+				}
+			}
+			while = {
+				count = 20
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
+			}
+			while = {
+				count = 20
+				create_army = {
+					name = random
+					owner = event_target:rg_scion_fe
+					type = "gray_army"
+				}
+			}
+		}
+	}
+
+	planet = {
+		class = "pc_ringworld_tech"
+		name = 内环
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_seam"
+		name = 奶油核心
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_habitable"
+		name = 糖霜工厂
+		orbit_angle = 30
+		orbit_distance = 0
+		deposit_blockers = none
+		modifiers = none
+
+		init_effect = {
+			set_planet_flag = fallen_empire_world
+			prevent_anomaly = yes
+			set_owner = event_target:rg_scion_fe
+
+			add_building = building_ancient_control_center
+			add_building = building_class_4_singularity
+			add_building = building_class_4_singularity
+			add_building = building_class_4_singularity
+			add_building = building_class_4_singularity
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+
+			while = {
+				count = 5
+				add_district = district_rw_generator
+			}
+			while = {
+				count = 22
+				create_pop = {
+					species = owner_main_species
+				}
+			}
+			while = {
+				count = 10
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
+			}
+			while = {
+				count = 10
+				create_army = {
+					name = random
+					owner = event_target:rg_scion_fe
+					type = "gray_army"
+				}
+			}
+		}
+	}
+
+	init_effect = {
+		spawn_system = {
+			min_distance >= 10
+			max_distance <= 50
+			initializer = rg_fallen_machine_01b
+		}
+	}
+
+}
+
+# EXTRAS
+rg_fallen_machine_01b = {
+	class = "rl_trinary_stars"
+
+	asteroid_belt = {
+		type = rocky_asteroid_belt
+		radius = 140
+	}
+	init_effect = {
+		rg_create_fe_citadel = yes
+	}
+
+	planet = {
+		count = 1
+		class = star
+		orbit_distance = 25
+		orbit_angle = 0
+		size = {
+			min = 20
+			max = 30
+		}
+		has_ring = no
+	}
+	planet = {
+		count = 1
+		class = star
+		orbit_distance = {
+			min = 0
+			max = 20
+		}
+		orbit_angle = 120
+		size = {
+			min = 25
+			max = 30
+		}
+		has_ring = no
+	}
+	planet = {
+		count = 1
+		class = star
+		orbit_distance = {
+			min = 0
+			max = 20
+		}
+		orbit_angle = 120
+		size = {
+			min = 25
+			max = 30
+		}
+		has_ring = no
+	}
+	change_orbit = 92
+	planet = {
+		count = {
+			min = 3
+			max = 6
+		}
+		class = pc_asteroid
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		count = 1
+		class = pc_asteroid
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+		init_effect = {
+			set_deposit = d_rare_crystals_2
+		}
+	}
+	change_orbit = -60
+	planet = {
+		class = pc_gray_goo
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_broken
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	change_orbit = 80
+	planet = {
+		class = pc_shattered
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_shattered
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+
+	init_effect = {
+		spawn_system = {
+			min_distance >= 10
+			max_distance <= 50
+			initializer = rg_fallen_machine_02b
+		}
+
+		add_hyperlane = {
+			from = this
+			to = prev
+		}
+	}
+
+	
+}
+
+rg_fallen_machine_02b = {
+	class = "rl_standard_stars"
+
+	asteroid_belt = {
+		type = rocky_asteroid_belt
+		radius = 135
+	}
+
+	init_effect = {
+		rg_create_fe_citadel = yes
+	}
+
+	planet = {
+		count = 1
+		class = star
+		orbit_distance = 0
+		orbit_angle = 0
+		size = {
+			min = 30
+			max = 35
+		}
+		has_ring = no
+	}
+	change_orbit = 135
+	planet = {
+		count = {
+			min = 3
+			max = 6
+		}
+		class = pc_asteroid
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	change_orbit = -80
+	planet = {
+		class = pc_gray_goo
+		orbit_distance = 30
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	change_orbit = 90
+	planet = {
+		class = pc_shattered
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_broken
+		orbit_distance = 30
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+
+	init_effect = {
+		spawn_system = {
+			min_distance >= 10
+			max_distance <= 50
+			initializer = rg_fallen_machine_03b
+		}
+
+		add_hyperlane = {
+			from = this
+			to = prev
+		}
+	}
+}
+
+rg_fallen_machine_03b = {
+	class = "rl_standard_stars"
+
+	asteroid_belt = {
+		type = rocky_asteroid_belt
+		radius = 120
+	}
+
+	init_effect = {
+		rg_create_fe_citadel = yes
+	}
+
+	planet = {
+		count = 1
+		class = star
+		orbit_distance = 0
+		orbit_angle = 1
+		size = {
+			min = 20
+			max = 30
+		}
+		has_ring = no
+	}
+	change_orbit = 120
+	planet = {
+		count = {
+			min = 3
+			max = 5
+		}
+		class = pc_asteroid
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		count = 1
+		class = pc_asteroid
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+		init_effect = {
+			set_deposit = d_volatile_motes_2
+		}
+	}
+	change_orbit = -70
+	planet = {
+		class = pc_shattered
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_broken
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	change_orbit = 70
+	planet = {
+		class = pc_gray_goo
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_gas_giant
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_gray_goo
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+
+	init_effect = {
+		spawn_system = {
+			min_distance >= 10
+			max_distance <= 50
+			initializer = rg_fallen_machine_04b
+		}
+
+		add_hyperlane = {
+			from = this
+			to = prev
+		}
+	}
+}
+
+rg_fallen_machine_04b = {
+	class = "rl_standard_stars"
+
+	init_effect = {
+		rg_create_fe_citadel = yes
+	}
+
+	planet = {
+		count = 1
+		class = star
+		orbit_distance = 0
+		orbit_angle = 1
+		size = {
+			min = 20
+			max = 30
+		}
+		has_ring = no
+	}
+	change_orbit = 50
+	planet = {
+		class = pc_broken
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_shattered
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_shattered
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_gray_goo
+		orbit_distance = 30
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_barren_cold
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+		change_orbit = @base_moon_distance
+		moon = {
+			class = "pc_frozen"
+			orbit_angle = {
+				min = 90
+				max = 270
+			}
+		}
+	}
+
+	init_effect = {
+		add_hyperlane = {
+			from = this
+			to = prev
+		}
+	}
+}
+

common/special_projects/!_RG_projects_distant_stars.txt

@@ -63,8 +63,8 @@ special_project = {
 	event_scope = ship_event
 	requirements = {
 		shipclass_military = 1
-		leader = rg_nanite_leader
+		leader = commander
-		# has_trait = RG_leader_trait_admiral_gray
+		has_trait = RG_leader_trait_admiral_gray
 	}
 	on_start = {
 		owner = {
@@ -102,8 +102,8 @@ special_project = {
 	event_scope = ship_event
 	requirements = {
 		shipclass_military = 1
-		leader = rg_nanite_leader
+		leader = admiral
-		# has_trait = RG_leader_trait_admiral_gray
+		has_trait = RG_leader_trait_admiral_gray
 	}
 	on_start = {
 		owner = {
@@ -139,8 +139,8 @@ special_project = {
 	event_scope = ship_event
 	requirements = {
 		shipclass_military = 1
-		leader = rg_nanite_leader
+		leader = commander
-		# has_trait = RG_leader_trait_admiral_gray
+		has_trait = RG_leader_trait_admiral_gray
 	}
 	on_start = {
 		owner = {

events/!_RG_gray_goo_events.txt

@@ -394,6 +394,7 @@ country_event = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
 		}
+		exists = event_target:gray_governor
 	}
 	immediate = {
 		if = {
@@ -625,7 +626,7 @@ event = {
 						has_country_flag = gray_governor_active #旧版flag
 					}
 					NOT = {
-						exists = event_target:gray_offical
+						exists = event_target:gray_governor
 					}
 				}
 				AND = {

events/RG_cluster_events.txt

@@ -123,6 +123,7 @@ country_event = {
 			save_event_target_as = rg_cluster_previous_home_planet
 			solar_system = {
 				save_event_target_as = rg_cluster_previous_home_system
+				set_star_flag = lgate
 				spawn_megastructure = {
 					type = lgate_base
 					orbit_angle = 225

events/RG_gray_leader_dialog_event.txt

@@ -191,8 +191,8 @@ country_event = {
 	desc = "graygoo.501.b.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_admiral
-		planet_background = event_target:gray_official_planet
+		planet_background = event_target:gray_governor_planet
 		room = root
 	}
 	is_triggered_only = yes
@@ -229,8 +229,8 @@ country_event = {
 	desc = "graygoo.501.c.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_general
-		planet_background = event_target:gray_official_planet
+		planet_background = event_target:gray_governor_planet
 		room = root
 	}
 	is_triggered_only = yes
@@ -267,8 +267,8 @@ country_event = {
 	desc = "rg_const.501.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_scientist
-		planet_background = event_target:gray_official_planet
+		planet_background = event_target:gray_governor_planet
 		room = root
 	}
 	is_triggered_only = yes
@@ -305,7 +305,7 @@ country_event = {
 	desc = "graygoo.502.a.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -342,7 +342,7 @@ country_event = {
 	desc = "graygoo.502.c.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_general
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -379,7 +379,7 @@ country_event = {
 	desc = "RG_graygoo.502.d.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -416,7 +416,7 @@ country_event = {
 	desc = "RG_graygoo.502.e.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -453,7 +453,7 @@ country_event = {
 	desc = "rg_const.502.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_scientist
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -490,7 +490,7 @@ country_event = {
 	desc = "graygoo.503.a.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -527,7 +527,7 @@ country_event = {
 	desc = "graygoo.503.b.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -564,7 +564,7 @@ country_event = {
 	desc = "rg_const.503.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_scientist
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -601,7 +601,7 @@ country_event = {
 	desc = "graygoo.505.a.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -638,7 +638,7 @@ country_event = {
 	desc = "graygoo.505.b.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -675,7 +675,7 @@ country_event = {
 	desc = "graygoo.505.c.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_general
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes

events/RG_gray_leader_event.txt

@@ -69,6 +69,7 @@ country_event = {
 					has_country_flag = gray_reforming
 					has_country_flag = gray_diplomacy_engaged
 				}
+				exists = event_target:gray_governor
 			}
 			country_event = {
 				id = rg_grayleader.501
@@ -344,7 +345,7 @@ country_event = {
 	diplomatic = yes
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_governor
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -369,6 +370,7 @@ country_event = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
 		}
+		exists = event_target:gray_governor
 	}
 	immediate = {
 		set_country_flag = gray_diplomacy_engaged
@@ -377,7 +379,7 @@ country_event = {
 				any_owned_planet = {
 					exists = sector.leader
 					sector.leader = {
-						is_same_value = event_target:gray_official
+						is_same_value = event_target:gray_governor
 					}
 				}
 			}
@@ -385,7 +387,7 @@ country_event = {
 				limit = {
 					exists = sector.leader
 					sector.leader = {
-						is_same_value = event_target:gray_official
+						is_same_value = event_target:gray_governor
 					}
 				}
 				save_event_target_as = gray_governor_planet
@@ -409,10 +411,7 @@ country_event = {
 		response_text = graygoo.501.b.response
 		allow = {
 			hidden_trigger = {
-				OR = {
+				exists = event_target:gray_governor
-					has_country_flag = gray_official_active
-					has_country_flag = gray_governor_active #旧版flag
-				}
 			}			# To prevent exploit
 		}
 		hidden_effect = {
@@ -428,10 +427,7 @@ country_event = {
 		response_text = graygoo.501.c.response
 		allow = {
 			hidden_trigger = {
-				OR = {
+				exists = event_target:gray_governor
-					has_country_flag = gray_official_active
-					has_country_flag = gray_governor_active #旧版flag
-				}
 			}
 		}
 		hidden_effect = {
@@ -447,10 +443,7 @@ country_event = {
 		response_text = rg_const.501.response
 		allow = {
 			hidden_trigger = {
-				OR = {
+				exists = event_target:gray_governor
-					has_country_flag = gray_official_active
-					has_country_flag = gray_governor_active #旧版flag
-				}
 			}
 		}
 		hidden_effect = {
@@ -496,7 +489,7 @@ country_event = {
 	diplomatic = yes
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -820,7 +813,7 @@ country_event = {
 	diplomatic = yes
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_general
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -1198,7 +1191,7 @@ country_event = {
 	diplomatic = yes
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_leader_scientist
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -1392,7 +1385,7 @@ country_event = {
 	desc = "rg_event.4.a.desc"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -1541,7 +1534,7 @@ country_event = {
 	desc = "rg_event.5.c.desc"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -1595,7 +1588,7 @@ country_event = {
 	desc = "rg_event.6.b.desc"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:gray_official
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes

events/RG_origin_event.txt

@@ -41,7 +41,30 @@ country_event = {
 				}
 			}
 			set_country_flag = rg_scion_needs_fe
-			rg_lcluster_spawn_effect_scion = yes
+			if = {
+				limit ={
+					any_playable_country = {
+						AND = {
+							has_origin = origin_rg_gray
+							# NOT = { has_global_flag = rg_origin_l_cluster }
+						}
+					}
+				}
+				random_system = {
+					limit = { has_owner = no }
+					spawn_system = { initializer = "rg_fallen_machine_1" }
+				}
+				add_extra_hyperlane_to_spawned_system_effect = yes
+			}
+			else = {
+				rg_lcluster_spawn_effect_scion = yes
+				every_system = {
+					limit = {
+						has_star_flag = lcluster
+					}
+					rg_create_fe_citadel = yes
+				}
+			}
 			event_target:rg_scion_fe = {
 				set_policy = {
 					policy = artificial_intelligence_policy
@@ -85,6 +108,7 @@ country_event = {
 			}
 			capital_scope = {
 				solar_system = {
+					set_star_flag = lgate
 					spawn_megastructure = {
 						type = lgate_base
 						orbit_angle = 225
@@ -92,12 +116,6 @@ country_event = {
 					}
 				}
 			}
-			every_system = {
-				limit = {
-					has_star_flag = lcluster
-				}
-				rg_create_fe_citadel = yes
-			}
 			# add_extra_hyperlane_to_spawned_system_effect = yes
 		}
 	}

events/RG_wsg_graygoo_event.txt

@@ -249,7 +249,7 @@ country_event = {
 			has_country_flag = gray_diplomacy_engaged
 			has_country_flag = ban_commu_with_gray
 		}
-		exists = event_target:gray_official
+		exists = event_target:gray_governor
 	}
 	immediate = {
 		set_country_flag = gray_diplomacy_engaged
@@ -258,7 +258,7 @@ country_event = {
 				any_owned_planet = {
 					exists = sector.leader
 					sector.leader = {
-						is_same_value = event_target:gray_official
+						is_same_value = event_target:gray_governor
 					}
 				}
 			}
@@ -266,7 +266,7 @@ country_event = {
 				limit = {
 					exists = sector.leader
 					sector.leader = {
-						is_same_value = event_target:gray_official
+						is_same_value = event_target:gray_governor
 					}
 				}
 				save_event_target_as = gray_governor_planet
@@ -290,10 +290,7 @@ country_event = {
 		response_text = graygoo.501.b.response
 		allow = {
 			hidden_trigger = {
-				OR = {
+				exists = event_target:gray_governor
-					has_country_flag = gray_official_active
-					has_country_flag = gray_governor_active #旧版flag
-				}
 			}
 			custom_tooltip = {
 				fail_text = gray_become_ruler
@@ -315,10 +312,7 @@ country_event = {
 		response_text = rg_const.501.response
 		allow = {
 			hidden_trigger = {
-				OR = {
+				exists = event_target:gray_governor
-					has_country_flag = gray_official_active
-					has_country_flag = gray_governor_active #旧版flag
-				}
 			}
 			custom_tooltip = {
 				fail_text = gray_become_ruler
@@ -339,10 +333,7 @@ country_event = {
 		response_text = graygoo.501.c.response
 		allow = {
 			hidden_trigger = {
-				OR = {
+				exists = event_target:gray_governor
-					has_country_flag = gray_official_active
-					has_country_flag = gray_governor_active #旧版flag
-				}
 			}
 			custom_tooltip = {
 				fail_text = gray_become_ruler