空间站核心

revert 暂存

common/agreement_presets/RG_agreement_presets.txt

@@ -0,0 +1,37 @@
+##############
+# SCION
+##############
+
+preset_rg_scion = {
+	icon = "GFX_diplomacy_status_is_scion"
+	term_data = {
+		discrete_terms = {
+			{ key = specialist_type				value = specialist_none }
+			{ key = subject_integration			value = subject_can_not_be_integrated }
+			{ key = subject_diplomacy			value = subject_can_do_diplomacy }
+			{ key = subject_expand				value = subject_can_expand }
+			{ key = joins_overlord_wars			value = joins_overlord_wars_all }
+			{ key = joins_subject_wars			value = joins_subject_wars_all }
+			{ key = subject_holdings_limit		value = subject_holdings_limit_0 }
+			{ key = subject_sensors				value = subject_does_not_get_sensors }
+		}
+		resource_terms = {
+			{ key = resource_subsidies_basic	value = -0.5 }
+			{ key = resource_subsidies_advanced		value = -0.5 }
+			{ key = resource_subsidies_strategic	value = -0.5 }
+			# { key = resource_subsidies_research value = -0.35 }
+		}
+	}
+	potential = {
+		# any_agreement = {
+		# 	agreement_preset = preset_rg_scion
+		# }
+		from = {
+			OR = {
+				is_country_type = fallen_empire
+				is_country_type = awakened_fallen_empire
+				has_country_flag = rg_scion_master
+			}
+		}
+	}
+}

common/ascension_perks/rg_ascension_perks.txt

@@ -18,8 +18,10 @@ rg_ap_nantiematter = {
 		OR = {
 			has_country_flag = origin_rg_gray
 			has_country_flag = gray_owner
-			has_event_chain = l_cluster_chain
-			has_technology = tech_lgate_activation
+			AND = {
+				has_event_chain = l_cluster_chain
+				has_technology = tech_lgate_activation
+			}
 		}
 		is_ai = no
 	}

common/component_templates/RG_interdictor_parts.txt

@@ -175,37 +175,6 @@ utility_component_template = {
 	}
 }
 
-utility_component_template = {
-	key = "RG_Mothership_ZERO_POINT_REACTOR"
-	size = small
-	icon = "GFX_ship_part_reactor_5"
-	icon_frame = 1
-	power = 50000
-	resources = {
-		category = ship_components
-		cost = {
-			alloys = 224
-		}
-		upkeep = {
-			energy = 2.29
-			alloys = 0.229
-		}
-	}
-	prerequisites = {
-		"tech_zero_point_power"
-	}
-	component_set = "power_core"
-	size_restriction = {
-		RG_graygoo_mothership
-		RG_gray_juggernaut
-		RG_graygoo_capitalship
-	}
-	upgrades_to = "RG_Mothership_DARK_MATTER_REACTOR"
-	ai_weight = {
-		weight = 5
-	}
-}
-
 utility_component_template = {
 	key = "RG_Interdictor_DARK_MATTER_REACTOR"
 	size = small
@@ -245,12 +214,168 @@ utility_component_template = {
 	}
 }
 
+utility_component_template = {
+	key = "RG_Mothership_FISSION_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_1"
+	icon_frame = 1
+	power = 7700
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 44.8
+		}
+		upkeep = {
+			energy = 0.458
+			alloys = 0.045
+		}
+	}
+
+	prerequisites = { "tech_fission_power" }
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_FUSION_REACTOR"
+
+	ai_weight = {
+		weight = 1
+	}
+}
+
+utility_component_template = {
+	key = "RG_Mothership_FUSION_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_2"
+	icon_frame = 1
+	power = 15400
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 89.6
+		}
+		upkeep = {
+			energy = 0.92
+			alloys = 0.09
+		}
+	}
+
+	prerequisites = { "tech_fusion_power" }
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_COLD_FUSION_REACTOR"
+
+	ai_weight = {
+		weight = 2
+	}
+}
+
+utility_component_template = {
+	key = "RG_Mothership_COLD_FUSION_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_3"
+	icon_frame = 1
+	power = 23100
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 134
+		}
+		upkeep = {
+			energy = 1.37
+			alloys = 0.137
+		}
+	}
+
+	prerequisites = { "tech_cold_fusion_power" }
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_ANTIMATTER_REACTOR"
+
+	ai_weight = {
+		weight = 3
+	}
+}
+
+utility_component_template = {
+	key = "RG_Mothership_ANTIMATTER_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_4"
+	icon_frame = 1
+	power = 30800
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 179
+		}
+		upkeep = {
+			energy = 1.83
+			alloys = 0.183
+		}
+	}
+
+	prerequisites = { "tech_antimatter_power" }
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_ZERO_POINT_REACTOR"
+
+	ai_weight = {
+		weight = 4
+	}
+}
+
+
+utility_component_template = {
+	key = "RG_Mothership_ZERO_POINT_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_5"
+	icon_frame = 1
+	power = 38500
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 224
+		}
+		upkeep = {
+			energy = 2.29
+			alloys = 0.229
+		}
+	}
+	prerequisites = {
+		"tech_zero_point_power"
+	}
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_DARK_MATTER_REACTOR"
+	ai_weight = {
+		weight = 5
+	}
+}
+
 utility_component_template = {
 	key = "RG_Mothership_DARK_MATTER_REACTOR"
 	size = small
 	icon = "GFX_ship_part_dark_matter_power_core"
 	icon_frame = 1
-	power = 60000
+	power = 
 	resources = {
 		category = ship_components
 		cost = {

common/component_templates/RG_ship_parts.txt

@@ -12,8 +12,6 @@ utility_component_template = {
 		ship_armor_regen_add_perc = 0.2
 		ship_hull_add = 1960
 		ship_hull_regen_add_perc = 0.2
-		ship_shield_add = 980
-		ship_shield_regen_add_perc = 0.1
 	}
 	size_restriction = {
 		RG_graygoo_destroyer
@@ -23,6 +21,11 @@ utility_component_template = {
 		RG_graygoo_mothership
 		RG_gray_juggernaut
 		RG_graygoo_capitalship
+		RG_armed_science_ship
+		RG_armed_constructor_ship
+		RG_armed_transport_ship
+		RG_armed_colony_ship
+		RG_graygoo_icebreaker_interdictor
 	}
 	prerequisites = {
 		"tech_gray_matter_remix_2"
@@ -56,12 +59,10 @@ utility_component_template = {
 	power = 0
 	power = -180
 	modifier = {
-		ship_armor_add = 13840
+		ship_armor_add = 7680
 		ship_armor_regen_add_perc = 0.2
-		ship_hull_add = 11960
+		ship_hull_add = 3920
 		ship_hull_regen_add_perc = 0.2
-		ship_shield_add = 4560
-		ship_shield_regen_add_perc = 0.1
 	}
 	size_restriction = {
 		RG_graygoo_capitalship
@@ -450,7 +451,6 @@ weapon_component_template = {
 	prerequisites = {
 		"tech_gray_juggernaut_8"
 	}
-	hidden = yes
 	ship_limit = 1
 	ai_weight = {
 		weight = 0
@@ -903,13 +903,6 @@ strike_craft_component_template = {
 			alloys = 0.2
 		}
 	}
-	size_restriction = {
-		RG_graygoo_destroyer
-		RG_graygoo_interdictor
-		RG_graygoo_mothership
-		RG_gray_juggernaut
-		RG_graygoo_capitalship
-	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
@@ -970,13 +963,6 @@ strike_craft_component_template = {
 			alloys = 0.2
 		}
 	}
-	size_restriction = {
-		RG_graygoo_destroyer
-		RG_graygoo_interdictor
-		RG_graygoo_mothership
-		RG_gray_juggernaut
-		RG_graygoo_capitalship
-	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
@@ -1040,13 +1026,6 @@ strike_craft_component_template = {
 			alloys = 0.2
 		}
 	}
-	size_restriction = {
-		RG_graygoo_destroyer
-		RG_graygoo_interdictor
-		RG_graygoo_mothership
-		RG_gray_juggernaut
-		RG_graygoo_capitalship
-	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
@@ -1111,13 +1090,6 @@ strike_craft_component_template = {
 			alloys = 0.2
 		}
 	}
-	size_restriction = {
-		RG_graygoo_destroyer
-		RG_graygoo_interdictor
-		RG_graygoo_mothership
-		RG_gray_juggernaut
-		RG_graygoo_capitalship
-	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
@@ -1182,6 +1154,10 @@ utility_component_template = {
 		RG_graygoo_icebreaker_interdictor
 		RG_gray_juggernaut
 		RG_graygoo_capitalship
+		RG_armed_science_ship
+		RG_armed_constructor_ship
+		RG_armed_transport_ship
+		RG_armed_colony_ship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -2222,6 +2198,7 @@ utility_component_template = {
 		category = ship_components
 		cost = {
 			alloys = 300
+			nanties = 10
 		}
 	}
 	prerequisites = { "tech_gray_nano_boost_3" }
@@ -2253,6 +2230,7 @@ utility_component_template = {
 		category = ship_components
 		cost = {
 			alloys = 100
+			nanties = 5
 		}
 	}
 	sensor_range = 15
@@ -2282,6 +2260,7 @@ utility_component_template = {
 		category = ship_components
 		cost = {
 			alloys = 200
+			nanties = 10
 		}
 	}
 	prerequisites = { "tech_gray_nano_boost_3" }
@@ -2321,6 +2300,13 @@ utility_component_template = {
 	tags = {
 		weapon_type_rg_reactor
 	}
+	size_restriction = {
+		RG_graygoo_destroyer
+		RG_armed_science_ship
+		RG_armed_constructor_ship
+		RG_armed_transport_ship
+		RG_armed_colony_ship
+	}
 	component_set = "power_core"
 	ai_weight = {
 		weight = 0
@@ -2353,7 +2339,6 @@ utility_component_template = {
 	size_restriction = {
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
-		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -2366,7 +2351,7 @@ utility_component_template = {
 	size = small
 	icon = "GFX_ship_part_gray_reactor"
 	icon_frame = 1
-	power = 280000
+	power = 92400
 	resources = {
 		category = ship_components
 		cost = {
@@ -2387,6 +2372,7 @@ utility_component_template = {
 	size_restriction = {
 		RG_gray_juggernaut
 		RG_graygoo_capitalship
+		RG_graygoo_mothership
 	}
 	ai_weight = {
 		weight = 0
@@ -2404,6 +2390,7 @@ utility_component_template = {
 		category = ship_components
 		cost = {
 			alloys = 200
+			nanties = 10
 		}
 	}
 	modifier = {

common/fallen_empires/RG_fallen_empire.txt

@@ -0,0 +1,109 @@
+# Machine
+# rg_fallen_gray_empire = {
+# 	graphical_culture = "fallen_machine_empire_01"
+# 	initializer = "rg_fallen_machine"
+# 
+# 	weight_modifier = {
+# 		base = 1
+# 		modifier = {
+# 			factor = 100000
+# 			has_origin = rg_origin_scion
+# 		}
+# 	}
+# 
+# 	possible = {
+# 		host_has_dlc = "Synthetic Dawn Story Pack"
+# 	}
+# 
+# 	create_country_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
+# 			}
+# 		}
+# 		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 = {
+# 				save_global_event_target_as = rg_fe_country
+# 				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
+# 				}
+# 			}
+# 		}
+# 	}
+# }

common/global_ship_designs/RG_fallen_empire_ship_designs.txt

@@ -0,0 +1,607 @@
+#############################
+### Fallen Machine Empire ###
+#############################
+
+# Planet Destroyer
+ship_design = {
+	name = "NAME_Gray_Omega"
+	ship_size = colossus
+	section = {
+		template = "SHIP_COLOSSUS_SECTION"
+		slot = "ship"
+
+		component = {
+			slot = "PLANET_KILLER_GUN_01"
+			template = "RG_PLANET_KILLER"
+		}
+		component = {
+			slot = "LARGE_UTILITY_1"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_2"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_3"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_4"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_5"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_6"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+	}
+	required_component="SENSOR_4"
+	required_component="JUMP_DRIVE_1"
+	required_component="COLOSSUS_DARK_MATTER_REACTOR"
+	required_component="COLOSSUS_SHIP_THRUSTER_5"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+# Massive Ship
+ship_design = {
+	name = "NAME_Gray_Alpha"
+	ship_size = massive_ship_fallen_empire
+	section = {
+		template = "fallen_empire_massive_warship_key"
+		slot = "mid"
+
+		component = {
+			slot = "TITANIC_01"
+			template = "GRAY_BEAM_STATIC_EX"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_01"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_02"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_03"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_04"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		component = {
+			slot = "LARGE_GUN_01"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_02"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_03"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_04"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_05"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_06"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_07"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_08"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_01"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_02"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_03"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_04"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_UTILITY_1"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_2"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_3"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_4"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_5"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_6"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_7"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_8"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_9"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_10"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_11"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_12"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_13"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_14"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_15"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_16"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_17"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_18"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_19"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_20"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "AUX_UTILITY_1"
+			template = "SHIELD_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_2"
+			template = "SHIELD_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_3"
+			template = "SHIELD_BOOSTER"
+		}
+	}
+	required_component="SENSOR_4"
+	required_component="JUMP_DRIVE_1"
+	required_component="COMBAT_COMPUTER_ARTILLERY_SAPIENT"
+	required_component="TITAN_DARK_MATTER_REACTOR"
+	required_component="TITAN_SHIP_THRUSTER_5"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+# Large Ship
+ship_design = {
+	name = "NAME_Gray_Beta"
+	ship_size = large_ship_fallen_empire
+	section = {
+		template = "fallen_empire_large_warship_key"
+		slot = "mid"
+
+		component = {
+			slot = "STRIKE_CRAFT_01"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_02"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		component = {
+			slot = "EXTRA_LARGE_01"
+			template = "GRAY_BEAM_STATIC_X"
+		}
+		component = {
+			slot = "EXTRA_LARGE_02"
+			template = "GRAY_BEAM_STATIC_X"
+		}
+		component = {
+			slot = "LARGE_GUN_01"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_02"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_01"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_02"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_03"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_04"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_UTILITY_1"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_2"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_3"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_4"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_5"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_6"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_7"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_8"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "AUX_UTILITY_1"
+			template = "SHIELD_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_2"
+			template = "SHIELD_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_3"
+			template = "SHIELD_BOOSTER"
+		}
+	}
+	required_component="SENSOR_4"
+	required_component="JUMP_DRIVE_1"
+	required_component="COMBAT_COMPUTER_LINE_SAPIENT"
+	required_component="BATTLESHIP_DARK_MATTER_REACTOR"
+	required_component="BATTLESHIP_SHIP_THRUSTER_5"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+# Small Ship
+ship_design = {
+	name = "NAME_Gray_Gamma"
+	ship_size = small_ship_fallen_empire
+	section = {
+		template = "fallen_empire_warship_small_key"
+		slot = "mid"
+
+		component = {
+			slot = "LARGE_GUN_01"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_02"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "SMALL_GUN_01"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "SMALL_GUN_02"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "SMALL_GUN_03"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "SMALL_GUN_04"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "PD_01"
+			template = "RG_FLAK_BATTERY"
+		}
+		component = {
+			slot = "PD_02"
+			template = "RG_FLAK_BATTERY"
+		}
+		component = {
+			slot = "PD_03"
+			template = "RG_FLAK_BATTERY"
+		}
+		component = {
+			slot = "PD_04"
+			template = "RG_FLAK_BATTERY"
+		}
+		component = {
+			slot = "MEDIUM_UTILITY_1"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "MEDIUM_UTILITY_2"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "MEDIUM_UTILITY_3"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "MEDIUM_UTILITY_4"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "MEDIUM_UTILITY_5"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "MEDIUM_UTILITY_6"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "AUX_UTILITY_1"
+			template = "SHIELD_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_2"
+			template = "SHIELD_BOOSTER"
+		}
+	}
+	required_component="SENSOR_4"
+	required_component="JUMP_DRIVE_1"
+	required_component="COMBAT_COMPUTER_PICKET_SAPIENT"
+	required_component="DESTROYER_DARK_MATTER_REACTOR"
+	required_component="DESTROYER_SHIP_THRUSTER_5"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+# Defense Platform
+ship_design = {
+	name = "NAME_Gray_Sigma"
+	ship_size = military_station_small_fallen_empire
+	section = {
+		template = "fallen_empire_station_small_key"
+		slot = "mid"
+
+		component = {
+			slot = "LARGE_GUN_01"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_02"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_01"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_02"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_03"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_04"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_05"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "PD_01"
+			template = "RG_FLAK_BATTERY"
+		}
+		component = {
+			slot = "PD_02"
+			template = "RG_FLAK_BATTERY"
+		}
+		component = {
+			slot = "LARGE_UTILITY_1"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_2"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_3"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_4"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_5"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_6"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "AUX_UTILITY_1"
+			template = "SHIELD_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_2"
+			template = "SHIELD_BOOSTER"
+		}
+	}
+	required_component="SENSOR_4"
+	required_component="COMBAT_COMPUTER_PLATFORM_SAPIENT"
+	required_component="PLATFORM_DARK_MATTER_REACTOR"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+# Construction Ship
+ship_design = {
+	name = "NAME_Gray_Theta"
+	ship_size = constructor
+	section = {
+		template = "DEFAULT_CONSTRUCTION_SECTION"
+		slot = "mid"
+
+		component = {
+			slot = "SMALL_UTILITY_1"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "SMALL_UTILITY_2"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+	}
+	required_component="JUMP_DRIVE_1"
+	required_component="SHIP_THRUSTER_5"
+	required_component="SENSOR_4"
+	required_component="CORVETTE_DARK_MATTER_REACTOR"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+
+# Colony Ship
+ship_design = {
+	name = "NAME_Gray_Tau"
+	ship_size = colonizer
+	section = {
+		template = "DEFAULT_COLONIZATION_SECTION"
+		slot = "mid"
+
+		component = {
+			slot = "SMALL_UTILITY_1"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "SMALL_UTILITY_2"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "SMALL_UTILITY_3"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+	}
+	required_component="JUMP_DRIVE_1"
+	required_component="SHIP_THRUSTER_5"
+	required_component="SENSOR_4"
+	required_component="CORVETTE_DARK_MATTER_REACTOR"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+# Awakened Fallen Empire Starbase
+ship_design = {
+	name = "NAME_Gray_FE_Starbase"
+	ship_size = starbase_fe_outpost
+	section = {
+		template = "station_generic_01_key"
+		slot = "mid"
+
+		component = {
+			slot = "SMALL_GUN_01"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "SMALL_GUN_02"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "SMALL_GUN_03"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_01"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_02"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_01"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+	}
+	required_component="SENSOR_2"
+}

common/global_ship_designs/RG_ship_designs_starbase.txt

@@ -1,6 +1,6 @@
 # 星环基地 1
 ship_design = {
-	name = "RG_RG_ORBITAL_RING_TIER_1_STARBASE"
+	name = "RG_ORBITAL_RING_TIER_1_STARBASE"
 	ship_size = RG_orbital_ring_tier_1
 	section = {
 		template = "RG_ORBITAL_RING_TIER_1_STARBASE_SECTION"

common/governments/civics/!_RG_origins.txt

@@ -8,6 +8,7 @@ origin_rg_gray = {
 	non_colonizable_planet_class_neighbor = yes
 	description = "origin_tooltip_rg_gray_effects"
 	advanced_start = yes
+	max_once_global = yes
 	random_weight = {
 		base = 0
 	}
@@ -15,3 +16,35 @@ origin_rg_gray = {
 		host_has_dlc = "Distant Stars Story Pack"
 	}
 }
+
+rg_origin_scion = {
+	is_origin = yes
+	icon = "gfx/interface/icons/origins/origins_scion_1.dds"
+	picture = GFX_origin_rg_scion
+	advanced_start = yes
+	max_once_global = yes
+
+	playable = {
+		host_has_dlc = Federations
+	}
+
+	# possible = {
+	# 	ethics = {
+	# 		NOR = {
+	# 			value = ethic_gestalt_consciousness
+	# 			#value = ethic_xenophobe
+	# 			value = ethic_fanatic_xenophobe
+	# 		}
+	# 	}
+	# 	civics = {
+	# 		NOT = { value = civic_pompous_purists }
+	# 	}
+	# }
+
+	description = "origin_tooltip_rg_scion_effects"
+	flags = { custom_start_screen }
+
+	random_weight = {
+		base = 0
+	}
+}

common/leader_classes/RG_leader_classes.txt

@@ -0,0 +1,103 @@
+# example_class = {
+#	name = <name_key>
+# 	name_plural = <name_plural_key>
+# 	description = <description_key>
+#
+#	#all the following default to no
+#	can_lead_army = yes/no			# Applies skill_<class_id>_army scaled by level to armies
+#	can_lead_navy = yes/no			# Applies skill_<class_id>_navy scaled by level to fleets
+#	can_govern_planet = yes/no		# Applies skill_<class_id>_planet_governor scaled by level to governed planet
+									# Applies skill_<class_id>_sector_governor scaled by level to governed sector, if governing the sector capital
+									# Applies skill_<class_id>_background_planet_governor scaled by level togoverned planet, if governing their homeworld
+#	can_be_envoy = yes/no
+# 	can_research_tech = yes/no
+# 	can_research_special_projects = yes/no
+# 	can_crew_science_ship = yes/no
+# 	can_research_anomalies = yes/no
+# 	can_research_archaeology_site = yes/no
+# 	can_survey = yes/no
+# 	can_boost_cloaking_detection = yes/no
+# 	can_explore_rifts = yes/no
+# 	can_conduct_active_reconnaissance = yes/no
+# 	can_govern_planet = yes/no
+# 	can_have_traits = yes/no	# defaults to yes, if no this class will not gain LEADER_ASSIGNED_MONTHLY_EXPERIENCE when assigned
+#	can_rule_empire = yes/no	# defaults to yes
+#	recruitable = yes/no		# defaults to yes
+# 	max_trait_points = <num>
+#	leader_capacity = <num>		# maximum number of leader of this type before you get maluses, 0 means no cap
+#	replaces_old_class = "old_class"	# used for backwards compatibility. When "old_class" appears in an old save, it is converted to this class at loading
+#										# can appear multiple times
+#
+# 	resources = { #upkeep
+# 		category = leader_scientists/etc
+# 		cost = {
+# 			...
+# 		}
+# 	}
+#
+# 	ai_weight = {			# used to determine which type of leader the AI prefers (frex: commanders for warlike leaders, and governor for pacifists)
+# 		base = <num>
+#		modifier = {}
+# 	}
+#
+#	ai_location_weight = {	# used to evaluate a specific leader for an assignment to a specific location (right now only used for fleet),
+#							# scope is the leader, from is the leader location (can be a planet, a fleet, an army etc)
+#							# if the score is 0 or less, the leader will not be assigned to that location
+#		base = <num>
+#		modifier = {}
+#	}
+#
+# 	minimum_ai_target = <num>
+#
+# 	leader_background_job_weight = {
+# 		job_name = <weight>
+# 		# etc
+# 	}
+# }
+#
+# icon = 1 # 1-based index in the icon file. might be replaced by an icon name later
+#
+# paragon_background_selector = <name of an asset_selector>, used to display a background behind paragon portraits
+#
+#
+# How the AI assigns leaders now:
+#
+# Step 1: Sort all possible location using the NDefines::NAI::LOCATION_WEIGHT_* values (all of them are multipliers except the galactic community which is a flat value)
+# Step 2: Sort all available leaders by skill
+# Step 3: for each leader in order, calculate a location weight based on the ai_location_weight of their class
+# Step 4: Assign the highest leader/location pair based on the weight
+# Step 5: if no leader was assigned, see if hiring a leader is possible repeating the same steps
+
+# rg_nanite_leader = {
+# 	name = rg_nanite_leader
+# 	name_plural = rg_nanite_leader_plural
+# 	description = rg_nanite_leader_description
+# 
+# 	can_lead_army = yes
+# 	can_lead_navy = yes
+# 	can_govern_planet = yes
+# 	can_be_envoy = yes
+# 	can_research_tech = yes
+# 	can_research_special_projects = yes
+# 	can_crew_science_ship = yes
+# 	can_research_anomalies = yes
+# 	can_research_archaeology_site = yes
+# 	can_survey = yes
+# 	can_boost_cloaking_detection = yes
+# 	can_explore_rifts = yes
+# 	can_conduct_active_reconnaissance = yes
+# 	can_govern_planet = yes
+# 	can_have_traits = yes
+# 	can_rule_empire = yes
+# 	recruitable = no
+# 	max_trait_points = 3
+# 	leader_capacity = 3
+# 
+# 	ai_weight = {
+# 		modifier = {
+# 			factor = 0
+# 		}
+# 	}
+# 	icon = 4
+# 	paragon_background_selector = "paragon_background_selector"
+# }

common/on_actions/RG_on_actions.txt

@@ -38,6 +38,7 @@ on_game_start_country = {
 	events = {
 		# rg_cluster.8
 		rg_event.1
+		rg_origin.1
 		rg_event.19
 	}
 }
@@ -51,19 +52,15 @@ on_monthly_pulse_country = {
 		# rg_event.22 #小灰复活检测
 		# rg_event.23 #月检移除L星门认知防止收容失效
 		# rg_skill.9
+		rg_planet.5025	# Virtual Machine pop creation
+		rg_planet.5030	# Virtual Machine pop destruction
 	}
 }
 
 on_yearly_pulse_country = {
 	events = {
 		rg_event.17
-		rg_event.18
 		rg_event.20
-	}
-}
-
-on_yearly_pulse = {
-	events = {
 		rg_story.20
 	}
 }
@@ -175,3 +172,83 @@ on_space_battle_lost = {
 		rg_skill.15
 	}
 }
+
+# A planet has been colonized.
+# Scope = Planet
+on_colonized = {
+	events = {
+		rg_planet.2026	# Virtual Machine pop creation
+		rg_planet.2031	# Virtual Machine pop destruction
+	}
+}
+
+#A building construction has been completed.
+# This = Planet
+on_building_complete = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A building construction has been completed, which is an upgrade of previous building.
+# This = Planet
+on_building_upgraded = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A building construction has demolished.
+# This = Planet
+on_building_demolished = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+# A building repair has finished
+# This = Planet
+on_building_repaired = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+#A district construction has been completed.
+# This = Planet
+on_district_complete = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A building construction has finished, replacing another building.
+# This = Planet
+on_building_replaced = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A building construction has been downgraded and replaced.
+# This = Planet
+on_building_downgraded = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A district construction has demolished.
+# This = Planet
+on_district_demolished = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}

common/planet_classes/RG_gray_planet_classes.txt

@@ -0,0 +1,41 @@
+pc_rg_grayhabitat = {
+	habitat = yes
+	entity = "grey_tempesttw_orbital_habitat_entity"
+	entity_scale = @planet_standard_scale
+	icon = GFX_planet_type_habitat
+	enable_tilt = no
+	fixed_entity_scale = yes
+	place_entity_on_planet_plane = no
+	entity_face_object = no #disable rotation towards sun or planet we orbit around
+	atmosphere_color		= hsv { 0.0 0.0 1.0 }
+	atmosphere_intensity	= 1.0
+	atmosphere_width		= 0.5
+	show_city = no
+	city_color_lut = "gfx/portraits/misc/colorcorrection_continental.dds"
+	extra_orbit_size = 0
+	extra_planet_count = 0
+	chance_of_ring = 0.0
+	planet_size = 30
+	moon_size = 1
+	colonizable = yes
+	district_set = machine_world
+#	ideal = yes
+	starting_planet = no
+	orbit_lines = no
+	has_colonization_influence_cost = no			# applies when within own borders
+
+	is_artificial_planet = yes
+	default_planet_selection = yes
+
+	modifier = {
+		planet_colony_development_speed_mult = 2.0 # Habitats should be fast to colonize
+		pop_environment_tolerance = 1
+		planet_structures_cost_mult = -2
+		planet_buildings_cost_mult = -2
+		planet_building_build_speed_mult = 10
+		planet_crime_add = -1000
+		pop_resettlement_cost_mult = 10
+	}
+
+	carry_cap_per_free_district = @carry_cap_low
+}

common/script_values/rg_script_values.txt

@@ -0,0 +1,14 @@
+rg_count_maid = {
+	base = 0
+	complex_trigger_modifier = {
+		trigger = count_traits
+		trigger_scope = pop
+		parameters = {
+			limit = {
+				has_trait = rg_machine_maid_trait
+			}
+		}
+		mode = add
+	}
+	# max = 20
+}

common/scripted_effects/RG_combat_skill_effects.txt

@@ -5,7 +5,7 @@ RG_leader_trait_tempest_incoming_random_kill_effect = {
 			any_ground_combat_$SIDE_A$ = {
 				exists = leader
 				leader = {
-					has_trait = RG_leader_trait_general_gray_skill
+					has_trait = RG_leader_trait_admiral_nanorebuild_gray
 				}
 			}
 		}
@@ -286,3 +286,14 @@ RG_leader_trait_admiral_nanorebuild_gray_counter_init_effect = {
 		value = 0
 	}
 }
+
+RG_leader_trait_general_tempest_incoming_counter_init_effect = {
+	set_variable = {
+		which = rg_general_skill_combat_daypassed_variable
+		value = 1
+	}
+	set_variable = {
+		which = rg_general_skill_combat_killed_variable
+		value = 0
+	}
+}

common/scripted_effects/RG_fallen_empire_effects.txt

@@ -0,0 +1,607 @@
+rg_create_fallen_empire_species_effect = {
+	create_species = {
+		name = 纳米构造体
+		class = RG_MACHINE
+		portrait = "rg_machine_maid"
+		traits = {
+			trait = trait_machine_unit
+			trait = trait_robot_domestic_protocols
+			trait = rg_machine_maid_trait
+			trait = trait_auto_mod_robotic
+			trait = trait_robot_streamlined_protocols
+			trait = trait_robot_luxurious
+			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"
+			set_graphical_culture = fallen_machine_empire_01
+
+			add_modifier = {
+				modifier = fe_ship_cost_modifier
+				days = -1
+			}
+
+			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 = {
+			set_owner = prev.owner
+			while = {
+				count = 4
+				rg_create_fallen_empire_large_ship = yes
+			}
+			while = {
+				count = 8
+				rg_create_fallen_empire_small_ship = yes
+			}
+			random_list = {
+				25 = {
+					set_location = {
+						target = prev
+						distance = 30
+						angle = random
+					}
+				}
+				25 = {
+					set_location = {
+						target = prev
+						distance = 45
+						angle = random
+					}
+				}
+				25 = {
+					set_location = {
+						target = prev
+						distance = 60
+						angle = random
+					}
+				}
+				25 = {
+					set_location = {
+						target = prev
+						distance = 75
+						angle = random
+					}
+				}
+			}
+		}
+	}
+}
+
+rg_create_fallen_empire_fleet = {
+	owner = {
+		create_leader = {
+			class = commander
+			species = owner_main_species
+			name = random
+			skill = 10
+			leader_age_min = 25
+			leader_age_max = 45
+		}
+	}
+	create_fleet = {
+		effect = {
+			set_owner = prev.owner
+			while = {
+				count = 8
+				rg_create_fallen_empire_large_ship = yes
+			}
+			while = {
+				count = 18
+				rg_create_fallen_empire_small_ship = yes
+			}
+			random_list = {
+				25 = {
+					set_location = {
+						target = prev
+						distance = 30
+						angle = random
+					}
+				}
+				25 = {
+					set_location = {
+						target = prev
+						distance = 45
+						angle = random
+					}
+				}
+				25 = {
+					set_location = {
+						target = prev
+						distance = 60
+						angle = random
+					}
+				}
+				25 = {
+					set_location = {
+						target = prev
+						distance = 75
+						angle = random
+					}
+				}
+			}
+		}
+	}
+	last_created_fleet = { assign_leader = last_created_leader }
+}
+
+rg_create_fallen_empire_starting_navy = {
+	rg_create_fallen_empire_fleet = yes
+	rg_create_fallen_empire_fleet = yes
+	random = {
+		chance = 33
+		rg_create_fallen_empire_fleet = yes
+	}
+	if = {
+		limit = {
+			host_has_dlc = "Apocalypse"
+		}
+		random = {
+			chance = 10
+			create_fleet = {
+				effect = {
+					set_owner = prev.owner
+					rg_create_fallen_empire_colossus = yes
+					set_location = {
+						target = prev
+						distance = 30
+						angle = random
+					}
+				}
+			}
+		}
+	}
+	random = {
+		chance = 25
+		create_fleet = {
+			effect = {
+				set_owner = prev.owner
+				rg_create_fallen_empire_titan = yes
+				set_location = {
+					target = prev
+					distance = 20
+					angle = random
+				}
+			}
+		}
+	}
+	create_fleet = {
+		effect = {
+			set_owner = prev.owner
+			rg_create_fallen_empire_construction_ship = yes
+			set_location = {
+				target = prev
+				distance = 60
+				angle = random
+			}
+		}
+	}
+	create_fleet = {
+		effect = {
+			set_owner = prev.owner
+			rg_create_fallen_empire_construction_ship = yes
+			set_location = {
+				target = prev
+				distance = 80
+				angle = random
+			}
+		}
+	}
+	create_fleet = {
+		effect = {
+			set_owner = prev.owner
+			rg_create_fallen_empire_construction_ship = yes
+			set_location = {
+				target = prev
+				distance = 100
+				angle = random
+			}
+		}
+	}
+}
+
+rg_create_fallen_empire_platform = {
+	if = {
+		limit = {
+			owner = { has_authority = auth_machine_intelligence }
+		}
+		create_ship = {
+			name = random
+			design = "NAME_Gray_Sigma"
+			graphical_culture = owner
+		}
+	}
+}
+
+rg_create_fallen_empire_colossus = {
+	if = {
+		limit = {
+			owner = { has_authority = auth_machine_intelligence }
+		}
+		create_ship = {
+			name = random
+			design = "NAME_Gray_Omega"
+			graphical_culture = owner
+		}
+	}
+}
+
+rg_create_fallen_empire_titan = {
+	if = {
+		limit = {
+			owner = { has_authority = auth_machine_intelligence }
+		}
+		create_ship = {
+			name = random
+			design = "NAME_Gray_Alpha"
+			graphical_culture = owner
+		}
+	}
+}
+
+rg_create_fallen_empire_large_ship = {
+	if = {
+		limit = {
+			owner = { has_authority = auth_machine_intelligence }
+		}
+		create_ship = {
+			name = random
+			design = "NAME_Gray_Beta"
+			graphical_culture = owner
+		}
+	}
+}
+
+rg_create_fallen_empire_small_ship = {
+	if = {
+		limit = {
+			owner = { has_authority = auth_machine_intelligence }
+		}
+		create_ship = {
+			name = random
+			design = "NAME_Gray_Gamma"
+			graphical_culture = owner
+		}
+	}
+}
+
+rg_create_fallen_empire_construction_ship = {
+	if = {
+		limit = {
+			owner = { has_authority = auth_machine_intelligence }
+		}
+		create_ship = {
+			name = random
+			design = "NAME_Gray_Theta"
+			graphical_culture = owner
+		}
+	}
+}
+
+rg_create_fe_citadel = {
+	create_starbase = {
+		size = "starbase_citadel"
+
+		module = "shipyard"
+		module = "anchorage"
+		module = "anchorage"
+		module = "hangar_bay"
+		module = "gun_battery"
+		module = "gun_battery"
+
+		building = "crew_quarters"
+		building = "command_center"
+		building = "target_uplink_computer"
+		building = "dark_matter_listening_post"
+
+		effect = {
+			set_owner = event_target:rg_scion_fe
+			while = {
+				count = 4
+				rg_create_fallen_empire_platform = yes
+			}
+		}
+	}
+}
+
+#scope = scion
+rg_create_scion_wormhole_link = {
+	capital_scope = {
+		solar_system = { save_event_target_as = home_system }
+	}
+	event_target:rg_scion_master = {
+		random_system_within_border = { save_event_target_as = fe_target_system }
+	}
+	event_target:home_system = {
+		event_target:fe_target_system = {
+			prev = { # done this way to ensure we don't spawn "orphan wormholes (wormholes that aren't linked to anything)
+				spawn_natural_wormhole = {
+					bypass_type = wormhole
+					random_pos = no
+					orbit_angle = 360
+				}
+			}
+			spawn_natural_wormhole = {
+				bypass_type = wormhole
+				random_pos = no
+				orbit_angle = 270
+			}
+			link_wormholes = prev
+		}
+	}
+	set_country_flag = encountered_first_wormhole
+	add_seen_bypass_type = wormhole
+}
+
+rg_lcluster_spawn_effect_scion = {
+	set_global_flag = rg_origin_scion_l_cluster
+	set_spawn_system_batch = begin
+	no_scope = {
+		# makes system positions originate from galactic core
+		spawn_system = {
+			min_distance >= 550
+			max_distance <= 560
+			min_orientation_angle = 44
+			max_orientation_angle = 46
+			initializer = rg_cluster_init_01
+			hyperlane = no
+		}
+		random_system = {
+			limit = {
+				has_star_flag = lcluster1
+			}
+			save_global_event_target_as = lcluster1
+			spawn_system = {
+				min_distance >= 29
+				max_distance <= 31
+				min_orientation_angle = 24
+				max_orientation_angle = 66
+				initializer = rg_cluster_init_02
+			}
+			spawn_system = {
+				min_distance >= 29
+				max_distance <= 31
+				min_orientation_angle = 114
+				max_orientation_angle = 156
+				initializer = rg_cluster_init_03
+			}
+			spawn_system = {
+				min_distance >= 30
+				max_distance <= 60
+				min_orientation_angle = 340
+				max_orientation_angle = 20
+				initializer = rg_cluster_init_01b
+			}
+		}
+		random_system = {
+			limit = {
+				has_star_flag = lcluster2
+			}
+			save_global_event_target_as = lcluster2
+			spawn_system = {
+				min_distance >= 30
+				max_distance <= 60
+				min_orientation_angle = 0
+				max_orientation_angle = 40
+				initializer = rg_cluster_init_02b
+			}
+		}
+		random_system = {
+			limit = {
+				has_star_flag = lcluster3
+			}
+			save_global_event_target_as = lcluster3
+			spawn_system = {
+				min_distance >= 20
+				max_distance <= 30
+				min_orientation_angle = 24
+				max_orientation_angle = 66
+				initializer = rg_fallen_machine
+			}
+			spawn_system = {
+				min_distance >= 10
+				max_distance <= 50
+				min_orientation_angle = 250
+				max_orientation_angle = 290
+				initializer = rg_cluster_init_03b
+			}
+		}
+		random_system = {
+			limit = {
+				has_star_flag = lcluster4
+			}
+			save_global_event_target_as = lcluster4
+			spawn_system = {
+				min_distance >= 5
+				max_distance <= 10
+				min_orientation_angle = 250
+				max_orientation_angle = 290
+				initializer = rg_cluster_init_05
+			}
+			spawn_system = {
+				min_distance >= 30
+				max_distance <= 60
+				min_orientation_angle = 20
+				max_orientation_angle = 160
+				initializer = rg_cluster_init_04b
+			}
+		}
+	}
+	random_system = {
+		limit = {
+			has_star_flag = lcluster5
+		}
+		save_global_event_target_as = lcluster5
+	}
+	random_system = {
+		limit = {
+			has_star_flag = lcluster1b
+		}
+		save_global_event_target_as = lcluster1b
+	}
+	random_system = {
+		limit = {
+			has_star_flag = lcluster2b
+		}
+		save_global_event_target_as = lcluster2b
+	}
+	random_system = {
+		limit = {
+			has_star_flag = lcluster3b
+		}
+		save_global_event_target_as = lcluster3b
+	}
+	random_system = {
+		limit = {
+			has_star_flag = lcluster4b
+		}
+		save_global_event_target_as = lcluster4b
+	}
+	# clear all hyperlanes to and within the cluster
+	every_system = {
+		limit = {
+			has_star_flag = lcluster
+		}
+		isolate_system = yes
+	}
+	# add hyperlanes
+	event_target:lcluster5 = {
+		add_hyperlane = {
+			from = event_target:lcluster5
+			to = event_target:lcluster4
+		}
+	}
+	event_target:lcluster4 = {
+		add_hyperlane = {
+			from = event_target:lcluster4
+			to = event_target:lcluster3
+		}
+		add_hyperlane = {
+			from = event_target:lcluster4
+			to = event_target:lcluster2
+		}
+		add_hyperlane = {
+			from = event_target:lcluster4
+			to = event_target:lcluster4b
+		}
+	}
+	event_target:lcluster3 = {
+		add_hyperlane = {
+			from = event_target:lcluster3
+			to = event_target:lcluster1
+		}
+		add_hyperlane = {
+			from = event_target:lcluster3
+			to = event_target:lcluster3b
+		}
+	}
+	event_target:lcluster2 = {
+		add_hyperlane = {
+			from = event_target:lcluster2
+			to = event_target:lcluster1
+		}
+		add_hyperlane = {
+			from = event_target:lcluster2
+			to = event_target:lcluster3
+		}
+		add_hyperlane = {
+			from = event_target:lcluster2
+			to = event_target:lcluster2b
+		}
+	}
+	event_target:lcluster1 = {
+		add_hyperlane = {
+			from = event_target:lcluster1
+			to = event_target:lcluster1b
+		}
+	}
+	event_target:lcluster1b = {
+		add_hyperlane = {
+			from = event_target:lcluster1b
+			to = event_target:lcluster2b
+		}
+	}
+	set_spawn_system_batch = end
+}

common/scripted_effects/RG_gray_goo_effects.txt

@@ -65,7 +65,10 @@ rg_global_gray_location_check = {
 	}
 	else_if = {
 		limit = {
-			has_country_flag = gray_governor_active
+			OR = {
+				has_country_flag = gray_official_active
+				has_country_flag = gray_governor_active #旧版flag
+			}
 		}
 		if = {
 			limit = {
@@ -123,6 +126,18 @@ rg_global_gray_location_check = {
 			}
 		}
 	}
+	else_if = {
+		limit = {
+			has_country_flag = rg_habitat_enabled
+		}
+		if = {
+			limit = {exists = event_target:rg_gray_habitat_target}
+			event_target:rg_gray_habitat_target = {
+				save_global_event_target_as = global_gray_location
+			}
+		}
+
+	}
 	else = {
 		capital_scope = {
 			save_global_event_target_as = global_gray_location
@@ -134,7 +149,10 @@ rg_global_gray_location_check = {
 rg_create_gray_governor = {
 	if = {
 		limit = {
-			has_country_flag = gray_governor_active
+			OR = {
+				has_country_flag = gray_official_active
+				has_country_flag = gray_governor_active #旧版flag
+			}
 		}
 	}
 	else = {
@@ -175,117 +193,7 @@ rg_create_gray_governor = {
 			}
 			remove_army = yes
 		}
-		#存储当前领袖等级
-		every_owned_leader = {
-			if = {
-				###等级检测
-				limit = {
-					has_leader_flag = rg_gray_leader
-					NOT = {
-						has_leader_flag = rg_gray_leader_temp
-					}
-				}
-				#导出等级到暂存
-				export_trigger_value_to_variable = {
-					trigger = has_skill
-					variable = rg_gray_level_temp
-				}
-				#导入变量
-				owner = {
-					set_variable = {
-						which = rg_gray_level
-						value = prev.rg_gray_level_temp
-					}
-				}
-				#清理暂存区
-				clear_variable = rg_gray_level_temp
-			}
-		}
-		#把所有种类的小灰领袖都送回娘家
-		every_owned_leader = {
-			limit = {
-				has_leader_flag = rg_gray_leader
-			}
-			set_owner = event_target:rg_gray_country
-			set_leader_flag = rg_gray_leader_temp
-			# kill_leader = { show_notification = no }
-		}
-		#把娘家的总督领袖接回来
-		if = {
-			limit = {
-				exists = event_target:gray_governor
-			}
-			event_target:gray_governor = {
-				set_owner = event_target:gray_owner
-				remove_leader_flag = rg_gray_leader_temp
-			}
-		}
-		#如果不存在总督备份，现场变一个
-		else = {
-			rg_gray_govener_init = yes
-		}
-		#设置总督已启用标识
-		set_country_flag = gray_governor_active
-		#更新灰风形态
-		remove_country_flag = gray_warship_active
-		remove_country_flag = rg_kac_grayfleet_active
-		remove_country_flag = gray_constship_active
-		remove_country_flag = gray_army_active
-		#等级导入，把存储的领袖等级赋予到领袖身上
-		random_owned_leader = {
-			limit = {
-				has_leader_flag = gray_governor
-			}
-			set_skill = owner.rg_gray_level
-		}
-	}
-}
 
-#创造灰风总督
-rg_create_gray_governor_habitat = {
-	if = {
-		limit = {
-			has_country_flag = gray_habitat_active
-		}
-	}
-	else = {
-		#延迟执行
-		optimize_memory
-		#删除战舰
-		every_owned_fleet = {
-			limit = {
-				has_fleet_flag = gray_fleet
-			}
-			delete_fleet = {
-				target = this
-				kill_leader = no
-				destroy_template = yes
-			}
-		}
-		#删除科学舰
-		every_owned_fleet = {
-			limit = {
-				has_fleet_flag = gray_constship
-			}
-			delete_fleet = {
-				target = this
-				kill_leader = no
-				destroy_template = yes
-			}
-		}
-		#删除陆军
-		every_owned_army = {
-			limit = {
-				army_type = gray_army
-			}
-			if = {
-				limit = {
-					exists = leader
-				}
-				unassign_leader = leader
-			}
-			remove_army = yes
-		}
 		#存储当前领袖等级
 		every_owned_leader = {
 			if = {
@@ -335,15 +243,15 @@ rg_create_gray_governor_habitat = {
 		else = {
 			rg_gray_govener_init = yes
 		}
-		rg_juggernaut_habitat_init = yes
 		#设置总督已启用标识
-		set_country_flag = gray_governor_active
-		set_country_flag = gray_habitat_active
+		set_country_flag = gray_official_active #新版flag
+		set_country_flag = gray_governor_active #旧版flag
 		#更新灰风形态
 		remove_country_flag = gray_warship_active
 		remove_country_flag = rg_kac_grayfleet_active
 		remove_country_flag = gray_constship_active
 		remove_country_flag = gray_army_active
+		remove_country_flag = gray_habitat_active
 		#等级导入，把存储的领袖等级赋予到领袖身上
 		random_owned_leader = {
 			limit = {
@@ -406,7 +314,7 @@ rg_create_gray_warship = {
 			}
 		}
 		else = {
-			rg_gray_admiral_init = yes
+			rg_gray_commander_init = yes
 		}
 		set_country_flag = gray_warship_active
 		if = {
@@ -455,9 +363,12 @@ rg_create_gray_warship = {
 				destroy_template = yes
 			}
 		}
+
 		remove_country_flag = gray_constship_active
-		remove_country_flag = gray_governor_active
+		remove_country_flag = gray_governor_active #旧版flag
+		remove_country_flag = gray_official_active
 		remove_country_flag = gray_army_active
+		remove_country_flag = gray_habitat_active
 		random_owned_leader = {
 			limit = {
 				has_leader_flag = gray_admiral
@@ -471,7 +382,7 @@ rg_create_gray_warship = {
 rg_create_gray_army = {
 	if = {
 		limit = {
-			has_leader_flag = gray_army_active
+			has_country_flag = gray_army_active
 		}
 	}
 	else = {
@@ -518,7 +429,7 @@ rg_create_gray_army = {
 			}
 		}
 		else = {
-			rg_gray_general_init = yes
+			rg_gray_commander_init = yes
 		}
 		create_ship_design = {
 			design = "NAME_RG_armed_transport_ship"
@@ -566,10 +477,13 @@ rg_create_gray_army = {
 				destroy_template = yes
 			}
 		}
+
 		remove_country_flag = gray_warship_active
 		remove_country_flag = rg_kac_grayfleet_active
-		remove_country_flag = gray_governor_active
+		remove_country_flag = gray_governor_active #旧版flag
+		remove_country_flag = gray_official_active
 		remove_country_flag = gray_constship_active
+		remove_country_flag = gray_habitat_active
 		remove_ship_design = last_created_design
 		random_owned_leader = {
 			limit = {
@@ -686,10 +600,13 @@ rg_create_gray_const = {
 			}
 			remove_army = yes
 		}
+
 		remove_country_flag = gray_army_active
 		remove_country_flag = gray_warship_active
 		remove_country_flag = rg_kac_grayfleet_active
-		remove_country_flag = gray_governor_active
+		remove_country_flag = gray_governor_active #旧版flag
+		remove_country_flag = gray_official_active
+		remove_country_flag = gray_habitat_active
 		random_owned_leader = {
 			limit = {
 				has_leader_flag = gray_scientist
@@ -698,3 +615,88 @@ rg_create_gray_const = {
 		}
 	}
 }
+
+
+rg_juggernaut_habitat_init = {
+	if = {
+		limit = {
+			has_country_flag = rg_habitat_enabled
+		}
+	}
+	else = {
+		optimize_memory
+		rg_global_gray_location_check = yes
+		set_country_flag = rg_habitat_enabled
+		event_target:global_gray_location = {
+			solar_system = {
+				spawn_planet = {
+					class = pc_rg_grayhabitat
+					location = event_target:global_gray_location
+					orbit_location = yes
+					orbit_angle = 225
+					orbit_distance = 360
+					orbit_angle_offset = 45
+					orbit_distance_offset = 9.899
+					size = 30
+					has_ring = no
+			
+					init_effect = {
+						set_planet_entity = {
+							entity = "grey_tempesttw_orbital_habitat_entity"
+						}
+						set_surveyed = {
+							surveyed = yes
+							surveyor = FROM
+						}
+						set_all_comms_surveyed = yes
+						clear_blockers = yes
+		
+						set_owner = root
+						set_controller = root
+						create_colony = {
+							owner = root
+							species = owner_main_species
+							ethos = owner
+						}
+						set_name = "NAME_rg_gray_habitat_base"
+						
+						if = {
+							OR = {
+								has_country_flag = gray_official_active
+								has_country_flag = gray_governor_active #旧版flag
+							}
+							assign_leader = event_target:gray_governor
+						}
+						
+						add_building = building_ancient_control_center
+						add_building = building_nourishment_center
+						add_building = building_ancient_palace
+						add_building = building_affluence_center
+						add_building = building_dimensional_fabricator
+			
+						while = {
+							count = 5
+							create_pop = {
+								species = owner_main_species
+							}
+						}
+			
+						set_planet_flag = megastructure
+						set_planet_flag = habitat
+						set_planet_flag = advanced_habitat
+						set_planet_flag = advanced_habitat_2
+						set_planet_flag = rg_gray_habitat
+						save_global_event_target_as = rg_gray_habitat_target
+					}
+				}
+			}
+		}
+	}
+}
+
+rg_clear_harbitat = {
+	remove_country_flag = rg_habitat_enabled
+	event_target:rg_gray_habitat_target = {
+		remove_planet = yes
+	}
+}

common/scripted_effects/RG_gray_leader_init_effects.txt

@@ -1,47 +1,14 @@
-# 避免代码复用原则：
-# 如果你需要在不同的地方重复调用同一套代码，你应当把他们封装在这样的函数里。
-# 避免需要修改代码时需要重复修改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 = {
-			class = governor
-			species = root
+			class = official
+			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
@@ -49,9 +16,11 @@ rg_gray_govener_init = {
 			skill = 10
 			set_age = 18
 			traits = {
+				0 = RG_leader_trait_governor_gray
 			}
 			effect = {
 				save_global_event_target_as = gray_governor
+				save_global_event_target_as = gray_official
 				set_leader_flag = gray_governor
 				set_leader_flag = legendary_leader
 				set_leader_flag = immune_to_negative_traits
@@ -64,20 +33,18 @@ rg_gray_govener_init = {
 				}
 				if = {
 					limit = {
-						owner = {
 							OR = {
 								has_global_flag = has_wsg_mod
 								has_global_flag = kdc_event_mod_active
 							}
-						}
 					}
-					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
-					add_trait_no_notify = subclass_governor_economist
-					add_trait_no_notify = leader_trait_urbanist_3
-					add_trait_no_notify = leader_trait_scrapper_2
+					add_trait_no_notify = subclass_official_governor
+					add_trait_no_notify = trait_ruler_architectural_sense_3
+					add_trait_no_notify = leader_trait_distribution_lines_2
 					if = {
 						limit = {
 							owner = {
@@ -92,9 +59,9 @@ rg_gray_govener_init = {
 				else = {
 					add_trait_no_notify = RG_leader_trait_governor_gray
 					add_trait_no_notify = RG_leader_trait_ruler_gray
-					add_trait_no_notify = subclass_governor_economis
-					add_trait_no_notify = leader_trait_urbanist_3
-					add_trait_no_notify = leader_trait_scrapper_2
+					add_trait_no_notify = subclass_official_governor
+					add_trait_no_notify = trait_ruler_architectural_sense_3
+					add_trait_no_notify = leader_trait_distribution_lines_2
 				}
 			}
 		}
@@ -130,14 +97,14 @@ rg_gray_govener_init = {
 				}
 				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
-			}
+			# 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 }
 		}
@@ -148,15 +115,16 @@ rg_gray_govener_init = {
 	
 }
 
-rg_gray_admiral_init = {
+rg_gray_commander_init = {
 	event_target:rg_gray_country = {
 		create_leader = {
-			class = admiral
-			species = root
+			class = commander
+			species = event_target:gray_species
 			name = "NAME_Gray"
 			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
@@ -165,11 +133,13 @@ rg_gray_admiral_init = {
 			skill = 10
 			set_age = 18
 			traits = {
-				trait = RG_leader_trait_admiral_gray
+				0 = RG_leader_trait_admiral_gray
 			}
 			effect = {
 				save_global_event_target_as = gray_leader_admiral
 				set_leader_flag = gray_admiral
+				save_global_event_target_as = gray_leader_general
+				set_leader_flag = gray_general
 				set_leader_flag = legendary_leader
 				set_leader_flag = immune_to_negative_traits
 				if = {
@@ -180,12 +150,10 @@ rg_gray_admiral_init = {
 				}
 				if = {
 					limit = {
-						owner = {
 							OR = {
 								has_global_flag = has_wsg_mod
 								has_global_flag = kdc_event_mod_active
 							}
-						}
 					}
 					set_leader_flag = "gray_leader"					# "gray_leader"==rg_gray_leader
 					set_leader_flag = gray_leader
@@ -205,11 +173,12 @@ rg_gray_admiral_init = {
 				set_leader_flag = rg_gray_leader
 				add_trait_no_notify = RG_leader_trait_admiral_gray
 				add_trait_no_notify = RG_leader_trait_admiral_nanorebuild_gray
+				# add_trait_no_notify = RG_leader_trait_general_gray_skill
 				# 缺少特质RG_leader_trait_admiral_gray将导致小灰改造项目无法完成
-				add_trait_no_notify = subclass_admiral_aggressor
+				add_trait_no_notify = subclass_commander_councilor
 				add_trait_no_notify = leader_trait_carrier_specialization
-				add_trait_no_notify = leader_trait_artillerist_2
 				add_trait_no_notify = leader_trait_juryrigger_2
+				add_trait_no_notify = leader_trait_reinforcer_2
 			}
 		}
 		last_created_leader = {
@@ -244,15 +213,15 @@ rg_gray_admiral_init = {
 				}
 				set_variable = { which = affection value = owner.wg_gray_affection }
 			}
-			add_trait_no_notify = leader_trait_admiral_wg_gray_affection
-			if = {
-				limit = {
-					owner = {
-						has_country_flag = gray_encountered_the_loop
-					}
-				}
-				add_trait_no_notify = leader_trait_admiral_wg_the_loop
-			}
+			# add_trait_no_notify = leader_trait_admiral_wg_gray_affection
+			# if = {
+			# 	limit = {
+			# 		owner = {
+			# 			has_country_flag = gray_encountered_the_loop
+			# 		}
+			# 	}
+			# 	add_trait_no_notify = leader_trait_admiral_wg_the_loop
+			# }
 			set_gray_portrait = yes
 			# add_special_leader_affection_trait = { LEADER = gray LEADER_CLASS = governor MARRIED_FLAG = married_gray }
 		}
@@ -261,125 +230,242 @@ rg_gray_admiral_init = {
 		}
 	}
 	RG_leader_trait_admiral_nanorebuild_gray_counter_init_effect = yes
+	RG_leader_trait_general_tempest_incoming_counter_init_effect = yes
 }
-
-rg_gray_general_init = {
-	event_target:rg_gray_country = {
-		create_leader = {
-			class = general
-			species = root
-			name = "NAME_Gray"
-			immortal = yes
-			event_leader = yes
-			skip_background_generation = yes
-			custom_catch_phrase = gray_catch_phrase
-			custom_description = gray_backstory
-			background_ethic = ethic_gestalt_consciousness
-			hide_age = yes
-			gender = female
-			skill = 10
-			set_age = 18
-			traits = {
-				trait = RG_leader_trait_general_gray
-				trait = RG_leader_trait_general_gray_skill
-				trait = subclass_general_marshall
-				trait = leader_trait_heavy_hitter_2
-				trait = leader_trait_reinforcer_2
-			}
-			effect = {
-				save_global_event_target_as = gray_leader_general
-				set_leader_flag = rg_gray_leader
-				set_leader_flag = gray_general
-				set_leader_flag = legendary_leader
-				set_leader_flag = immune_to_negative_traits
-				if = {
-					limit = {
-						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"					# "gray_leader"==rg_gray_leader
-					set_leader_flag = gray_leader
-				}
-			}
-		}
-		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_general
-		}
-		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 }
-			}
-			# add_trait_no_notify = leader_trait_admiral_wg_gray_affection
-			if = {
-				limit = {
-					owner = {
-						has_country_flag = gray_encountered_the_loop
-					}
-				}
-				add_trait_no_notify = leader_trait_admiral_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
-		}
-	}
-	set_variable = {
-		which = rg_general_skill_combat_daypassed_variable
-		value = 1
-	}
-	set_variable = {
-		which = rg_general_skill_combat_killed_variable
-		value = 0
-	}
-	
-}
+# 
+# rg_gray_admiral_init = {
+# 	event_target:rg_gray_country = {
+# 		create_leader = {
+# 			class = admiral
+# 			species = root
+# 			name = "NAME_Gray"
+# 			immortal = yes
+# 			event_leader = yes
+# 			skip_background_generation = yes
+# 			custom_catch_phrase = gray_catch_phrase
+# 			custom_description = gray_backstory
+# 			background_ethic = ethic_gestalt_consciousness
+# 			hide_age = yes
+# 			gender = female
+# 			skill = 10
+# 			set_age = 18
+# 			traits = {
+# 				trait = RG_leader_trait_admiral_gray
+# 			}
+# 			effect = {
+# 				save_global_event_target_as = gray_leader_admiral
+# 				set_leader_flag = gray_admiral
+# 				set_leader_flag = legendary_leader
+# 				set_leader_flag = immune_to_negative_traits
+# 				if = {
+# 					limit = {
+# 						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"					# "gray_leader"==rg_gray_leader
+# 					set_leader_flag = gray_leader
+# 					add_trait_no_notify = gray_admiral
+# 					if = {
+# 						limit = {
+# 							owner = {
+# 								has_country_flag = origin_gray_weaken
+# 								has_country_flag = origin_gray_country
+# 							}
+# 						}
+# 						remove_trait = gray_admiral
+# 						add_trait_no_notify = leader_trait_admiral_gray_weak
+# 						# 缺少特质leader_trait_admiral_gray_weak将导致KDC故事包远星之歌起源研究纳米星球特殊项目无法完成
+# 					}
+# 				}
+# 				set_leader_flag = rg_gray_leader
+# 				add_trait_no_notify = RG_leader_trait_admiral_gray
+# 				add_trait_no_notify = RG_leader_trait_admiral_nanorebuild_gray
+# 				# 缺少特质RG_leader_trait_admiral_gray将导致小灰改造项目无法完成
+# 				add_trait_no_notify = subclass_admiral_aggressor
+# 				add_trait_no_notify = leader_trait_carrier_specialization
+# 				add_trait_no_notify = leader_trait_artillerist_2
+# 				add_trait_no_notify = leader_trait_juryrigger_2
+# 			}
+# 		}
+# 		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_admiral
+# 		}
+# 		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 }
+# 			}
+# 			add_trait_no_notify = leader_trait_admiral_wg_gray_affection
+# 			if = {
+# 				limit = {
+# 					owner = {
+# 						has_country_flag = gray_encountered_the_loop
+# 					}
+# 				}
+# 				add_trait_no_notify = leader_trait_admiral_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_gray_general_init = {
+# 	event_target:rg_gray_country = {
+# 		create_leader = {
+# 			class = general
+# 			species = root
+# 			name = "NAME_Gray"
+# 			immortal = yes
+# 			event_leader = yes
+# 			skip_background_generation = yes
+# 			custom_catch_phrase = gray_catch_phrase
+# 			custom_description = gray_backstory
+# 			background_ethic = ethic_gestalt_consciousness
+# 			hide_age = yes
+# 			gender = female
+# 			skill = 10
+# 			set_age = 18
+# 			traits = {
+# 				trait = RG_leader_trait_general_gray
+# 				trait = RG_leader_trait_general_gray_skill
+# 				trait = subclass_general_marshall
+# 				trait = leader_trait_heavy_hitter_2
+# 				trait = leader_trait_reinforcer_2
+# 			}
+# 			effect = {
+# 				save_global_event_target_as = gray_leader_general
+# 				set_leader_flag = rg_gray_leader
+# 				set_leader_flag = gray_general
+# 				set_leader_flag = legendary_leader
+# 				set_leader_flag = immune_to_negative_traits
+# 				if = {
+# 					limit = {
+# 						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"					# "gray_leader"==rg_gray_leader
+# 					set_leader_flag = gray_leader
+# 				}
+# 			}
+# 		}
+# 		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_general
+# 		}
+# 		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 }
+# 			}
+# 			# add_trait_no_notify = leader_trait_admiral_wg_gray_affection
+# 			if = {
+# 				limit = {
+# 					owner = {
+# 						has_country_flag = gray_encountered_the_loop
+# 					}
+# 				}
+# 				add_trait_no_notify = leader_trait_admiral_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
+# 		}
+# 	}
+# 	set_variable = {
+# 		which = rg_general_skill_combat_daypassed_variable
+# 		value = 1
+# 	}
+# 	set_variable = {
+# 		which = rg_general_skill_combat_killed_variable
+# 		value = 0
+# 	}
+# 	
+# }
 
 rg_gray_scientist_init = {
 	event_target:rg_gray_country = {
 		create_leader = {
 			class = scientist
-			species = root
+			species = event_target:gray_species
 			name = "NAME_Gray"
 			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
@@ -388,10 +474,10 @@ rg_gray_scientist_init = {
 			skill = 10
 			set_age = 18
 			traits = {
-				trait = RG_leader_trait_scientist_gray
-				trait = subclass_scientist_explorer
-				trait = leader_trait_engineering_focus_2
-				trait = leader_trait_salvager_3
+				0 = RG_leader_trait_scientist_gray
+				1 = subclass_scientist_explorer
+				2 = leader_trait_engineering_focus_2
+				3 = leader_trait_salvager_3
 			}
 			effect = {
 				save_global_event_target_as = gray_leader_scientist
@@ -407,11 +493,9 @@ rg_gray_scientist_init = {
 				}
 				if = {
 					limit = {
-						owner = {
-							OR = {
-								has_global_flag = has_wsg_mod
-								has_global_flag = kdc_event_mod_active
-							}
+						OR = {
+							has_global_flag = has_wsg_mod
+							has_global_flag = kdc_event_mod_active
 						}
 					}
 					set_leader_flag = "gray_leader"					# "gray_leader"==rg_gray_leader
@@ -432,11 +516,9 @@ rg_gray_scientist_init = {
 		}
 		if = {
 			limit = {
-				owner = {
-					OR = {
-						has_global_flag = has_wsg_mod
-						has_global_flag = kdc_event_mod_active
-					}
+				OR = {
+					has_global_flag = has_wsg_mod
+					has_global_flag = kdc_event_mod_active
 				}
 			}
 			if = {
@@ -451,15 +533,15 @@ rg_gray_scientist_init = {
 				}
 				set_variable = { which = affection value = owner.wg_gray_affection }
 			}
-			add_trait_no_notify = leader_trait_admiral_wg_gray_affection
-			if = {
-				limit = {
-					owner = {
-						has_country_flag = gray_encountered_the_loop
-					}
-				}
-				add_trait_no_notify = leader_trait_admiral_wg_the_loop
-			}
+			# add_trait_no_notify = leader_trait_admiral_wg_gray_affection
+			# if = {
+			# 	limit = {
+			# 		owner = {
+			# 			has_country_flag = gray_encountered_the_loop
+			# 		}
+			# 	}
+			# 	add_trait_no_notify = leader_trait_admiral_wg_the_loop
+			# }
 			set_gray_portrait = yes
 			# add_special_leader_affection_trait = { LEADER = gray LEADER_CLASS = governor MARRIED_FLAG = married_gray }
 		}
@@ -473,13 +555,14 @@ rg_gray_scientist_init = {
 rg_gray_country_leader_init = {
 	create_leader = {
 		# 只用作看板娘
-		class = governor
+		class = official
 		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
@@ -487,8 +570,8 @@ rg_gray_country_leader_init = {
 		skill = 10
 		set_age = 18
 		traits = {
-			trait = rg_leader_trait_governor_gray
-			trait = RG_leader_trait_ruler_gray
+			0 = RG_leader_trait_governor_gray
+			1 = RG_leader_trait_ruler_gray
 		}
 		effect = {
 			save_global_event_target_as = rg_gray_country_leader
@@ -499,11 +582,9 @@ rg_gray_country_leader_init = {
 			# set_leader_flag = rg_gray_leader
 			if = {
 				limit = {
-					owner = {
-						OR = {
-							has_global_flag = has_wsg_mod
-							has_global_flag = kdc_event_mod_active
-						}
+					OR = {
+						has_global_flag = has_wsg_mod
+						has_global_flag = kdc_event_mod_active
 					}
 				}
 				# 暂时和小灰网络断开连接
@@ -511,16 +592,16 @@ rg_gray_country_leader_init = {
 				# set_leader_flag = gray_leader
 				add_trait_no_notify = leader_trait_governor_gray
 				add_trait_no_notify = RG_leader_trait_ruler_gray
-				add_trait_no_notify = subclass_governor_economist
-				add_trait_no_notify = leader_trait_urbanist_3
-				add_trait_no_notify = leader_trait_scrapper_2
+				add_trait_no_notify = subclass_official_governor
+				add_trait_no_notify = trait_ruler_architectural_sense_3
+				add_trait_no_notify = leader_trait_distribution_lines_2
 			}
 			else = {
 				add_trait_no_notify = RG_leader_trait_governor_gray
 				add_trait_no_notify = RG_leader_trait_ruler_gray
-				add_trait_no_notify = subclass_governor_economis
-				add_trait_no_notify = leader_trait_urbanist_3
-				add_trait_no_notify = leader_trait_scrapper_2
+				add_trait_no_notify = subclass_official_governor
+				add_trait_no_notify = trait_ruler_architectural_sense_3
+				add_trait_no_notify = leader_trait_distribution_lines_2
 			}
 		}
 	}

common/scripted_effects/RG_scripted_effects.txt

@@ -1,8 +1,22 @@
 @gray_portrait = Gray
 rg_set_gray_portrait = {
-	change_leader_portrait = @gray_portrait
-	event_target:rg_gray_country_leader = {
+	if = {
+		limit = {
+			has_global_flag = ms_species_enabled
+			event_target:gray_owner = {
+				has_country_flag = mss_enable_gray_maid
+			}
+		}
+		ms_update_gray_portrait = yes
+		event_target:rg_gray_country_leader = {
+			ms_update_gray_portrait = yes
+		}
+	}
+	else = {
 		change_leader_portrait = @gray_portrait
+		event_target:rg_gray_country_leader = {
+			change_leader_portrait = @gray_portrait
+		}
 	}
 }
 
@@ -663,7 +677,7 @@ rg_create_graygoo_roamers_7 = {
 rg_create_dessanu_roamers_1 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -734,7 +748,7 @@ rg_create_dessanu_roamers_1 = {
 rg_create_dessanu_roamers_2 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -805,7 +819,7 @@ rg_create_dessanu_roamers_2 = {
 rg_create_dessanu_roamers_3 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -876,7 +890,7 @@ rg_create_dessanu_roamers_3 = {
 rg_create_dessanu_roamers_4 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -947,7 +961,7 @@ rg_create_dessanu_roamers_4 = {
 rg_create_dessanu_roamers_5 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -1018,7 +1032,7 @@ rg_create_dessanu_roamers_5 = {
 rg_create_dessanu_roamers_6 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -1089,7 +1103,7 @@ rg_create_dessanu_roamers_6 = {
 rg_create_dessanu_roamers_7 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -2189,6 +2203,7 @@ rg_gray_country_init = {
 		# 下一阶段的事件再建立通讯
 		# establish_communications_no_message = root
 		save_global_event_target_as = rg_gray_country
+		save_global_event_target_as = gray_country
 		# 创建看板娘用于第一次接触
 		rg_gray_country_leader_init = yes
 		set_leader = last_created_leader

common/scripted_effects/RG_special_effects.txt

@@ -1,20 +1,14 @@
 rg_storyline_trigger = {
 	# 初始化故事事件触发
-	random_list = {
-		50 = {
-			country_event = {
-				id = rg_story.2
-				days = 3600
-				random = 12800
-			}
-		}
-		50 = {
-			country_event = {
-				id = rg_story.8
-				days = 3600
-				random = 12800
-			}
-		}
+	country_event = {
+		id = rg_story.2
+		days = 3600
+		random = 12800
+	}
+	country_event = {
+		id = rg_story.8
+		days = 3600
+		random = 12800
 	}
 	if = {
 		limit = {
@@ -172,7 +166,7 @@ rg_create_fake_dragon = {
 			}
 		}
 		create_leader = {
-			class = admiral
+			class = commander
 			species = root
 			name = "Name_rg_fake_dragon"
 			event_leader = yes

common/scripted_effects/rg_gray_warship_init_effects.txt

@@ -175,54 +175,3 @@ rg_warship_init_mod0 = {
 		}
 	}
 }
-
-rg_juggernaut_habitat_init = {
-	capital_scope = {
-		save_event_target_as = rg_capital_home_planet
-	}
-	spawn_planet = {
-		class = pc_habitat
-		location = root.home_planet
-		orbit_location = yes
-		orbit_angle_offset = 45
-		orbit_distance_offset = 9.899
-		size = 20
-		has_ring = no
-
-		init_effect = {
-			set_name = "NAME_rg_gray_habitat_base"
-			set_planet_entity = {
-				entity = "grey_tempesttw_juggernaut_entity"
-			}
-			set_surveyed = {
-				surveyed = yes
-				surveyor = FROM
-			}
-			set_all_comms_surveyed = yes
-			clear_blockers = yes
-
-			set_planet_flag = megastructure
-			set_planet_flag = habitat
-			set_planet_flag = advanced_habitat
-			set_planet_flag = advanced_habitat_2
-			set_planet_flag = rg_gray_habitat
-			save_global_event_target_as = rg_gray_habitat_target
-		}
-	}
-	event_target:spawn_planet = {
-		set_planet_flag = has_megastructure
-		# set_planet_flag = has_payback_habitat
-	}
-	event_target:rg_capital_home_planet = {
-		while = {
-			count = 1
-			random_owned_pop = {
-				resettle_pop = {
-					pop = this
-					planet = event_target:rg_gray_habitat_target
-				}
-				unemploy_pop = yes
-			}
-		}
-	}
-}

common/scripted_triggers/!_rg_scripted_trigger_overwrite.txt

@@ -0,0 +1,8 @@
+has_budding_trait = {
+	OR = {
+		has_trait = trait_plantoid_budding
+		has_trait = trait_lithoid_budding
+		has_trait = trait_advanced_budding
+		has_trait = rg_machine_maid_trait
+	}
+}

common/section_templates/RG_gray_goo_section.txt

@@ -43,12 +43,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #战列2
@@ -95,12 +89,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #泰坦3
@@ -122,12 +110,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }
 
 #线列4
@@ -149,12 +131,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #雷装5
@@ -201,12 +177,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #近防6
@@ -237,53 +207,47 @@ ship_section_template = {
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_05"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_01"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_06"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_02"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_07"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_03"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_08"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_04"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_09"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_05"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_10"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_06"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_11"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_07"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_12"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_08"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	large_utility_slots = 6
-	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 120
-		}
-	}
+	aux_utility_slots = 3
 }
 
 #光环7
@@ -304,13 +268,7 @@ ship_section_template = {
 		locatorname = "turret_01"
 	}
 	large_utility_slots = 6
-	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 120
-		}
-	}
+	aux_utility_slots = 3
 }
 
 #巨像8
@@ -326,13 +284,7 @@ ship_section_template = {
 		locatorname = "boope"
 	}
 	large_utility_slots = 6
-	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 120
-		}
-	}
+	aux_utility_slots = 3
 }
 
 #武库舰9
@@ -669,12 +621,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #航战10
@@ -716,12 +662,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #雷巡11
@@ -768,12 +708,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #撞击舰12
@@ -799,13 +733,7 @@ ship_section_template = {
 		locatorname = "xl_gun_01"
 	}
 	large_utility_slots = 12
-	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
+	aux_utility_slots = 3
 }
 
 ship_section_template = {
@@ -926,12 +854,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 12
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }
 
 ship_section_template = {
@@ -1082,12 +1004,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 10
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }
 
 ship_section_template = {
@@ -1153,12 +1069,6 @@ ship_section_template = {
 		locatorname = "root"
 	}
 	aux_utility_slots = 1
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }
 
 ship_section_template = {
@@ -1204,12 +1114,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 4
 	aux_utility_slots = 1
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 ship_section_template = {
@@ -1265,10 +1169,4 @@ ship_section_template = {
 	}
 	large_utility_slots = 12
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }

common/section_templates/RG_gray_ship_section.txt

@@ -160,12 +160,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 12
 	aux_utility_slots = 3
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 960
-		}
-	}
 }
 
 ship_section_template = {
@@ -627,12 +621,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 48
 	aux_utility_slots = 8
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }
 
 ship_section_template = {
@@ -1094,12 +1082,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 48
 	aux_utility_slots = 8
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }
 
 ship_section_template = {
@@ -1108,12 +1090,6 @@ ship_section_template = {
 	fits_on_slot = behind
 	entity = "grey_tempesttw_thinktank_phase_03_entity"
 	icon = "GFX_ship_part_core_mid"
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }
 
 ship_section_template = {
@@ -1122,10 +1098,4 @@ ship_section_template = {
 	fits_on_slot = behind
 	entity = "grey_tempesttw_thinktank_phase_03_entity"
 	icon = "GFX_ship_part_core_mid"
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }

common/section_templates/RG_special_ship_section.txt

@@ -57,12 +57,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 90
-		}
-	}
 }
 
 ship_section_template = {
@@ -124,12 +118,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 90
-		}
-	}
 }
 
 ship_section_template = {
@@ -185,12 +173,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 90
-		}
-	}
 }
 
 ship_section_template = {
@@ -248,12 +230,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 90
-		}
-	}
 }
 
 # Baby Dragon
@@ -694,12 +670,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 48
 	aux_utility_slots = 8
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }
 
 ship_section_template = {
@@ -730,12 +700,6 @@ ship_section_template = {
 
 	large_utility_slots = 2
 	aux_utility_slots = 1
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 30
-		}
-	}
 }
 
 ship_section_template = {
@@ -769,10 +733,4 @@ ship_section_template = {
 
 	large_utility_slots = 2
 	aux_utility_slots = 1
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 30
-		}
-	}
 }

common/ship_sizes/RG_ship_sizes.txt

@@ -30,7 +30,7 @@ RG_graygoo_mothership = {
 	modifier = {
 		ship_evasion_add = 50
 		ship_armor_add = 25600
-		ship_shield_add = 25600
+		# ship_shield_add = 25600
 	}
 	ship_modifier = {
 		ship_disengage_chance_reduction = 8
@@ -50,6 +50,9 @@ RG_graygoo_mothership = {
 	is_space_station = no
 	icon = ship_size_military_16
 	base_buildtime = @titan_build_time
+
+	use_shipnames_from = titan
+
 	can_have_federation_design = yes
 	enable_default_design = yes	#if yes, countries will have an auto-generated design at start
 	enable_3dview_in_ship_browser = yes	#if yes, ship design will have a 3d view in the ship browser
@@ -68,15 +71,12 @@ RG_graygoo_mothership = {
 	required_component_set = "sensor_components"
 	required_component_set = "science_cloaking_components"
 	required_component_set = "ship_aura_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @battleship_upkeep_energy
-			alloys = @battleship_upkeep_alloys
-		}
-	}
-	min_upgrade_cost = {
-		alloys = 8
+		cost = {
+			nanites = 30000
+	    }
 	}
 }
 
@@ -90,7 +90,7 @@ RG_graygoo_capitalship = {
 	modifier = {
 		ship_evasion_add = 100
 		ship_armor_add = 128000
-		ship_shield_add = 128000
+		# ship_shield_add = 128000
 		ship_weapon_damage = 2
 		ship_cloaking_detection_add = 5
 	}
@@ -115,8 +115,10 @@ RG_graygoo_capitalship = {
 	is_space_station = no
 	icon = ship_size_military_16
 	base_buildtime = @titan_build_time
+
+	use_shipnames_from = juggernaut
 	can_have_federation_design = yes
-	enable_default_design = no	#if yes, countries will have an auto-generated design at start
+	enable_default_design = yes	#if yes, countries will have an auto-generated design at start
 	enable_3dview_in_ship_browser = yes	#if yes, ship design will have a 3d view in the ship browser
 	is_designable = yes
 	default_behavior = colossus
@@ -139,15 +141,130 @@ RG_graygoo_capitalship = {
 	required_component_set = "ship_aura_components"
 	required_component_set = "ship_aura_components"
 	required_component_set = "ship_aura_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @battleship_upkeep_energy
-			alloys = @battleship_upkeep_alloys
+		cost = {
+			nanites = 150000
+	    }
+	}
+}
+
+RG_gray_juggernaut = {
+	max_speed = 100
+	entity = "grey_tempesttw_juggernaut_entity"
+	acceleration = 0.2
+	rotation_speed = 0.15
+	collision_radius = @juggernaut_collision_radius
+	modifier = {
+		ship_evasion_add = 100
+		ship_armor_add = 108000
+		# ship_shield_add = 108000
+		ship_weapon_damage = 2
+		starbase_shipyard_capacity_add = 12
+		ship_cloaking_detection_add = 5
+	}
+	ship_modifier = {
+		ship_disengage_chance_reduction = 8
+		ships_upkeep_mult = -1
+		ship_shield_hardening_add = 2
+		ship_armor_hardening_add = 2
+	}
+	max_hitpoints = 108000
+	base_buildtime = @juggernaut_build_time
+
+	use_shipnames_from = juggernaut
+	combat_size_multiplier = 5
+	size_multiplier = 32
+	fleet_slot_size = 32
+	section_slots = {
+		"core" = {
+			locator = "part1"
+		}
+		"behind" = {
+			locator = "part2"
 		}
 	}
-	min_upgrade_cost = {
-		alloys = 8
+	num_target_locators = 16
+	can_have_federation_design = no
+	enable_default_design = yes	#if yes, countries will have an auto-generated design at start
+	enable_3dview_in_ship_browser = yes	#if yes, ship design will have a 3d view in the ship browser
+	icon_frame = 7	#probably unused, but mobile starbases are special
+	icon = ship_size_military_64
+	ship_class_icon_frame = 35
+	default_behavior = colossus
+	is_designable = yes
+	prerequisites = {
+		"tech_gray_juggernaut_8"
+	}
+	class = shipclass_starbase
+	construction_type = starbase_shipyard
+	potential_construction = {
+		OR = {
+			is_scope_type = starbase
+			AND = {
+				is_scope_type = megastructure
+				OR = {
+					is_megastructure_type = mega_shipyard_3
+					is_megastructure_type = mega_shipyard_restored
+				}
+			}
+		}
+	}
+
+	possible_construction = {
+		custom_tooltip = {
+			fail_text = starbase_citadel_trigger
+			OR = {
+				AND = {
+					is_scope_type = megastructure
+					OR = {
+						is_megastructure_type = mega_shipyard_3
+						is_megastructure_type = mega_shipyard_restored
+					}
+				}
+				AND = {
+					is_scope_type = starbase
+					has_starbase_size >= starbase_citadel
+				}
+			}
+		}
+		custom_tooltip = {
+			fail_text = starbase_colossal_yards_trigger
+			OR = {
+				AND = {
+					is_scope_type = megastructure
+					OR = {
+						is_megastructure_type = mega_shipyard_3
+						is_megastructure_type = mega_shipyard_restored
+					}
+				}
+				AND = {
+					is_scope_type = starbase
+					has_starbase_building = colossus_yards
+				}
+			}
+		}
+	}
+	required_component_set = "power_core"
+	required_component_set = "sensor_components"
+	required_component_set = "combat_computers"
+	required_component_set = "ftl_components"
+	required_component_set = "thruster_components"
+	required_component_set = "science_cloaking_components"
+	required_component_set = "ship_aura_components"
+	required_component_set = "ship_aura_components"
+	required_component_set = "ship_aura_components"
+	required_component_set = "ship_aura_components"
+
+	empire_limit = 1
+
+	components_add_to_cost = no
+	resources = {
+		category = ships
+		cost = {
+			nanites = 150000
+	    }
 	}
 }
 
@@ -155,12 +272,12 @@ RG_armed_constructor_ship = {
 	max_speed = 150
 	acceleration = 0.1
 	rotation_speed = 0.2
-	max_hitpoints = 20000
+	max_hitpoints = 2000
 	entity = "grey_tempesttw_constructor_entity"
 	modifier = {
 		ship_evasion_add = 10
-		ship_armor_add = 12800
-		ship_shield_add = 12800
+		ship_armor_add = 1280
+		# ship_shield_add = 12800
 	}
 	ship_modifier = {
 		ship_hyperlane_range_add = 3
@@ -176,6 +293,10 @@ RG_armed_constructor_ship = {
 			locator = "part1"
 		}
 	}
+
+	use_shipnames_from = constructor
+	icon = ship_size_constructor
+	base_buildtime = @construction_build_time
 	num_target_locators = 2
 	is_space_station = no
 	combat_disengage_chance = 2
@@ -192,18 +313,25 @@ RG_armed_constructor_ship = {
 	required_component_set = "sensor_components"
 	required_component_set = "combat_computers"
 	required_component_set = "science_cloaking_components"
+
+	resources = {
+		category = ships
+		cost = {
+			nanites = 1000
+	    }
+	}
 }
 
 RG_armed_science_ship = {
 	max_speed = 200
 	acceleration = 0.35
 	rotation_speed = 0.2
-	max_hitpoints = 12000
+	max_hitpoints = 1200
 	entity = "grey_tempesttw_science_entity"
 	modifier = {
 		ship_evasion_add = 100
-		ship_armor_add = 12000
-		ship_shield_add = 12000
+		ship_armor_add = 1200
+		# ship_shield_add = 12000
 	}
 	ship_modifier = {
 		ship_hyperlane_range_add = 3
@@ -219,6 +347,10 @@ RG_armed_science_ship = {
 			locator = "part1"
 		}
 	}
+
+	use_shipnames_from = science
+	icon = ship_size_science
+	base_buildtime = @science_build_time
 	num_target_locators = 2
 	is_space_station = no
 	combat_size_multiplier = 1
@@ -236,6 +368,13 @@ RG_armed_science_ship = {
 	required_component_set = "combat_computers"
 	required_component_set = "science_cloaking_components"
 	required_component_set = "ship_aura_components"
+
+	resources = {
+		category = ships
+		cost = {
+			nanites = 1000
+	    }
+	}
 }
 
 # Gray Goo Interdictor
@@ -251,7 +390,7 @@ RG_graygoo_interdictor = {
 		ships_upkeep_mult = -1
 		ship_piracy_suppression_add = 4
 		ship_armor_add = 2800
-		ship_shield_add = 2800
+		# ship_shield_add = 2800
 	}
 	max_hitpoints = 5000
 	size_multiplier = 8
@@ -265,6 +404,8 @@ RG_graygoo_interdictor = {
 	is_space_station = no
 	icon = ship_size_military_4
 	base_buildtime = @battleship_build_time
+
+	use_shipnames_from = battleship
 	can_have_federation_design = yes
 	enable_default_design = yes	#if yes, countries will have an auto-generated design at start
 	enable_3dview_in_ship_browser = yes	#if yes, ship design will have a 3d view in the ship browser
@@ -281,15 +422,12 @@ RG_graygoo_interdictor = {
 	required_component_set = "combat_computers"
 	required_component_set = "thruster_components"
 	required_component_set = "sensor_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @battleship_upkeep_energy
-			alloys = @battleship_upkeep_alloys
-		}
-	}
-	min_upgrade_cost = {
-		alloys = 8
+		cost = {
+			nanites = 3000
+	    }
 	}
 }
 
@@ -306,7 +444,7 @@ RG_graygoo_destroyer = {
 		ships_upkeep_mult = -1
 		ship_piracy_suppression_add = 4
 		ship_armor_add = 1100
-		ship_shield_add = 1100
+		# ship_shield_add = 1100
 	}
 	max_hitpoints = 2000
 	size_multiplier = 2
@@ -319,7 +457,9 @@ RG_graygoo_destroyer = {
 	num_target_locators = 2
 	is_space_station = no
 	icon = ship_size_military_2
-	base_buildtime = @battleship_build_time
+	base_buildtime = @destroyer_build_time
+
+	use_shipnames_from = destroyer
 	can_have_federation_design = yes
 	enable_default_design = yes	#if yes, countries will have an auto-generated design at start
 	enable_3dview_in_ship_browser = yes	#if yes, ship design will have a 3d view in the ship browser
@@ -343,15 +483,12 @@ RG_graygoo_destroyer = {
 	required_component_set = "combat_computers"
 	required_component_set = "thruster_components"
 	required_component_set = "sensor_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @destroyer_upkeep_energy
-			alloys = @destroyer_upkeep_alloys
-		}
-	}
-	min_upgrade_cost = {
-		alloys = 8
+		cost = {
+			nanites = 1000
+	    }
 	}
 }
 
@@ -368,7 +505,7 @@ RG_graygoo_icebreaker_interdictor = {
 		ships_upkeep_mult = -1
 		ship_piracy_suppression_add = 4
 		ship_armor_add = 4800
-		ship_shield_add = 4800
+		# ship_shield_add = 4800
 	}
 	max_hitpoints = 10000
 	size_multiplier = 8
@@ -382,6 +519,7 @@ RG_graygoo_icebreaker_interdictor = {
 	is_space_station = no
 	icon = ship_size_military_4
 	base_buildtime = @battleship_build_time
+	use_shipnames_from = battleship
 	can_have_federation_design = yes
 	enable_default_design = yes	#if yes, countries will have an auto-generated design at start
 	enable_3dview_in_ship_browser = yes	#if yes, ship design will have a 3d view in the ship browser
@@ -399,15 +537,12 @@ RG_graygoo_icebreaker_interdictor = {
 	required_component_set = "thruster_components"
 	required_component_set = "sensor_components"
 	required_component_set = "science_cloaking_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @battleship_upkeep_energy
-			alloys = @battleship_upkeep_alloys
-		}
-	}
-	min_upgrade_cost = {
-		alloys = 8
+		cost = {
+			nanites = 6000
+	    }
 	}
 }
 
@@ -424,9 +559,9 @@ RG_graygoo_Arsenal = {
 		ships_upkeep_mult = -1
 		ship_piracy_suppression_add = 4
 		ship_armor_add = 2800
-		ship_shield_add = 2800
+		# ship_shield_add = 2800
 	}
-	max_hitpoints = 5000
+	max_hitpoints = 3000
 	size_multiplier = 8
 	fleet_slot_size = 4
 	section_slots = {
@@ -438,6 +573,7 @@ RG_graygoo_Arsenal = {
 	is_space_station = no
 	icon = ship_size_military_4
 	base_buildtime = @battleship_build_time
+	use_shipnames_from = battleship
 	can_have_federation_design = yes
 	enable_default_design = yes	#if yes, countries will have an auto-generated design at start
 	enable_3dview_in_ship_browser = yes	#if yes, ship design will have a 3d view in the ship browser
@@ -454,15 +590,12 @@ RG_graygoo_Arsenal = {
 	required_component_set = "combat_computers"
 	required_component_set = "thruster_components"
 	required_component_set = "sensor_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @battleship_upkeep_energy
-			alloys = @battleship_upkeep_alloys
-		}
-	}
-	min_upgrade_cost = {
-		alloys = 8
+		cost = {
+			nanites = 6000
+	    }
 	}
 }
 
@@ -478,7 +611,7 @@ RG_graygoo_Buff = {
 		ships_upkeep_mult = -1
 		ship_piracy_suppression_add = 4
 		ship_armor_add = 12800
-		ship_shield_add = 12800
+		# ship_shield_add = 12800
 	}
 	max_hitpoints = 20000
 	size_multiplier = 8
@@ -492,6 +625,7 @@ RG_graygoo_Buff = {
 	is_space_station = no
 	icon = ship_size_military_4
 	base_buildtime = @battleship_build_time
+	use_shipnames_from = colossus
 	can_have_federation_design = yes
 	enable_default_design = yes	#if yes, countries will have an auto-generated design at start
 	enable_3dview_in_ship_browser = yes	#if yes, ship design will have a 3d view in the ship browser
@@ -510,78 +644,13 @@ RG_graygoo_Buff = {
 	required_component_set = "sensor_components"
 	required_component_set = "ship_aura_components"
 	required_component_set = "science_cloaking_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @battleship_upkeep_energy
-			alloys = @battleship_upkeep_alloys
-		}
+		cost = {
+			nanites = 8000
+	    }
 	}
-	min_upgrade_cost = {
-		alloys = 8
-	}
-}
-
-RG_gray_juggernaut = {
-	max_speed = 100
-	entity = "grey_tempesttw_juggernaut_entity"
-	acceleration = 0.2
-	rotation_speed = 0.15
-	collision_radius = @juggernaut_collision_radius
-	modifier = {
-		ship_evasion_add = 100
-		ship_armor_add = 108000
-		ship_shield_add = 108000
-		ship_weapon_damage = 2
-		starbase_shipyard_capacity_add = 12
-		ship_cloaking_detection_add = 5
-	}
-	ship_modifier = {
-		ship_disengage_chance_reduction = 8
-		ships_upkeep_mult = -1
-		ship_shield_hardening_add = 2
-		ship_armor_hardening_add = 2
-	}
-	max_hitpoints = 108000
-	base_buildtime = @juggernaut_build_time
-	combat_size_multiplier = 5
-	size_multiplier = 32
-	fleet_slot_size = 32
-	section_slots = {
-		"core" = {
-			locator = "part1"
-		}
-		"behind" = {
-			locator = "part2"
-		}
-	}
-	num_target_locators = 16
-	can_have_federation_design = no
-	enable_default_design = no	#if yes, countries will have an auto-generated design at start
-	enable_3dview_in_ship_browser = yes	#if yes, ship design will have a 3d view in the ship browser
-	icon_frame = 7	#probably unused, but mobile starbases are special
-	icon = ship_size_military_64
-	ship_class_icon_frame = 35
-	default_behavior = colossus
-	is_designable = yes
-	prerequisites = {
-		"tech_gray_juggernaut_8"
-	}
-	class = shipclass_starbase
-	construction_type = starbase_shipyard
-	possible_construction = {
-		always = no
-	}
-	required_component_set = "power_core"
-	required_component_set = "sensor_components"
-	required_component_set = "combat_computers"
-	required_component_set = "ftl_components"
-	required_component_set = "thruster_components"
-	required_component_set = "science_cloaking_components"
-	required_component_set = "ship_aura_components"
-	required_component_set = "ship_aura_components"
-	required_component_set = "ship_aura_components"
-	required_component_set = "ship_aura_components"
 }
 
 # Armed Transport
@@ -589,12 +658,12 @@ RG_armed_transport_ship = {
 	max_speed = 150
 	acceleration = 0.1
 	rotation_speed = 0.2
-	max_hitpoints = 20000
+	max_hitpoints = 2000
 	entity = "grey_tempesttw_colonizer_entity"
 	modifier = {
 		ship_evasion_add = 10
-		ship_armor_add = 12800
-		ship_shield_add = 12800
+		ship_armor_add = 1280
+		# ship_shield_add = 12800
 	}
 	ship_modifier = {
 		ship_hyperlane_range_add = 3
@@ -615,6 +684,8 @@ RG_armed_transport_ship = {
 	icon = ship_size_transport
 	is_designable = no
 	class = shipclass_transport
+
+	use_shipnames_from = transport
 	required_component_set = "power_core"
 	required_component_set = "ftl_components"
 	required_component_set = "sensor_components"
@@ -622,12 +693,6 @@ RG_armed_transport_ship = {
 	required_component_set = "combat_computers"
 	required_component_set = "science_cloaking_components"
 	components_add_to_cost = no
-	resources = {
-		category = ships
-		cost = {
-			food = @salvagecostmedium
-		}
-	}
 }
 
 # Armed Colonizer
@@ -635,12 +700,12 @@ RG_armed_colony_ship = {
 	max_speed = 150
 	acceleration = 0.1
 	rotation_speed = 0.2
-	max_hitpoints = 20000
+	max_hitpoints = 2000
 	entity = "grey_tempesttw_colonizer_entity"
 	modifier = {
 		ship_evasion_add = 10
-		ship_armor_add = 12800
-		ship_shield_add = 12800
+		ship_armor_add = 1280
+		# ship_shield_add = 12800
 	}
 	ship_modifier = {
 		ship_hyperlane_range_add = 3
@@ -659,9 +724,12 @@ RG_armed_colony_ship = {
 	num_target_locators = 2
 	is_space_station = no
 	icon = ship_size_colonizer
+	base_buildtime = @colony_build_time
 	is_civilian = yes
 	is_designable = no
 	class = shipclass_colonizer
+
+	use_shipnames_from = colonizer
 	required_component_set = "ftl_components"
 	required_component_set = "sensor_components"
 	required_component_set = "thruster_components"
@@ -669,8 +737,8 @@ RG_armed_colony_ship = {
 	resources = {
 		category = ships
 		cost = {
-			food = @salvagecostmedium
-		}
+			nanites = 1000
+	    }
 	}
 }
 
@@ -681,7 +749,7 @@ RG_orbital_ring_tier_1 = {
 	modifier = {
 		ship_evasion_mult = -1
 		ship_armor_add = 125000
-		ship_shield_add = 125000
+		# ship_shield_add = 125000
 		starbase_defense_platform_capacity_add = 12
 		starbase_module_capacity_add = 12
 		starbase_building_capacity_add = 12

common/ship_sizes/z_RG_graygoo_ships.txt

@@ -15,7 +15,7 @@ graygoo_mothership = {
 	modifier = {
 		ship_evasion_add = 50
 		ship_armor_add = 25600
-		ship_shield_add = 25600
+		# ship_shield_add = 25600
 	}
 	ship_modifier = {
 		ship_disengage_chance_reduction = 8
@@ -46,8 +46,8 @@ graygoo_mothership = {
 	resources = {
 		category = ships
 		cost = {
-			nanites = @salvagecostlargerare
-		}
+			nanites = 30000
+	    }
 	}
 }
 
@@ -64,7 +64,7 @@ graygoo_interdictor = {
 		ships_upkeep_mult = -1
 		ship_piracy_suppression_add = 4
 		ship_armor_add = 2800
-		ship_shield_add = 2800
+		# ship_shield_add = 2800
 	}
 	max_hitpoints = 5000
 	size_multiplier = 8
@@ -88,8 +88,8 @@ graygoo_interdictor = {
 	resources = {
 		category = ships
 		cost = {
-			nanites = @salvagecostmediumrare
-		}
+			nanites = 3000
+	    }
 	}
 }
 
@@ -103,8 +103,8 @@ graygoo_factory = {
 	modifier = {
 		ship_cloaking_detection_add = 5
 		ship_evasion_add = 50
-		ship_armor_add = 1024000
-		ship_shield_add = 1024000
+		ship_armor_add = 2048000
+		# ship_shield_add = 1024000
 	}
 	ship_modifier = {
 		ship_shield_hardening_add = 5
@@ -132,8 +132,8 @@ graygoo_factory = {
 	resources = {
 		category = ships
 		cost = {
-			nanites = @salvagecostlargerare
-		}
+			nanites = 30000
+	    }
 	}
 }
 
@@ -180,8 +180,7 @@ nanite_space_dragon_baby = {
 	resources = {
 		category = ships
 		cost = {
-			alloys = @salvagecostmedium
-			nanites = @salvagecostmediumrare
-		}
+			nanites = 30000
+	    }
 	}
 }

common/situations/rg_gray_situations.txt

@@ -177,7 +177,7 @@ situation_rg_gray_mod1 = {
 		}
 	}
 	monthly_progress = {
-		base = 0.1
+		base = 0.5
 		modifier = {
 			add = 0.1
 			desc = situation_rg_gray_mod1_stage_1_booster_tooltip
@@ -483,54 +483,54 @@ situation_rg_gray_mod2 = {
 		}
 	}
 	monthly_progress = {
-		base = 0.1
+		base = 0.5
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_1_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_1_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_2_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_1_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_4_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_3_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_5_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_3_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_6_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_7_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_8_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_3_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_9_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_10_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_11_booster
 		}

common/solar_system_initializers/RG_fallen_empire_initializers.txt

@@ -0,0 +1,907 @@
+# Home System - Machine
+
+rg_fallen_machine = {
+	usage = fallen_empire_init
+	name = 芬里尔III
+	class = "rl_standard_stars"
+
+	flags = {
+		lcluster
+		lcluster4
+		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
+	}
+
+	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"
+				}
+			}
+		}
+	}
+
+	# spawn_megastructure = {
+	# 	type = lgate_base
+	# 	orbit_angle = 225
+	# 	orbit_distance = 30
+	# }
+}
+
+
+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/solar_system_initializers/RG_initializers.txt

@@ -498,7 +498,6 @@ rg_cluster_init_04 = {
 		flags = {
 			start_rg_cluster_gatebuilders
 			ignore_startup_effect
-			rw_spec_empire
 		}
 		init_effect = {
 			prevent_anomaly = yes

common/special_projects/!_RG_projects_distant_stars.txt

@@ -22,6 +22,7 @@ special_project = {
 						has_global_flag = l_cluster_origin						# l-cluster plus
 						has_global_flag = rg_origin_l_cluster						# 遥远约定
 						has_global_flag = gray_origin_activate						# 远星之歌
+						has_global_flag = rg_origin_scion_l_cluster					# 未来追迹
 					}
 				}
 				country_event = {
@@ -62,7 +63,7 @@ special_project = {
 	event_scope = ship_event
 	requirements = {
 		shipclass_military = 1
-		leader = admiral
+		leader = commander
 		has_trait = RG_leader_trait_admiral_gray
 	}
 	on_start = {
@@ -138,7 +139,7 @@ special_project = {
 	event_scope = ship_event
 	requirements = {
 		shipclass_military = 1
-		leader = admiral
+		leader = commander
 		has_trait = RG_leader_trait_admiral_gray
 	}
 	on_start = {

common/species_archetypes/RG_species_archetypes.txt

@@ -0,0 +1,21 @@
+# species_trait_points: base number of species trait points available for this species class
+# species_max_traits: maximum number of traits that species of this class can have (doesn't count those with cost == 0)
+
+#EXAMPLE OF MODDED SPECIES ARCHETYPE
+#Will be able to use traits valid for BIOLOGICAL, ROBOT and BIOLOGICAL2
+#Has the exact same trait points as BIOLOGICAL
+#BIOLOGICAL2 = {
+#	inherit_trait_points_from = BIOLOGICAL
+#	inherit_traits_from = { BIOLOGICAL ROBOT }
+
+#	robotic: is this archetype's species robotic? Governs various things:
+#		- does the species count as robotic (for is_robotic = yes, and various hardcoded checks)
+#		- notably can the species grow, or is just assembled?
+#	uses_modifiers: should modifiers be generated for this archetype at all?
+#}
+
+RG_MACHINE = {
+	species_trait_points = 10
+	species_max_traits = 6
+	robotic = yes
+}

common/species_classes/rg_species_classes.txt

@@ -0,0 +1,57 @@
+
+# The Portraits defined here are generally not available to the character creator, but will instead appear in AI empires across the galaxy.
+# 'graphical_culture' is connected to the looks used for ships and cities; see "common/graphical_culture/".
+# These may be overwitten in an "extendable" manner, meaning (for example) you can create a second "HUM" with extra portraits in it.
+
+# playable = yes/no/trigger (default: yes)		if this species class can is playable
+# randomized = yes/no/trigger (default: yes)	if this species class is randomized
+# custom_portraits = {}
+#	randomized = yes/no/trigger (default: yes)	to specify if portraits are randomized
+#	playable = yes/no/trigger (default: yes)	to specify if portraits are playable
+#	portraits = list portrait keys
+# species_trait_points							base number of species trait points available for this species class
+# species_max_traits							maximum number of traits that species of this class can have (doesn't count those with cost == 0)
+# possible										ethics/government requirements; see common/governments/readme_requirements.txt
+# gender = yes/no (default: yes)				whether the species has a gender
+# portrait_modding yes/no (default: yes)		whether the portrait can be modified with e.g. genemodding or robomodding
+GRAY_SPECIES = {
+	archetype = OTHER
+
+	playable = { always = no }
+	randomized = no
+
+	gender = female
+
+	portraits = {
+		"Gray"
+	}
+
+	move_pop_sound_effect = "moving_pop_confirmation"
+}
+
+RG_MACHINE = {
+	archetype = MACHINE
+
+	playable = no
+	randomized = no
+	# possible = { always = yes }
+	# possible_secondary = { always = no text = SECONDARY_SPECIES_CLASS_INVALID }
+
+	gender = no
+	use_climate_preference = no
+	portrait_modding = yes
+
+	leader_age_min = 2
+	leader_age_max = 10
+
+	custom_portraits = { # use custom_portraits instead of portraits so we can put them after the custom_portraits above
+		portraits = {
+			"rg_machine_maid"
+		}
+	}
+
+	graphical_culture = mammalian_01
+	move_pop_sound_effect = "robot_pops_move"
+
+	resources = {}
+}

common/static_modifiers/RG_static_modifiers.txt

@@ -47,3 +47,77 @@ gray_affection_warship_lv5 = {
 	ship_ftl_jumpdrive_range_mult = 0.5
 	force_disparity_fire_rate_mult = 3
 }
+
+skill_rg_nanite_leader_navy = {
+	ship_weapon_range_mult = 0.05
+	ship_hull_mult = 0.05
+	ship_fire_rate_mult = 0.1
+}
+
+skill_rg_nanite_leader_army = {
+	army_damage_mult = 0.1
+	army_morale_damage_mult = 0.1
+	army_health = 0.1
+	army_morale = 0.1
+}
+
+skill_rg_nanite_leader = {
+	custom_tooltip = skill_official_delegate_tt
+	science_ship_survey_speed = 0.10
+	ship_archaeological_site_clues_add = 1
+	ship_astral_rift_clues_add = 1
+}
+
+skill_rg_nanite_leader_planet_governor = {
+	custom_tooltip = skill_official_planet_governor_tt
+	planet_jobs_energy_produces_mult = @planet_job_mult
+	planet_jobs_minerals_produces_mult = @planet_job_mult
+	planet_jobs_food_produces_mult = @planet_job_mult
+	planet_jobs_alloys_produces_mult = @planet_job_mult
+	planet_jobs_consumer_goods_produces_mult = @planet_job_mult
+	planet_jobs_exotic_gases_produces_mult = @planet_job_mult
+	planet_jobs_rare_crystals_produces_mult = @planet_job_mult
+	planet_jobs_volatile_motes_produces_mult = @planet_job_mult
+
+	# planet_jobs_ruler_produces_mult = @negative_planet_job_mult
+	# planet_jobs_specialist_produces_mult = @negative_planet_job_mult
+	planet_jobs_worker_produces_mult = @planet_job_mult
+	planet_jobs_slave_produces_mult = @planet_job_mult
+	job_soldier_or_warrior_add = 1
+	planet_crime_add = -1
+
+	planet_jobs_physics_research_produces_mult = @planet_job_mult
+	planet_jobs_society_research_produces_mult = @planet_job_mult
+	planet_jobs_engineering_research_produces_mult = @planet_job_mult
+	species_empire_size_mult = @planet_empire_size
+}
+
+skill_rg_nanite_leader_sector_governor = {
+	custom_tooltip = skill_official_sector_governor_tt
+	planet_jobs_energy_produces_mult = @sector_job_mult
+	planet_jobs_minerals_produces_mult = @sector_job_mult
+	planet_jobs_food_produces_mult = @sector_job_mult
+	planet_jobs_alloys_produces_mult = @sector_job_mult
+	planet_jobs_consumer_goods_produces_mult = @sector_job_mult
+	planet_jobs_exotic_gases_produces_mult = @sector_job_mult
+	planet_jobs_rare_crystals_produces_mult = @sector_job_mult
+	planet_jobs_volatile_motes_produces_mult = @sector_job_mult
+
+	# planet_jobs_ruler_produces_mult = @negative_sector_job_mult
+	# planet_jobs_specialist_produces_mult = @negative_sector_job_mult
+	planet_jobs_worker_produces_mult = @sector_job_mult
+	planet_jobs_slave_produces_mult = @sector_job_mult
+	job_soldier_or_warrior_add = 0.5
+	planet_crime_add = -0.5
+
+	planet_jobs_physics_research_produces_mult = @sector_job_mult
+	planet_jobs_society_research_produces_mult = @sector_job_mult
+	planet_jobs_engineering_research_produces_mult = @sector_job_mult
+	species_empire_size_mult = @sector_empire_size
+}
+
+skill_rg_nanite_leader_background_planet_governor = {
+	planet_amenities_add = 2
+	planet_stability_add = 0.5
+	planet_jobs_upkeep_mult = -0.01
+}

common/technology/rg_tech.txt

@@ -385,6 +385,23 @@ tech_object_gray_6 = {
 	}
 }
 
+
+tech_gray_machine = {
+	area = society
+	cost = 2000
+	tier = 5
+	is_rare = yes
+	category = {
+		biology
+	}
+	weight = 0
+	## unlock 
+	ai_weight = {
+		factor = 0
+	}
+}
+
+
 tech_gray_noway = {
 	cost = 2000
 	area = physics

common/traits/!_RG_gray_goo_traits.txt

@@ -1,34 +1,152 @@
 ###################
 # Governor Traits #
 ###################
+# leader_trait_governor_gray = {
+# 	cost = 0
+# 	inline_script = {
+# 		script = trait/icon_psionic
+# 		CLASS = official
+# 		ICON = "GFX_leader_trait_psionic_chosen_one"
+# 		RARITY = paragon
+# 		COUNCIL = no
+# 		TIER = none
+# 	}
+# 	immortal_leaders = yes
+# 	planet_modifier = {
+# 		planet_buildings_cost_mult = -0.4
+# 		planet_building_build_speed_mult = 0.4
+# 		planet_jobs_energy_produces_mult = 0.15
+# 		planet_jobs_minerals_produces_mult = 0.15
+# 		deposit_blockers_cost_mult = -0.4
+# 		planet_clear_blocker_speed_mult = 0.4
+# 	}
+# 	sector_modifier = {
+# 		planet_buildings_cost_mult = -0.2
+# 		planet_building_build_speed_mult = 0.2
+# 		planet_jobs_energy_produces_mult = 0.075
+# 		planet_jobs_minerals_produces_mult = 0.075
+# 		deposit_blockers_cost_mult = -0.2
+# 		planet_clear_blocker_speed_mult = 0.2
+# 	}
+# 	leader_class = { official }
+# 	initial = no
+# 	randomized = no
+# }
+
+# RG_leader_trait_offical_gray = {
+# 	#唯一特质
+# 	cost = 0
+# 	inline_script = {
+# 		script = trait/icon_psionic
+# 		CLASS = leader
+# 		ICON = "GFX_leader_trait_psionic_chosen_one"
+# 		RARITY = paragon
+# 		COUNCIL = no
+# 		TIER = none
+# 	}
+# 	immortal_leaders = yes
+# 		triggered_self_modifier = {
+# 		potential = {
+# 			always = yes
+# 		}
+# 		leader_skill_levels = 1
+# 		mult = trigger:has_skill
+# 	}
+# 	self_modifier = {
+# 		species_leader_exp_gain = 1
+# 	}
+# 	councilor_modifier = {
+# 		all_technology_research_speed = 0.5
+# 	}
+# 	planet_modifier = {
+# 		planet_buildings_cost_mult = -0.4
+# 		planet_building_build_speed_mult = 0.6
+# 		planet_jobs_alloys_produces_mult = 0.25
+# 		planet_jobs_engineering_research_produces_mult = 0.25
+# 		deposit_blockers_cost_mult = -0.4
+# 		planet_clear_blocker_time_mult = -0.6
+# 	}
+# 	sector_modifier = {
+# 		planet_buildings_cost_mult = -0.2
+# 		planet_building_build_speed_mult = 0.2
+# 		planet_jobs_alloys_produces_mult = 0.1
+# 		planet_jobs_engineering_research_produces_mult = 0.1
+# 		deposit_blockers_cost_mult = -0.2
+# 		planet_clear_blocker_time_mult = -0.2
+# 		starbase_shipyard_build_cost_mult = -0.25
+# 		starbase_shipyard_build_speed_mult = -0.3
+# 	}
+# 	fleet_modifier = {
+# 		ship_armor_mult = 3.5
+# 		ship_hull_mult = 3.5
+# 		ships_upkeep_mult = -0.4
+# 		ship_hull_regen_add_perc = 5
+# 		ship_armor_regen_add_perc = 5
+# 	}
+# 	army_modifier = {
+# 		army_collateral_damage_mult = 0.15
+# 		army_disengage_chance_mult = 0.5
+# 		army_health = 0.35
+# 	}
+# 	modifier = {
+# 		ship_archaeological_site_excavation_speed_mult = 0.5
+# 		science_ship_survey_speed = 1
+# 		# ship_windup_mult = -1
+# 		# ship_speed_mult = 0.5
+# 		ship_anomaly_generation_chance_mult = -1
+# 	}
+# 	triggered_modifier = {
+# 		potential = {
+# 			has_astral_planes_dlc = yes
+# 		}
+# 		country_astral_rift_speed_mult = 0.5
+# 	}
+# 	leader_class = { rg_nanite_leader }
+# 	initial = no
+# 	randomized = no
+# }
+
 RG_leader_trait_governor_gray = {
 	#总督特质
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = governor
+		CLASS = official
 		ICON = "GFX_leader_trait_psionic_chosen_one"
 		RARITY = paragon
 		COUNCIL = no
 		TIER = none
 	}
 	immortal_leaders = yes
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
-	modifier = {
+	planet_modifier = {
 		planet_buildings_cost_mult = -0.4
-		planet_building_build_speed_mult = 0.8
-		deposit_blockers_cost_mult = -0.4
-		planet_clear_blocker_time_mult = -0.8
+		planet_building_build_speed_mult = 0.6
 		planet_jobs_alloys_produces_mult = 0.25
 		planet_jobs_engineering_research_produces_mult = 0.25
+		deposit_blockers_cost_mult = -0.4
+		planet_clear_blocker_time_mult = -0.6
+	}
+	sector_modifier = {
+		planet_buildings_cost_mult = -0.2
+		planet_building_build_speed_mult = 0.2
+		planet_jobs_alloys_produces_mult = 0.1
+		planet_jobs_engineering_research_produces_mult = 0.1
+		deposit_blockers_cost_mult = -0.2
+		planet_clear_blocker_time_mult = -0.2
 		starbase_shipyard_build_cost_mult = -0.25
 		starbase_shipyard_build_speed_mult = -0.3
 	}
-	leader_class = {
-		governor
-	}
+	leader_class = { official }
 	initial = no
 	randomized = no
 }
@@ -38,13 +156,13 @@ RG_leader_trait_ruler_gray = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = governor
+		CLASS = leader
 		ICON = "GFX_leader_trait_legendary_spiritualist_two"
 		RARITY = paragon
 		COUNCIL = yes
 		TIER = none
 	}
-	councilor_trait = yes
+	# forced_councilor_trait = yes
 	triggered_self_modifier = {
 		potential = {
 			is_councilor = yes
@@ -55,9 +173,9 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		leader_skill_levels = 1
+		# leader_skill_levels = 1
 		leaders_upkeep_mult = 0.1
-		mult = owner.rg_gray_level
+		mult = trigger:has_skill
 	}
 	triggered_self_modifier = {
 		potential = {
@@ -73,9 +191,9 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		leader_skill_levels = 1
+		# leader_skill_levels = 1
 		leaders_upkeep_mult = 0.15
-		mult = owner.rg_gray_level
+		mult = trigger:has_skill
 	}
 	triggered_self_modifier = {
 		potential = {
@@ -87,13 +205,13 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		leader_skill_levels = 1
+		# leader_skill_levels = 1
 		leaders_upkeep_mult = 0.2
-		mult = owner.rg_gray_level
+		mult = trigger:has_skill
 	}
-	triggered_modifier = {
+	triggered_councilor_modifier = {
 		potential = {
-			is_councilor = yes
+			# is_councilor = yes
 			owner = {
 				check_variable = {
 					which = rg_gray_level
@@ -103,11 +221,11 @@ RG_leader_trait_ruler_gray = {
 		}
 		# country_energy_produces_mult = -0.02
 		planet_stability_add = -1
-		mult = owner.rg_gray_level
+		mult = trigger:has_skill
 	}
-	triggered_modifier = {
+	triggered_councilor_modifier = {
 		potential = {
-			is_councilor = yes
+			# is_councilor = yes
 			owner = {
 				check_variable = {
 					which = rg_gray_level
@@ -121,11 +239,11 @@ RG_leader_trait_ruler_gray = {
 		}
 		# country_energy_produces_mult = -0.03
 		planet_stability_add = -1.5
-		mult = owner.rg_gray_level
+		mult = trigger:has_skill
 	}
-	triggered_modifier = {
+	triggered_councilor_modifier = {
 		potential = {
-			is_councilor = yes
+			# is_councilor = yes
 			owner = {
 				check_variable = {
 					which = rg_gray_level
@@ -135,9 +253,9 @@ RG_leader_trait_ruler_gray = {
 		}
 		# country_energy_produces_mult = -0.04
 		planet_stability_add = -2
-		mult = owner.rg_gray_level
+		mult = trigger:has_skill
 	}
-	triggered_modifier = {
+	triggered_councilor_modifier = {
 		potential = {
 			always = yes
 		}
@@ -150,11 +268,9 @@ RG_leader_trait_ruler_gray = {
 		megastructure_build_speed_mult = 0.1
 		country_unity_produces_mult = 0.05
 		country_base_influence_produces_add = 1
-		mult = owner.rg_gray_level
-	}
-	leader_class = {
-		governor
+		mult = trigger:has_skill
 	}
+	leader_class = { official }
 	initial = no
 	randomized = no
 }
@@ -164,26 +280,36 @@ RG_leader_trait_admiral_gray_1 = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = commander
 		ICON = "GFX_leader_trait_psionic_chosen_one"
 		RARITY = paragon
 		COUNCIL = no
 		TIER = none
 	}
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
 	immortal_leaders = yes
-	modifier = {
+	fleet_modifier = {
 		ship_armor_mult = 1
 		ship_hull_mult = 1
 		ships_upkeep_mult = -0.4
 		ship_hull_regen_add_perc = 1
 		ship_armor_regen_add_perc = 1
 	}
-	leader_class = {
-		admiral
+	army_modifier = {
+		army_collateral_damage_mult = 0.05
+		army_disengage_chance_mult = 0.3
+		army_health = 0.15
 	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -193,26 +319,36 @@ RG_leader_trait_admiral_gray_2 = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = commander
 		ICON = "GFX_leader_trait_psionic_chosen_one"
 		RARITY = paragon
 		COUNCIL = no
 		TIER = none
 	}
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
 	immortal_leaders = yes
-	modifier = {
+	fleet_modifier = {
 		ship_armor_mult = 2
 		ship_hull_mult = 2
 		ships_upkeep_mult = -0.4
 		ship_hull_regen_add_perc = 2
 		ship_armor_regen_add_perc = 2
 	}
-	leader_class = {
-		admiral
+	army_modifier = {
+		army_collateral_damage_mult = 0.1
+		army_disengage_chance_mult = 0.4
+		army_health = 0.25
 	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -222,52 +358,67 @@ RG_leader_trait_admiral_gray = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = commander
 		ICON = "GFX_leader_trait_psionic_chosen_one"
 		RARITY = paragon
 		COUNCIL = no
 		TIER = none
 	}
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
 	immortal_leaders = yes
-	modifier = {
+	fleet_modifier = {
 		ship_armor_mult = 3.5
 		ship_hull_mult = 3.5
 		ships_upkeep_mult = -0.4
 		ship_hull_regen_add_perc = 5
 		ship_armor_regen_add_perc = 5
 	}
-	leader_class = {
-		admiral
+	army_modifier = {
+		army_collateral_damage_mult = 0.15
+		army_disengage_chance_mult = 0.5
+		army_health = 0.35
 	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
 
 RG_leader_trait_admiral_nanorebuild_gray = {
-	#3级舰长（默认
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = leader
 		ICON = "GFX_leader_trait_nanorebuild"
 		RARITY = paragon
 		COUNCIL = no
 		TIER = none
 	}
 	custom_tooltip_with_modifiers = RG_leader_trait_admiral_nanorebuild_effect
-	modifier = {
+	fleet_modifier = {
 		ship_armor_mult = 0.5
 		ship_hull_mult = 0.5
 		ships_upkeep_mult = -0.1
 		ship_hull_regen_add_perc = 0.5
 		ship_armor_regen_add_perc = 0.5
 	}
-	leader_class = {
-		admiral
+	triggered_army_modifier = {
+		potential = {
+			always = yes
+		}
+		army_damage_mult = 0.05
+		army_health = 0.05
+		mult = owner.rg_general_skill_combat_daypassed_variable
 	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -283,84 +434,90 @@ RG_leader_trait_scientist_gray = {
 		COUNCIL = no
 		TIER = none
 	}
-	self_modifier = {
-		species_leader_exp_gain = 1
-	}
-	immortal_leaders = yes
-	modifier = {
-		all_technology_research_speed = 0.5
-		ship_archaeological_site_excavation_speed_mult = 0.5
-		science_ship_survey_speed = 1
-		ship_windup_mult = -1
-		ship_speed_mult = 0.5
-		ship_anomaly_generation_chance_mult = -1
-	}
-	leader_class = {
-		scientist
-	}
-	initial = no
-	randomized = no
-}
-
-RG_leader_trait_general_gray = {
-	#将军特质
-	cost = 0
-	inline_script = {
-		script = trait/icon_psionic
-		CLASS = general
-		ICON = "GFX_leader_trait_psionic_chosen_one"
-		RARITY = paragon
-		COUNCIL = no
-		TIER = none
-	}
-	self_modifier = {
-		species_leader_exp_gain = 1
-	}
-	immortal_leaders = yes
-	modifier = {
-		army_collateral_damage_mult = 0.15
-		army_disengage_chance_mult = 0.5
-		army_health = 0.35
-	}
-	leader_class = {
-		general
-	}
-	initial = no
-	randomized = no
-}
-
-RG_leader_trait_general_gray_skill = {
-	destiny_trait = yes
-	inline_script = {
-		script = trait/icon_psionic
-		CLASS = general
-		ICON = "GFX_leader_trait_supreme_warrior"
-		RARITY = paragon
-		COUNCIL = no
-		TIER = none
-	}
-	custom_tooltip_with_modifiers = RG_leader_trait_tempest_incoming_effect
-	triggered_modifier = {
+	triggered_self_modifier = {
 		potential = {
 			always = yes
 		}
-		army_damage_mult = 0.05
-		army_health = 0.05
-		mult = owner.rg_general_skill_combat_daypassed_variable
+		leader_skill_levels = 1
+		mult = trigger:has_skill
 	}
-	leader_class = {
-		general
+	self_modifier = {
+		species_leader_exp_gain = 1
 	}
+	immortal_leaders = yes
+	councilor_modifier = {
+		all_technology_research_speed = 0.5
+	}
+	modifier = {
+		ship_archaeological_site_excavation_speed_mult = 0.5
+		science_ship_survey_speed = 1
+		# ship_windup_mult = -1
+		# ship_speed_mult = 0.5
+		ship_anomaly_generation_chance_mult = -1
+	}
+	leader_class = { scientist }
 	initial = no
 	randomized = no
-	destiny_background_icon = "GFX_leader_background_destiny_1"
 }
 
+# RG_leader_trait_general_gray = {
+# 	#将军特质
+# 	cost = 0
+# 	inline_script = {
+# 		script = trait/icon_psionic
+# 		CLASS = general
+# 		ICON = "GFX_leader_trait_psionic_chosen_one"
+# 		RARITY = paragon
+# 		COUNCIL = no
+# 		TIER = none
+# 	}
+# 	self_modifier = {
+# 		species_leader_exp_gain = 1
+# 	}
+# 	immortal_leaders = yes
+# 	modifier = {
+# 		army_collateral_damage_mult = 0.15
+# 		army_disengage_chance_mult = 0.5
+# 		army_health = 0.35
+# 	}
+# 	leader_class = {
+# 		general
+# 	}
+# 	initial = no
+# 	randomized = no
+# }
+
+# 与舰长技能合并，弃用
+# RG_leader_trait_general_gray_skill = {
+# 	destiny_trait = yes
+# 	inline_script = {
+# 		script = trait/icon_psionic
+# 		CLASS = commander
+# 		ICON = "GFX_leader_trait_supreme_warrior"
+# 		RARITY = paragon
+# 		COUNCIL = no
+# 		TIER = none
+# 	}
+# 	custom_tooltip_with_modifiers = RG_leader_trait_tempest_incoming_effect
+# 	triggered_army_modifier = {
+# 		potential = {
+# 			always = yes
+# 		}
+# 		army_damage_mult = 0.05
+# 		army_health = 0.05
+# 		mult = owner.rg_general_skill_combat_daypassed_variable
+# 	}
+# 	leader_class = { commander }
+# 	initial = no
+# 	randomized = no
+# 	destiny_background_icon = "GFX_leader_background_destiny_1"
+# }
+
 RG_leader_trait_admiral_fake_dragon = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = commander
 		ICON = "GFX_leader_trait_adaptable"
 		RARITY = paragon
 		COUNCIL = no
@@ -370,14 +527,12 @@ RG_leader_trait_admiral_fake_dragon = {
 		# 不知道什么时候专属特质加100%经验率已经变成国际公约力
 		species_leader_exp_gain = 1
 	}
-	modifier = {
+	fleet_modifier = {
 		ship_armor_mult = 0.3
 		ship_hull_mult = 0.2
 		ship_weapon_damage = 0.2
 	}
-	leader_class = {
-		admiral
-	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -386,7 +541,7 @@ RG_leader_trait_admiral_timed_life = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = commander
 		ICON = "GFX_leader_trait_ethereal"
 		RARITY = paragon
 		COUNCIL = no
@@ -420,9 +575,7 @@ RG_leader_trait_admiral_timed_life = {
 		ship_weapon_damage = 10
 		custom_tooltip_with_modifiers = rg_timed_life_millennium
 	}
-	leader_class = {
-		admiral
-	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -431,7 +584,7 @@ RG_leader_trait_admiral_born_tobe_dragon = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = commander
 		ICON = "GFX_leader_trait_ethereal"
 		RARITY = paragon
 		COUNCIL = no
@@ -466,9 +619,7 @@ RG_leader_trait_admiral_born_tobe_dragon = {
 		ship_weapon_damage = 0.01
 		custom_tooltip_with_modifiers = rg_timed_life_millennium_reborn
 	}
-	leader_class = {
-		admiral
-	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }

common/traits/!_RG_wg_gray_leader_affection_traits_overwrite.txt

@@ -1,387 +1,387 @@
-leader_trait_wg_gray_affection = {
-	cost = 0
-	inline_script = {
-		script = trait/wg_new_leader_affection_trait
-		LEADER_TYPE = wg_gray
-	}
-	#governor
-	triggered_modifier = {
-		# lv2
-		potential = {
-			leader_class = governor
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv2
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv3
-			}
-		}
-		planet_district_city_build_speed_mult = 0.2
-		planet_district_generator_build_speed_mult = 0.2
-		planet_district_farming_build_speed_mult = 0.2
-		planet_district_mining_build_speed_mult = 0.2
-		planet_districts_minerals_cost_add = -100
-		planet_stability_add = 5
-	}
-	triggered_modifier = {
-		# lv3
-		potential = {
-			leader_class = governor
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv3
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv4
-			}
-		}
-		planet_researchers_physics_research_produces_mult = 0.04
-		planet_researchers_society_research_produces_mult = 0.04
-		planet_researchers_engineering_research_produces_mult = 0.04
-		planet_district_city_build_speed_mult = 0.2
-		planet_district_generator_build_speed_mult = 0.2
-		planet_district_farming_build_speed_mult = 0.2
-		planet_district_mining_build_speed_mult = 0.2
-		planet_districts_minerals_cost_add = -100
-		planet_stability_add = 5
-	}
-	triggered_modifier = {
-		# lv4
-		potential = {
-			leader_class = governor
-			if = {
-				limit = {
-					has_leader_flag = married
-				}
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-				check_variable = {
-					which = affection
-					value < wg_leader_affection_to_lv5
-				}
-			}
-			else = {
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-			}
-		}
-		planet_researchers_physics_research_produces_mult = 0.08
-		planet_researchers_society_research_produces_mult = 0.08
-		planet_researchers_engineering_research_produces_mult = 0.08
-		planet_district_city_build_speed_mult = 0.2
-		planet_district_generator_build_speed_mult = 0.2
-		planet_district_farming_build_speed_mult = 0.2
-		planet_district_mining_build_speed_mult = 0.2
-		planet_districts_minerals_cost_add = -100
-		planet_stability_add = 5
-	}
-	triggered_modifier = {
-		# lv5
-		potential = {
-			leader_class = governor
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv5
-			}
-			has_leader_flag = married
-		}
-		planet_researchers_physics_research_produces_mult = 0.15
-		planet_researchers_society_research_produces_mult = 0.15
-		planet_researchers_engineering_research_produces_mult = 0.15
-		planet_district_city_build_speed_mult = 1
-		planet_district_generator_build_speed_mult = 1
-		planet_district_farming_build_speed_mult = 1
-		planet_district_mining_build_speed_mult = 1
-		planet_districts_minerals_cost_add = -150
-		planet_stability_add = 5
-		terraform_speed_mult = 0.3
-		planet_decision_enact_speed_mult = 0.15
-	}
-	#admiral
-	triggered_modifier = {
-		# lv2
-		potential = {
-			leader_class = admiral
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv2
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv3
-			}
-		}
-		ship_evasion_add = 5
-		ship_tracking_add = 5
-		ship_accuracy_add = 5
-		ship_shield_mult = 0.5
-		ship_hull_mult = 0.5
-		ship_speed_mult = 0.2
-		ship_hull_regen_add_static = 10
-		ship_armor_regen_add_static = 10
-	}
-	triggered_modifier = {
-		# lv3
-		potential = {
-			leader_class = admiral
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv3
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv4
-			}
-		}
-		ship_evasion_add = 5
-		ship_accuracy_add = 5
-		ship_tracking_add = 5
-		ship_shield_mult = 1
-		ship_hull_mult = 1
-		ship_weapon_damage = 0.2
-		ship_fire_rate_mult = 0.2
-		ship_speed_mult = 0.25
-		ship_hull_regen_add_static = 20
-		ship_armor_regen_add_static = 20
-	}
-	triggered_modifier = {
-		# lv4
-		potential = {
-			leader_class = admiral
-			if = {
-				limit = {
-					has_leader_flag = married
-				}
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-				check_variable = {
-					which = affection
-					value < wg_leader_affection_to_lv5
-				}
-			}
-			else = {
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-			}
-		}
-		ship_evasion_add = 10
-		ship_accuracy_add = 10
-		ship_tracking_add = 10
-		ship_shield_mult = 1.5
-		ship_hull_mult = 1.5
-		ship_weapon_damage = 0.4
-		ship_fire_rate_mult = 0.4
-		ship_speed_mult = 0.3
-		ship_hull_regen_add_static = 30
-		ship_armor_regen_add_static = 30
-	}
-	triggered_modifier = {
-		# lv5
-		potential = {
-			leader_class = admiral
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv5
-			}
-			has_leader_flag = married
-		}
-		ship_evasion_add = 15
-		ship_accuracy_add = 15
-		ship_tracking_add = 15
-		ship_shield_mult = 2.5
-		ship_hull_mult = 2.5
-		ship_weapon_damage = 0.7
-		ship_fire_rate_mult = 0.7
-		ship_speed_mult = 0.5
-		ship_hull_regen_add_static = 50
-		ship_armor_regen_add_static = 50
-	}
-	#scientist
-	triggered_modifier = {
-		# lv2
-		potential = {
-			leader_class = scientist
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv2
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv3
-			}
-		}
-		science_ship_survey_speed = 0.1
-		ship_anomaly_research_speed_mult = 0.1
-		ship_disengage_chance_mult = 0.3
-	}
-	triggered_modifier = {
-		# lv3
-		potential = {
-			leader_class = scientist
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv3
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv4
-			}
-		}
-		science_ship_survey_speed = 0.2
-		ship_anomaly_research_speed_mult = 0.25
-		ship_shield_mult = 0.25
-		ship_armor_mult = 0.25
-		ship_disengage_chance_mult = 0.3
-	}
-	triggered_modifier = {
-		# lv4
-		potential = {
-			leader_class = scientist
-			if = {
-				limit = {
-					has_leader_flag = married
-				}
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-				check_variable = {
-					which = affection
-					value < wg_leader_affection_to_lv5
-				}
-			}
-			else = {
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-			}
-		}
-		science_ship_survey_speed = 0.3
-		ship_anomaly_research_speed_mult = 0.35
-		ship_shield_mult = 0.35
-		ship_armor_mult = 0.35
-		ship_disengage_chance_mult = 0.35
-		ship_anomaly_generation_chance_mult = 0.2
-	}
-	triggered_modifier = {
-		# lv5
-		potential = {
-			leader_class = scientist
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv5
-			}
-			has_leader_flag = married
-		}
-		science_ship_survey_speed = 0.5
-		ship_anomaly_research_speed_mult = 0.5
-		ship_shield_mult = 0.5
-		ship_armor_mult = 0.5
-		ship_disengage_chance_mult = 0.5
-		ship_anomaly_generation_chance_mult = 0.5
-	}
-	#general
-	triggered_modifier = {
-		# lv2
-		potential = {
-			leader_class = general
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv2
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv3
-			}
-		}
-		army_experience_gain_mult = 0.1
-		army_morale_damage_mult = 0.1
-		army_disengage_chance_mult = 0.2
-	}
-	triggered_modifier = {
-		# lv3
-		potential = {
-			leader_class = general
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv3
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv4
-			}
-		}
-		army_experience_gain_mult = 0.25
-		army_morale_damage_mult = 0.25
-		army_disengage_chance_mult = 0.4
-		armies_upkeep_mult = -0.2
-		army_collateral_damage_mult = -0.15		#"陆军连带伤害"
-	}
-	triggered_modifier = {
-		# lv4
-		potential = {
-			leader_class = general
-			if = {
-				limit = {
-					has_leader_flag = married
-				}
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-				check_variable = {
-					which = affection
-					value < wg_leader_affection_to_lv5
-				}
-			}
-			else = {
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-			}
-		}
-		army_experience_gain_mult = 0.5
-		army_morale_damage_mult = 0.5
-		army_disengage_chance_mult = 0.6
-		armies_upkeep_mult = -0.4
-		army_collateral_damage_mult = -0.3		#"陆军连带伤害"
-	}
-	triggered_modifier = {
-		# lv5
-		potential = {
-			leader_class = general
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv5
-			}
-			has_leader_flag = married
-		}
-		army_experience_gain_mult = 0.8
-		army_morale_damage_mult = 0.8
-		army_disengage_chance_mult = 1
-		armies_upkeep_mult = -0.8
-		army_collateral_damage_mult = -0.8		#"陆军连带伤害"
-	}
-	leader_class = {
-		governor
-		admiral
-		scientist
-		general
-	}
-	initial = no
-	randomized = no
-	notify_on_gained = no
-}
+# leader_trait_wg_gray_affection = {
+# 	cost = 0
+# 	inline_script = {
+# 		script = trait/wg_new_leader_affection_trait
+# 		LEADER_TYPE = wg_gray
+# 	}
+# 	#official
+# 	triggered_modifier = {
+# 		# lv2
+# 		potential = {
+# 			leader_class = official
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv2
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv3
+# 			}
+# 		}
+# 		planet_district_city_build_speed_mult = 0.2
+# 		planet_district_generator_build_speed_mult = 0.2
+# 		planet_district_farming_build_speed_mult = 0.2
+# 		planet_district_mining_build_speed_mult = 0.2
+# 		planet_districts_minerals_cost_add = -100
+# 		planet_stability_add = 5
+# 	}
+# 	triggered_modifier = {
+# 		# lv3
+# 		potential = {
+# 			leader_class = official
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv3
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv4
+# 			}
+# 		}
+# 		planet_researchers_physics_research_produces_mult = 0.04
+# 		planet_researchers_society_research_produces_mult = 0.04
+# 		planet_researchers_engineering_research_produces_mult = 0.04
+# 		planet_district_city_build_speed_mult = 0.2
+# 		planet_district_generator_build_speed_mult = 0.2
+# 		planet_district_farming_build_speed_mult = 0.2
+# 		planet_district_mining_build_speed_mult = 0.2
+# 		planet_districts_minerals_cost_add = -100
+# 		planet_stability_add = 5
+# 	}
+# 	triggered_modifier = {
+# 		# lv4
+# 		potential = {
+# 			leader_class = official
+# 			if = {
+# 				limit = {
+# 					has_leader_flag = married
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value < wg_leader_affection_to_lv5
+# 				}
+# 			}
+# 			else = {
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 			}
+# 		}
+# 		planet_researchers_physics_research_produces_mult = 0.08
+# 		planet_researchers_society_research_produces_mult = 0.08
+# 		planet_researchers_engineering_research_produces_mult = 0.08
+# 		planet_district_city_build_speed_mult = 0.2
+# 		planet_district_generator_build_speed_mult = 0.2
+# 		planet_district_farming_build_speed_mult = 0.2
+# 		planet_district_mining_build_speed_mult = 0.2
+# 		planet_districts_minerals_cost_add = -100
+# 		planet_stability_add = 5
+# 	}
+# 	triggered_modifier = {
+# 		# lv5
+# 		potential = {
+# 			leader_class = official
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv5
+# 			}
+# 			has_leader_flag = married
+# 		}
+# 		planet_researchers_physics_research_produces_mult = 0.15
+# 		planet_researchers_society_research_produces_mult = 0.15
+# 		planet_researchers_engineering_research_produces_mult = 0.15
+# 		planet_district_city_build_speed_mult = 1
+# 		planet_district_generator_build_speed_mult = 1
+# 		planet_district_farming_build_speed_mult = 1
+# 		planet_district_mining_build_speed_mult = 1
+# 		planet_districts_minerals_cost_add = -150
+# 		planet_stability_add = 5
+# 		terraform_speed_mult = 0.3
+# 		planet_decision_enact_speed_mult = 0.15
+# 	}
+# 	#admiral
+# 	triggered_modifier = {
+# 		# lv2
+# 		potential = {
+# 			leader_class = admiral
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv2
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv3
+# 			}
+# 		}
+# 		ship_evasion_add = 5
+# 		ship_tracking_add = 5
+# 		ship_accuracy_add = 5
+# 		ship_shield_mult = 0.5
+# 		ship_hull_mult = 0.5
+# 		ship_speed_mult = 0.2
+# 		ship_hull_regen_add_static = 10
+# 		ship_armor_regen_add_static = 10
+# 	}
+# 	triggered_modifier = {
+# 		# lv3
+# 		potential = {
+# 			leader_class = admiral
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv3
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv4
+# 			}
+# 		}
+# 		ship_evasion_add = 5
+# 		ship_accuracy_add = 5
+# 		ship_tracking_add = 5
+# 		ship_shield_mult = 1
+# 		ship_hull_mult = 1
+# 		ship_weapon_damage = 0.2
+# 		ship_fire_rate_mult = 0.2
+# 		ship_speed_mult = 0.25
+# 		ship_hull_regen_add_static = 20
+# 		ship_armor_regen_add_static = 20
+# 	}
+# 	triggered_modifier = {
+# 		# lv4
+# 		potential = {
+# 			leader_class = admiral
+# 			if = {
+# 				limit = {
+# 					has_leader_flag = married
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value < wg_leader_affection_to_lv5
+# 				}
+# 			}
+# 			else = {
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 			}
+# 		}
+# 		ship_evasion_add = 10
+# 		ship_accuracy_add = 10
+# 		ship_tracking_add = 10
+# 		ship_shield_mult = 1.5
+# 		ship_hull_mult = 1.5
+# 		ship_weapon_damage = 0.4
+# 		ship_fire_rate_mult = 0.4
+# 		ship_speed_mult = 0.3
+# 		ship_hull_regen_add_static = 30
+# 		ship_armor_regen_add_static = 30
+# 	}
+# 	triggered_modifier = {
+# 		# lv5
+# 		potential = {
+# 			leader_class = admiral
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv5
+# 			}
+# 			has_leader_flag = married
+# 		}
+# 		ship_evasion_add = 15
+# 		ship_accuracy_add = 15
+# 		ship_tracking_add = 15
+# 		ship_shield_mult = 2.5
+# 		ship_hull_mult = 2.5
+# 		ship_weapon_damage = 0.7
+# 		ship_fire_rate_mult = 0.7
+# 		ship_speed_mult = 0.5
+# 		ship_hull_regen_add_static = 50
+# 		ship_armor_regen_add_static = 50
+# 	}
+# 	#scientist
+# 	triggered_modifier = {
+# 		# lv2
+# 		potential = {
+# 			leader_class = scientist
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv2
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv3
+# 			}
+# 		}
+# 		science_ship_survey_speed = 0.1
+# 		ship_anomaly_research_speed_mult = 0.1
+# 		ship_disengage_chance_mult = 0.3
+# 	}
+# 	triggered_modifier = {
+# 		# lv3
+# 		potential = {
+# 			leader_class = scientist
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv3
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv4
+# 			}
+# 		}
+# 		science_ship_survey_speed = 0.2
+# 		ship_anomaly_research_speed_mult = 0.25
+# 		ship_shield_mult = 0.25
+# 		ship_armor_mult = 0.25
+# 		ship_disengage_chance_mult = 0.3
+# 	}
+# 	triggered_modifier = {
+# 		# lv4
+# 		potential = {
+# 			leader_class = scientist
+# 			if = {
+# 				limit = {
+# 					has_leader_flag = married
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value < wg_leader_affection_to_lv5
+# 				}
+# 			}
+# 			else = {
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 			}
+# 		}
+# 		science_ship_survey_speed = 0.3
+# 		ship_anomaly_research_speed_mult = 0.35
+# 		ship_shield_mult = 0.35
+# 		ship_armor_mult = 0.35
+# 		ship_disengage_chance_mult = 0.35
+# 		ship_anomaly_generation_chance_mult = 0.2
+# 	}
+# 	triggered_modifier = {
+# 		# lv5
+# 		potential = {
+# 			leader_class = scientist
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv5
+# 			}
+# 			has_leader_flag = married
+# 		}
+# 		science_ship_survey_speed = 0.5
+# 		ship_anomaly_research_speed_mult = 0.5
+# 		ship_shield_mult = 0.5
+# 		ship_armor_mult = 0.5
+# 		ship_disengage_chance_mult = 0.5
+# 		ship_anomaly_generation_chance_mult = 0.5
+# 	}
+# 	#general
+# 	triggered_modifier = {
+# 		# lv2
+# 		potential = {
+# 			leader_class = general
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv2
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv3
+# 			}
+# 		}
+# 		army_experience_gain_mult = 0.1
+# 		army_morale_damage_mult = 0.1
+# 		army_disengage_chance_mult = 0.2
+# 	}
+# 	triggered_modifier = {
+# 		# lv3
+# 		potential = {
+# 			leader_class = general
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv3
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv4
+# 			}
+# 		}
+# 		army_experience_gain_mult = 0.25
+# 		army_morale_damage_mult = 0.25
+# 		army_disengage_chance_mult = 0.4
+# 		armies_upkeep_mult = -0.2
+# 		army_collateral_damage_mult = -0.15		#"陆军连带伤害"
+# 	}
+# 	triggered_modifier = {
+# 		# lv4
+# 		potential = {
+# 			leader_class = general
+# 			if = {
+# 				limit = {
+# 					has_leader_flag = married
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value < wg_leader_affection_to_lv5
+# 				}
+# 			}
+# 			else = {
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 			}
+# 		}
+# 		army_experience_gain_mult = 0.5
+# 		army_morale_damage_mult = 0.5
+# 		army_disengage_chance_mult = 0.6
+# 		armies_upkeep_mult = -0.4
+# 		army_collateral_damage_mult = -0.3		#"陆军连带伤害"
+# 	}
+# 	triggered_modifier = {
+# 		# lv5
+# 		potential = {
+# 			leader_class = general
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv5
+# 			}
+# 			has_leader_flag = married
+# 		}
+# 		army_experience_gain_mult = 0.8
+# 		army_morale_damage_mult = 0.8
+# 		army_disengage_chance_mult = 1
+# 		armies_upkeep_mult = -0.8
+# 		army_collateral_damage_mult = -0.8		#"陆军连带伤害"
+# 	}
+# 	leader_class = {
+# 		official
+# 		admiral
+# 		scientist
+# 		general
+# 	}
+# 	initial = no
+# 	randomized = no
+# 	notify_on_gained = no
+# }

common/traits/RG_machine_species_trait.txt

@@ -0,0 +1,61 @@
+rg_machine_maid_trait = {
+	cost = {
+		base = 0
+	}
+	custom_tooltip = TRAIT_PLANTOID_BUDDING_EFFECT
+	initial = no
+	species_potential_add = { always = no }
+	species_possible_remove = { always = no }
+	species_possible_merge_add = { always = no }
+	species_possible_merge_remove = { always = no }
+	randomized = no
+	allowed_archetypes = { MACHINE }
+	sorting_priority = 20
+	potential_crossbreeding_chance = 1.0
+
+	opposites = {
+	}
+
+	modifier = {
+		habitability_floor_add = 0.25
+		pop_housing_usage_mult = -0.9
+	}
+
+	assembling_modifier = {
+		planet_pop_assemblers_nanites_upkeep_add = 0.1
+	}
+	
+	# 在灰风主人国家工作提供加成
+	triggered_pop_modifier = {
+		potential = {
+			exists = owner
+			owner = { is_same_value = event_target:gray_owner }
+		}
+		planet_jobs_produces_mult = 1.1
+	}
+
+	ai_weight = {
+		weight = 0
+	}
+	
+	assembly_score = {
+		modifier = {
+			add = 3
+			from.owner = { is_same_value = event_target:gray_owner }
+		}
+		modifier = {
+			mult = 0
+			from.owner = { 
+				NOT = {
+					is_same_value = event_target:gray_owner
+				}
+			}
+		}
+	
+	
+	}
+	
+	slave_cost = {
+		energy = 1000
+	}
+}

descriptor.mod

@@ -8,5 +8,5 @@ tags={
 }
 name="Real Gray"
 picture="thumbnail.png"
-supported_version="3.9.*"
+supported_version="v3.12.*"
 remote_file_id="2136166095"

events/!_RG_gray_goo_events.txt

@@ -212,11 +212,6 @@ country_event = {
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
-	immediate = {
-		event_target:gray_governor = {
-			set_owner = event_target:rg_gray_country
-		}
-	}
 	option = {
 		name = graygoo.405.a
 		hidden_effect = {
@@ -319,6 +314,7 @@ country_event = {
 			rg_gray_country_init = yes			#创建国家
 		}
 		rg_gray_country_after_init = yes
+		set_country_flag = machine_age_nanites_studied 
 		create_message = {
 			type = MESSAGE_RECRUITED_LEADER
 			localization = "rg_event.2.desc"
@@ -348,7 +344,10 @@ country_event = {
 		is_same_value = event_target:gray_owner
 		NOR = {
 			has_country_flag = gray_constship_active
-			has_country_flag = gray_governor_active
+			OR = {
+				has_country_flag = gray_official_active
+				has_country_flag = gray_governor_active #旧版flag
+			}
 			has_country_flag = gray_warship_active
 			has_country_flag = gray_army_active
 			has_country_flag = gray_reforming
@@ -388,7 +387,10 @@ country_event = {
 			}
 		}
 		is_same_value = event_target:gray_owner
-		has_country_flag = gray_governor_active
+		OR = {
+			has_country_flag = gray_official_active
+			has_country_flag = gray_governor_active #旧版flag
+		}
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -620,9 +622,9 @@ event = {
 					}
 				}
 				AND = {
-					has_country_flag = gray_governor_active
+					has_country_flag = gray_official_active
 					NOT = {
-						exists = event_target:gray_governor
+						exists = event_target:gray_official
 					}
 				}
 				AND = {
@@ -636,7 +638,8 @@ event = {
 	}
 	immediate = {
 		event_target:gray_owner = {
-			remove_country_flag = gray_governor_active			#总督
+			remove_country_flag = gray_official_active #新版flag
+			remove_country_flag = gray_governor_active #旧版flag	#总督
 			remove_country_flag = gray_warship_active			#旗舰
 			remove_country_flag = gray_army_active			#陆军
 			remove_country_flag = gray_constship_active			#科舰
@@ -645,12 +648,8 @@ event = {
 				modifier = "gray_scattered"
 				days = 3600
 			}
-			country_event = {
-				id = graygoo.511
-			}
-			country_event = {
-				id = rg_event.22
-			}
+			country_event = { id = graygoo.511 }
+			country_event = { id = graygoo.512 days = 3600 }
 		}
 	}
 }
@@ -675,11 +674,20 @@ country_event = {
 	desc = "graygoo.512.a.desc"
 	desc = "graygoo.512.b.desc"
 	desc = "graygoo.512.c.desc"
-	diplomatic = yes
+
+	event_window_type = leader_story
+	picture = GFX_evt_gray_gooed_planet
+	picture_event_data = {
+		portrait = event_target:rg_gray_country_leader
+		room = root
+	}
+
 	is_triggered_only = yes
+
 	immediate = {
 		remove_country_flag = gray_reforming
 	}
+
 	option = {
 		name = graygoo.512.a
 	}

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_combat_skill_events.txt

@@ -388,7 +388,7 @@ planet_event = {
 				exists = leader
 				leader = {
 					#leader
-					has_trait = RG_leader_trait_general_gray_skill
+					has_trait = RG_leader_trait_admiral_nanorebuild_gray
 					owner = {
 						#country
 						save_event_target_as = attacking_general_country
@@ -452,7 +452,7 @@ country_event = {
 						exists = leader
 						leader = {
 							OR = {
-								has_trait = RG_leader_trait_general_gray_skill
+								has_trait = RG_leader_trait_admiral_nanorebuild_gray
 							}
 						}
 					}
@@ -547,7 +547,7 @@ country_event = {
 			exists = leader
 			leader = {
 				OR = {
-					has_trait = RG_leader_trait_general_gray_skill
+					has_trait = RG_leader_trait_admiral_nanorebuild_gray
 				}
 			}
 			if = {

events/RG_events.txt

@@ -30,6 +30,11 @@ country_event = {
 			}
 			save_global_event_target_as = origin_rg_gray_country
 			rg_lcluster_spawn_effect = yes
+			country_event = {
+				id = rg_event.18
+				days = 3600
+				random = 12800
+			}
 		}
 		else = {
 			set_country_flag = origin_gray_dragon_country
@@ -859,9 +864,7 @@ country_event = {
 	fire_only_once = yes
 	picture = GFX_evt_drifting_gateway
 	trigger = {
-		mid_game_years_passed >= 0
 		NOT = {
-			is_multiplayer = yes
 			has_global_flag = has_origin_gray_dragon
 		}
 		has_country_flag = origin_rg_gray
@@ -917,6 +920,9 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		name = OK
+	}
 }
 
 
@@ -1039,35 +1045,35 @@ country_event = {
 	}
 }
 
-# looping check for grayreforming
-country_event = {
-	id = rg_event.22
-	hide_window = yes
-	is_triggered_only = yes
-	trigger = {
-		is_same_value = event_target:gray_owner
-		has_country_flag = gray_reforming
-	}
-	immediate = {
-		if = {
-			limit = {
-				NOT = {
-					has_modifier = "gray_scattered"
-				}
-			}
-			country_event = {
-				id = graygoo.512
-			}
-		}
-		else = {
-			country_event = {
-				id = rg_event.22
-				years = 1
-			}
-			# *THIS* looping check
-		}
-	}
-}
+# # looping check for grayreforming
+# country_event = {
+# 	id = rg_event.22
+# 	hide_window = yes
+# 	is_triggered_only = yes
+# 	trigger = {
+# 		is_same_value = event_target:gray_owner
+# 		has_country_flag = gray_reforming
+# 	}
+# 	immediate = {
+# 		if = {
+# 			limit = {
+# 				NOT = {
+# 					has_modifier = "gray_scattered"
+# 				}
+# 			}
+# 			country_event = {
+# 				id = graygoo.512
+# 			}
+# 		}
+# 		else = {
+# 			country_event = {
+# 				id = rg_event.22
+# 				years = 1
+# 			}
+# 			# *THIS* looping check
+# 		}
+# 	}
+# }
 
 # 拆毁工厂小灰通讯
 country_event = {

events/RG_gray_leader_dialog_event.txt

@@ -484,6 +484,80 @@ country_event = {
 	}
 }
 
+country_event = {
+	id = rg_grayleader_dialog.5026
+	title = "graygoo.500.title"
+	desc = "RG_graygoo.502.f.response"
+	event_window_type = leader_recruit
+	picture_event_data = {
+		portrait = event_target:gray_leader_admiral
+		room = "ethic_spaceship_room"
+	}
+	is_triggered_only = yes
+	immediate = {
+		set_country_flag = gray_diplomacy_engaged
+	}
+	after = {
+		hidden_effect = {
+			remove_country_flag = gray_diplomacy_engaged
+		}
+	}
+	option = {
+		name = OK
+	}
+	option = {
+		name = graygoo.500.d
+		tag = hire_leader
+		default_hide_option = yes
+	}
+	option = {
+		name = graygoo.500.prepage
+		tag = dismiss_leader
+		hidden_effect = {
+			country_event = {
+				id = rg_grayleader.1
+			}
+		}
+	}
+}
+
+country_event = {
+	id = rg_grayleader_dialog.5027
+	title = "graygoo.500.title"
+	desc = "RG_graygoo.502.g.response"
+	event_window_type = leader_recruit
+	picture_event_data = {
+		portrait = event_target:gray_leader_admiral
+		room = "ethic_spaceship_room"
+	}
+	is_triggered_only = yes
+	immediate = {
+		set_country_flag = gray_diplomacy_engaged
+	}
+	after = {
+		hidden_effect = {
+			remove_country_flag = gray_diplomacy_engaged
+		}
+	}
+	option = {
+		name = OK
+	}
+	option = {
+		name = graygoo.500.d
+		tag = hire_leader
+		default_hide_option = yes
+	}
+	option = {
+		name = graygoo.500.prepage
+		tag = dismiss_leader
+		hidden_effect = {
+			country_event = {
+				id = rg_grayleader.1
+			}
+		}
+	}
+}
+
 country_event = {
 	id = rg_grayleader_dialog.5031
 	title = "graygoo.500.title"

events/RG_gray_leader_event.txt

@@ -35,7 +35,8 @@ country_event = {
 				is_same_value = event_target:gray_owner
 				NOR = {
 					has_country_flag = gray_constship_active
-					has_country_flag = gray_governor_active
+					has_country_flag = gray_official_active
+					has_country_flag = gray_governor_active #旧版flag
 					has_country_flag = gray_warship_active
 					has_country_flag = gray_army_active
 					has_country_flag = gray_reforming
@@ -60,7 +61,10 @@ country_event = {
 					}
 				}
 				is_same_value = event_target:gray_owner
-				has_country_flag = gray_governor_active
+				OR = {
+					has_country_flag = gray_official_active
+					has_country_flag = gray_governor_active #旧版flag
+				}
 				NOR = {
 					has_country_flag = gray_reforming
 					has_country_flag = gray_diplomacy_engaged
@@ -232,7 +236,8 @@ country_event = {
 		is_same_value = event_target:gray_owner
 		NOR = {
 			has_country_flag = gray_constship_active
-			has_country_flag = gray_governor_active
+			has_country_flag = gray_official_active
+			has_country_flag = gray_governor_active #旧版flag
 			has_country_flag = gray_warship_active
 			has_country_flag = gray_army_active
 			has_country_flag = gray_reforming
@@ -244,8 +249,9 @@ country_event = {
 		name = graygoo.500.a
 		response_text = graygoo.500.a.response
 		trigger = {
-			NOT = {
-				has_country_flag = gray_governor_active
+			NOR = {
+				has_country_flag = gray_official_active
+				has_country_flag = gray_governor_active #旧版flag
 			}
 		}
 		hidden_effect = {
@@ -303,6 +309,54 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+			country_event = {
+				id = rg_grayleader_dialog.5027
+			}
+		}
+	}
 	option = {
 		# help
 		name = rg_help
@@ -356,7 +410,10 @@ country_event = {
 			}
 		}
 		is_same_value = event_target:gray_owner
-		has_country_flag = gray_governor_active
+		OR = {
+			has_country_flag = gray_official_active
+			has_country_flag = gray_governor_active #旧版flag
+		}
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -444,6 +501,46 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_juggernaut_habitat_init = yes
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+			country_event = {
+				id = rg_grayleader_dialog.5027
+			}
+		}
+	}
 	option = {
 		# help
 		name = rg_help
@@ -698,6 +795,54 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+			country_event = {
+				id = rg_grayleader_dialog.5027
+			}
+		}
+	}
 	option = {
 		#升级-2
 		name = rg_levelup_2
@@ -1061,6 +1206,54 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+			country_event = {
+				id = rg_grayleader_dialog.5027
+			}
+		}
+	}
 	option = {
 		# 开启隐形
 		name = rg_event.4.e
@@ -1147,28 +1340,28 @@ country_event = {
 	option = {
 		name = OK
 	}
-	option = {
-		name = rg_graygoo.504.a
-		allow = {
-			has_country_flag = gray_reforming
-			resource_stockpile_compare = {
-				resource = nanites
-				value >= 1000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 50000
-			}
-		}
-		add_resource = {
-			nanites = -1000
-			alloys = -50000
-		}
-		remove_modifier = "gray_scattered"
-		country_event = {
-			id = graygoo.512
-		}
-	}
+	# option = {
+	# 	name = rg_graygoo.504.a
+	# 	allow = {
+	# 		has_country_flag = gray_reforming
+	# 		resource_stockpile_compare = {
+	# 			resource = nanites
+	# 			value >= 1000
+	# 		}
+	# 		resource_stockpile_compare = {
+	# 			resource = alloys
+	# 			value >= 50000
+	# 		}
+	# 	}
+	# 	add_resource = {
+	# 		nanites = -1000
+	# 		alloys = -50000
+	# 	}
+	# 	remove_modifier = "gray_scattered"
+	# 	country_event = {
+	# 		id = graygoo.512
+	# 	}
+	# }
 }
 
 # Main Menu (const)
@@ -1326,6 +1519,54 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+			country_event = {
+				id = rg_grayleader_dialog.5027
+			}
+		}
+	}
 	#	option = { # 开启建造中继器
 	#		name = rg_event.5.e
 	#		trigger = {
@@ -1477,6 +1718,32 @@ country_event = {
 			rg_create_gray_colony_1 = yes
 		}
 	}
+	option = {
+		# 购买巨像
+		name = rg_event.4.h
+		trigger = {
+			NOT = {
+				has_country_flag = gray_reforming
+			}
+		}
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 8000
+			}
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 8000
+			}
+		}
+		add_resource = {
+			energy = -8000
+			alloys = -8000
+		}
+		hidden_effect = {
+			rg_create_gray_planetkiller_testship_1 = yes
+		}
+	}
 	option = {
 		# 没钱了，救救
 		name = rg_event.4.c

events/RG_machine_event.txt

@@ -0,0 +1,94 @@
+namespace = rg_maid
+country_event = {
+	id = rg_maid.1
+	hide_window = yes
+	is_triggered_only = yes
+	immediate = {
+		if = {
+			limit = {
+				NOT = {
+					exist = event_target:rg_maid_species
+				}
+			}
+			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
+				}
+				can_be_modified = yes
+				namelist = root.species
+				effect = {
+					save_event_target_as = rg_maid_species
+				}
+			}
+		}
+		capital_scope = {
+			while = {
+				count = 5
+				create_pop = {
+					species = event_target:rg_maid_species
+				}
+			}
+		}
+	}
+}
+
+# country_event = {
+# 	id = rg_maid.2
+# 	hide_window = yes
+# 	is_triggered_only = yes
+# 	immediate = {
+# 		every_playable_country = {
+# 			limit = {
+# 				any_owned_species = {
+# 					has_trait = rg_machine_maid_trait
+# 				}
+# 			}
+# 			triggered_planet_modifier = {
+# 				potential = {
+# 					can_assemble_budding_pop = yes
+# 				}
+# 				planet_pop_assembly_organic_add = @plantoid_budding_rate
+# 				mult = value:budding_multiplier
+# 			}
+# 		}
+# 		capital_scope = {
+# 			while = {
+# 				count = 5
+# 				create_pop = {
+# 					species = event_target:rg_maid_species
+# 				}
+# 			}
+# 		}
+# 	}
+# }
+
+# planet_event = { #Braiiiins
+# 	id = rg_maid.3
+# 	is_triggered_only = yes
+# 	hide_window = yes
+# 
+# 	trigger = {
+# 		fromfrom = { 
+# 			is_organic_species = yes
+# 			NOT = { has_trait = trait_zombie }
+# 		}
+# 		owner = { has_valid_civic = civic_permanent_employment }
+# 		has_building = building_posthumous_employment_center
+# 	}
+# 
+# 	immediate = {
+# 		fromfrom = {
+# 			make_pop_zombie = yes
+# 		}
+# 	}
+# 	after = {
+# 		fromfrom = {
+# 			clear_pop_category = yes #To make sure that the zombie pop does not spawn as a non worker strata
+# 		}
+# 	}
+# }

events/RG_origin_event.txt

@@ -0,0 +1,150 @@
+namespace = rg_origin
+
+########
+# SCION
+########
+
+country_event = {
+	id = rg_origin.1
+	hide_window = yes
+
+	is_triggered_only = yes
+	trigger = {
+		AND = {
+			has_origin = rg_origin_scion
+			# NOT = { has_global_flag = rg_origin_l_cluster }
+		}
+	}
+
+	immediate = {
+		# Scion
+		country_event = { id = rg_origin.5 }
+	}
+}
+
+
+# Setup
+country_event = {
+	id = rg_origin.5
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	immediate = {
+		# set_country_flag = first_contact_event
+		# set_country_flag = Story2 # Already encountered spacefarers
+		# Spawn mini-FE if player turned off Fallen Empires but picked this Origin anyway...
+		if = {
+			limit = {
+				NOT = {
+					exist = event_target:rg_scion_fe
+				}
+			}
+			set_country_flag = rg_scion_needs_fe
+			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
+					option = ai_servitude
+					cooldown = no
+				}
+				set_policy = {
+					policy = robot_pop_policy
+					option = robot_pops_allowed
+					cooldown = no
+				}
+				random_playable_country = {
+					limit = {
+						has_origin = rg_origin_scion
+						has_country_flag = rg_scion_needs_fe
+					}
+					remove_country_flag = rg_scion_needs_fe
+					save_event_target_as = rg_scion_slave
+				}
+				set_country_flag = rg_scion_master
+				save_event_target_as = rg_scion_master
+				add_opinion_modifier = {
+					who = event_target:rg_scion_slave
+					modifier = opinion_scion
+				}
+				# country_event = { id = origin.20 days = 9000 random = 9000 }
+				event_target:rg_scion_slave = {
+					establish_communications_no_message = event_target:rg_scion_fe
+					set_subject_of = {
+						who = event_target:rg_scion_fe
+						preset = preset_rg_scion
+					}
+					overlord = {
+						add_opinion_modifier = {
+							modifier = opinion_scion
+							who = rg_scion_fe
+						}
+					}
+					country_event = { id = rg_origin.10 days = 3 }
+				}
+			}
+			capital_scope = {
+				solar_system = {
+					set_star_flag = lgate
+					spawn_megastructure = {
+						type = lgate_base
+						orbit_angle = 225
+						orbit_distance = 30
+					}
+				}
+			}
+			# add_extra_hyperlane_to_spawned_system_effect = yes
+		}
+	}
+}
+
+# Intro Diplomatic Message
+country_event = {
+	id = rg_origin.10
+	title = TRANSMISSION
+
+	desc = {
+		text = "origin.10.b.desc"
+	}
+	diplomatic = yes
+	is_triggered_only = yes
+
+	picture_event_data = {
+		portrait = event_target:rg_scion_master
+		planet_background = event_target:rg_scion_master
+		graphical_culture = event_target:rg_scion_master
+		city_level = event_target:rg_scion_master
+		room = event_target:rg_scion_master
+	}
+
+	immediate = {
+		overlord = { save_event_target_as = rg_scion_master }
+	}
+
+	option = {
+		name = origin.10.b
+	}
+}

events/RG_planet_event.txt

@@ -0,0 +1,178 @@
+namespace = rg_planet
+
+##### Virtual Ascension Events
+
+### Create the Unemployed
+### Country scope gatekeeper
+### on_monthly_pulse_country
+country_event = {
+	id = rg_planet.5025
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+		has_country_flag = gray_habitat_active
+		exists = event_target:rg_gray_habitat_target
+		event_target:rg_gray_habitat_target = {
+			is_under_colonization = no
+			NOT = { is_planet_class = pc_cosmogenesis_world }
+			free_jobs > 0
+			NOR = {
+				free_jobs_of_type = {
+					job = mortal_initiate
+					value >= 1
+				}
+				free_jobs_of_type = {
+					category = bio_trophy
+					value >= 1
+				}
+			}
+		}
+	}
+
+	immediate = {
+		event_target:rg_gray_habitat_target = {
+			planet_event = { id = rg_planet.2027 days = 1 }
+		}
+	}
+}
+
+### Create the Unemployed
+### Planet scope gatekeeper
+### on_building_complete, on_building_upgraded, on_building_demolished,
+### on_building_downgraded, on_building_replaced
+### on_district_complete, on_district_demolished
+planet_event = {
+	id = rg_planet.2026
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+		is_same_value = event_target:rg_gray_habitat_target
+		is_under_colonization = no
+		NOT = { is_planet_class = pc_cosmogenesis_world }
+		exists = owner
+		owner = {
+			is_fallen_empire = no
+			has_country_flag = gray_habitat_active
+		}
+		free_jobs > 0
+	}
+
+	immediate = {
+		planet_event = { id = rg_planet.2027 days = 1 }
+	}
+}
+
+### Create the Unemployed
+### Fired by cybernetics.2025 and cybernetics.2026
+planet_event = {
+	id = rg_planet.2027
+	hide_window = yes
+
+	is_triggered_only = yes
+	trigger = {
+		is_same_value = event_target:rg_gray_habitat_target
+		is_under_colonization = no
+		NOT = { is_planet_class = pc_cosmogenesis_world }
+		exists = owner
+		owner = {
+			is_fallen_empire = no
+			has_country_flag = gray_habitat_active
+		}
+		free_jobs > 0
+	}
+
+	immediate = {
+		set_variable = {
+			which = num_pops
+			value = value:num_free_virtual_jobs
+		}
+		# Create pops for every free job
+		while = {
+			count = num_pops
+			create_pop = {
+				species = owner_main_species
+			}
+		}
+		# Kill pops generated in excess (e.g. from forbidden jobs)
+		if = {
+			limit = {
+				any_owned_pop = {
+					is_unemployed = yes
+				}
+			}
+			every_owned_pop = {
+				limit = {
+					is_unemployed = yes
+				}
+				kill_pop = yes
+			}
+		}
+	}
+}
+
+### Kill the unemployed
+### Country scope
+### on_monthly_pulse_country
+country_event = {
+	id = rg_planet.5030
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+		is_fallen_empire = no
+		has_country_flag = gray_habitat_active
+		event_target:rg_gray_habitat_target = {
+			any_owned_pop = {
+				is_unemployed = yes
+			}
+		}
+	}
+
+	immediate = {
+		event_target:rg_gray_habitat_target = {
+			every_owned_pop = {
+				limit = {
+					is_unemployed = yes
+				}
+				kill_pop = yes
+			}
+		}
+	}
+}
+
+### Kill the unemployed
+### Planet scope
+### on_building_complete, on_building_upgraded, on_building_demolished,
+### on_building_downgraded, on_building_replaced
+### on_district_complete, on_district_demolished
+planet_event = {
+	id = rg_planet.2031
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+		exists = owner
+		owner = {
+			is_fallen_empire = no
+			has_country_flag = gray_habitat_active
+		}
+		any_owned_pop = {
+			is_unemployed = yes
+		}
+	}
+
+	immediate = {
+		every_owned_pop = {
+			limit = {
+				is_unemployed = yes
+			}
+			kill_pop = yes
+		}
+	}
+}

events/RG_story_event.txt

@@ -635,7 +635,6 @@ country_event = {
 	id = rg_story.20
 	hide_window = yes
 	is_triggered_only = yes
-	fire_only_once = yes
 	trigger = {
 		exists = event_target:rg_fake_dragon_owner
 		OR = {
@@ -649,8 +648,9 @@ country_event = {
 				leader = {
 					OR = {
 						exists = NO
-						NOT = {
+						NOR = {
 							has_leader_flag = rg_fake_dragon
+							has_leader_flag = rg_fake_dragon_reborn
 						}
 					}
 				}

events/RG_wsg_graygoo_event.txt

@@ -36,7 +36,8 @@ country_event = {
 		is_same_value = event_target:gray_owner
 		NOR = {
 			has_country_flag = gray_constship_active
-			has_country_flag = gray_governor_active
+			has_country_flag = gray_official_active
+			has_country_flag = gray_governor_active #旧版flag
 			has_country_flag = gray_warship_active
 			has_country_flag = gray_army_active
 			has_country_flag = gray_reforming
@@ -49,8 +50,9 @@ country_event = {
 		name = graygoo.500.a
 		response_text = graygoo.500.a.response
 		trigger = {
-			NOT = {
-				has_country_flag = gray_governor_active
+			NOR = {
+				has_country_flag = gray_official_active
+				has_country_flag = gray_governor_active #旧版flag
 			}
 		}
 		allow = {
@@ -238,7 +240,10 @@ country_event = {
 			}
 		}
 		is_same_value = event_target:gray_owner
-		has_country_flag = gray_governor_active
+		OR = {
+			has_country_flag = gray_official_active
+			has_country_flag = gray_governor_active #旧版flag
+		}
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -1220,28 +1225,28 @@ country_event = {
 			}
 		}
 	}
-	option = {
-		name = rg_graygoo.504.a
-		allow = {
-			has_country_flag = gray_reforming
-			resource_stockpile_compare = {
-				resource = nanites
-				value >= 1000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 50000
-			}
-		}
-		add_resource = {
-			nanites = -1000
-			alloys = -50000
-		}
-		remove_modifier = "gray_scattered"
-		country_event = {
-			id = graygoo.512
-		}
-	}
+	# option = {
+	# 	name = rg_graygoo.504.a
+	# 	allow = {
+	# 		has_country_flag = gray_reforming
+	# 		resource_stockpile_compare = {
+	# 			resource = nanites
+	# 			value >= 1000
+	# 		}
+	# 		resource_stockpile_compare = {
+	# 			resource = alloys
+	# 			value >= 50000
+	# 		}
+	# 	}
+	# 	add_resource = {
+	# 		nanites = -1000
+	# 		alloys = -50000
+	# 	}
+	# 	remove_modifier = "gray_scattered"
+	# 	country_event = {
+	# 		id = graygoo.512
+	# 	}
+	# }
 }
 
 # Main Menu (const)

events/z_RG_placeholder_event.txt

@@ -1,22 +1,24 @@
 namespace = wg_affection
 
-country_event = {
-	id = wg_affection.30000
-	title = wg_affection.30000.name
-	desc = wg_affection.30000.desc
-	is_triggered_only = yes
-	diplomatic = yes
-	show_sound = event_wg_wedding
-	custom_gui = wg_gray_commu_window
-	custom_gui_option = wg_gray_commu_option
-
-	immediate = {
-		set_country_flag = married_gray
-	}
-
-	option = {
-		name = wg_affection.30000.a
-		response_text = wg_affection.30000.response
-		change_variable = { which = rankpts value = 2 }
-	}
-}
+# 3.9引用空事件崩溃问题占位
+# 3.10已弃用
+# country_event = {
+# 	id = wg_affection.30000
+# 	title = wg_affection.30000.name
+# 	desc = wg_affection.30000.desc
+# 	is_triggered_only = yes
+# 	diplomatic = yes
+# 	show_sound = event_wg_wedding
+# 	custom_gui = wg_gray_commu_window
+# 	custom_gui_option = wg_gray_commu_option
+# 
+# 	immediate = {
+# 		set_country_flag = married_gray
+# 	}
+# 
+# 	option = {
+# 		name = wg_affection.30000.a
+# 		response_text = wg_affection.30000.response
+# 		change_variable = { which = rankpts value = 2 }
+# 	}
+# }

gfx/portraits/portraits/rg_portraits.txt

@@ -2,10 +2,121 @@ portraits = {
 	Gray = {
 		texturefile = "gfx/models/portraits/Gray.png"
 	}
-	Gray01 = {
-		texturefile = "gfx/models/portraits/Gray01.png"
+	rg_machine_maid01 = {
+		texturefile = "gfx/models/portraits/mamaid01.png"
 	}
-	Gray02 = {
-		texturefile = "gfx/models/portraits/Gray02.png"
+	rg_machine_maid02 = {
+		texturefile = "gfx/models/portraits/mamaid02.png"
+	}
+	rg_machine_maid03 = {
+		texturefile = "gfx/models/portraits/mamaid03.png"
+	}
+	rg_machine_maid04 = {
+		texturefile = "gfx/models/portraits/mamaid04.png"
+	}
+	rg_machine_maid05 = {
+		texturefile = "gfx/models/portraits/mamaid05.png"
+	}
+	rg_machine_maid06 = {
+		texturefile = "gfx/models/portraits/mamaid06.png"
+	}
+	rg_machine_maid07 = {
+		texturefile = "gfx/models/portraits/mamaid07.png"
+	}
+	rg_machine_maid08 = {
+		texturefile = "gfx/models/portraits/mamaid08.png"
+	}
+	rg_machine_maid09 = {
+		texturefile = "gfx/models/portraits/mamaid09.png"
+	}
+}
+
+portrait_groups = {
+	rg_machine_maid = {
+		default = rg_machine_maid01
+		game_setup = { #will run with a limited country scope. species and government is set but the country does not actually exist
+			add = {
+				portraits = {
+					rg_machine_maid01
+					rg_machine_maid02
+					rg_machine_maid03
+					rg_machine_maid04
+					rg_machine_maid05
+					rg_machine_maid06
+					rg_machine_maid07
+					rg_machine_maid08
+					rg_machine_maid09
+				}
+			}
+		}
+
+		#species scope
+		species = { #generic portrait for a species
+			add = {
+				portraits = {
+					rg_machine_maid01
+					rg_machine_maid02
+					rg_machine_maid03
+					rg_machine_maid04
+					rg_machine_maid05
+					rg_machine_maid06
+					rg_machine_maid07
+					rg_machine_maid08
+					rg_machine_maid09
+				}
+			}
+		}
+
+		#pop scope
+		pop = { #for a specific pop
+			add = {
+				portraits = {
+					rg_machine_maid01
+					rg_machine_maid02
+					rg_machine_maid03
+					rg_machine_maid04
+					rg_machine_maid05
+					rg_machine_maid06
+					rg_machine_maid07
+					rg_machine_maid08
+					rg_machine_maid09
+				}
+			}
+		}
+
+		#leader scope
+		leader = { #scientists, generals, admirals, governor
+			add = {
+				portraits = {
+					rg_machine_maid01
+					rg_machine_maid02
+					rg_machine_maid03
+					rg_machine_maid04
+					rg_machine_maid05
+					rg_machine_maid06
+					rg_machine_maid07
+					rg_machine_maid08
+					rg_machine_maid09
+				}
+			}
+		}
+
+
+		#leader scope
+		ruler = {
+			add = {
+				portraits = {
+					rg_machine_maid01
+					rg_machine_maid02
+					rg_machine_maid03
+					rg_machine_maid04
+					rg_machine_maid05
+					rg_machine_maid06
+					rg_machine_maid07
+					rg_machine_maid08
+					rg_machine_maid09
+				}
+			}
+		}
 	}
 }

interface/rg_eventpictures.gfx

@@ -0,0 +1,9 @@
+spriteTypes = {
+
+	spriteType = {
+		name = "GFX_origin_rg_scion"
+		texturefile = "gfx/event_pictures/origins/origin_rg_scion.dds"
+		alwaystransparent = yes
+	}
+	
+}

localisation/simp_chinese/RG_event_l_simp_chinese.yml

@@ -15,7 +15,7 @@
  rg_event.401.desc:0 "什么？不！不，至少……至少……\n\n至少这次放我一马！如果你放过我，我大概会在荒芜星球庞大的地下洞穴中四处游荡……或是去一些田园牧歌的生活……绝不会对你和你的银河造成任何威胁！真的！绝不！就至少……这次就放过我！"
  rg_event.401.a:0 "好吧"
  rg_event.401.b:0 "绝不！"
- rg_event.401.a.response:0 "那！那就这样！在您妈的见！"
+ rg_event.401.a.response:0 "那！那就这样！再您妈的见！"
  rg_event.201.name:0 "第二次生命"
  rg_event.201.desc:0 "在我们杀死了纳米机器人伪装的L星龙之后，对某个纳米机器人星球进行的探测器扫描中，发现其毫无生机的表面又一个奇怪的能源信号。它似乎正试图和我们交流。"
  rg_event.201.a:0 "大不了再来一次！"
@@ -109,6 +109,7 @@
  rg_event.4.b:0 "§H建造武装工程舰§!" 
  rg_event.4.d:0 "§R建造纳米主宰舰§!"
  rg_event.4.g:0 "§H建造模拟殖民舰§!" 
+ rg_event.4.h:0 "§H建造实验级巨像§!" 
  rg_event.4.e:0 "§B开启隐形力场§!" 
  rg_event.4.f:0 "§B关闭隐形力场§!" 
  rg_event.4.c:0 "又没钱了，老婆救救"
@@ -175,6 +176,11 @@
  RG_graygoo.500.e:0 "§Y启动旗舰核心§!"
  RG_graygoo.502.e.response:0 "我能做到。"
 
+ RG_graygoo.500.f:0 "§Y启动空间站核心§!"
+ RG_graygoo.502.f.response:0 "舰体宜居性评估中，全舰核心自检完成。"
+ RG_graygoo.500.g:0 "§Y关闭空间站核心§!"
+ RG_graygoo.502.g.response:0 "启动紧急疏散程序，请稍安勿躁。"
+
 # 2.1 奇怪的巨像
  rg_story.2.desc:0 "哈喽？有空吗？可以来...咳咳、我有一个有趣的东西想给你看......如果没有空也没有关系。不过我保证这个一定很好玩。"
  rg_story.2.a:0 "§G有哦§!"

localisation/simp_chinese/RG_l_simp_chinese.yml

@@ -1,6 +1,10 @@
 l_simp_chinese:
  NAME_Gray:0 "灰风"
+ GRAY_SPECIES:0 "$NAME_Gray$"
+ RG_MACHINE:0 "§Y纳米构造体§!"
  gray_army_desc:0 "$NAME_Gray$和她的纳米作战母舰，可以轻易扫平一颗星球"
+ rg_machine_maid_trait:0 "§Y菠萝包网络§!"
+ rg_machine_maid_trait_desc:0 "这种机械体似乎是由纳米机械所构造的。她们只有有限的个体智能，但每个个体似乎都将心智互相链接组成了一个强大的意识网络。个体的数量越多她们的意识就越强大。"
  RG_leader_trait_admiral_gray:0 "§Y纳米机器个体§!"
  RG_leader_trait_admiral_gray_desc:0 "$NAME_Gray$本质上是由千千万万纳米机械所组成的个体，这让她可以自由变换形态重组或快速修复自身。可不要让她做奇怪的事情哦？"
  RG_leader_trait_admiral_gray_1:0 "§Y纳米机器个体§!"
@@ -9,6 +13,8 @@
  RG_leader_trait_admiral_gray_2_desc:0 "$NAME_Gray$本质上是由千千万万纳米机械所组成的个体，这让她可以自由变换形态重组或快速修复自身。可不要让她做奇怪的事情哦？"
  RG_leader_trait_governor_gray:0 "§Y纳米机器个体§!"
  RG_leader_trait_governor_gray_desc:0 "$NAME_Gray$本质上是由千千万万纳米机械所组成的个体，这让她可以辅助星域资源调度和研究资源调度。可不要让她做奇怪的事情哦？"
+ RG_leader_trait_offical_gray:0 "$RG_leader_trait_governor_gray$"
+ RG_leader_trait_offical_gray_desc:0 "$RG_leader_trait_governor_gray_desc$"
  RG_leader_trait_ruler_gray:0 "§Y天选化身§!"
  RG_leader_trait_ruler_gray_desc:0 "§G$NAME_Gray$会随着领袖等级§!§Y[owner.rg_gray_level]§!§G提升而不断增强力量。§!\n§R当然也会越来越能吃。唔姆，你懂的。§!\n§R领袖等级大于10时纳米机器将超频工作，额外降低£stability£稳定度。§!\n\n§Y被全体国民所认可，可爱又可靠的化身。§!通过授予$NAME_Gray$越来越多的权力和与日俱增的资源倾斜，纳米机器人能够精细调配帝国各项资源产出。然而这种不可持续的发展模式并非没有代价。\n才不是想不出特质名字"
  RG_leader_trait_scientist_gray:0 "§Y纳米机器个体§!"
@@ -17,10 +23,27 @@
  RG_leader_trait_general_gray_desc:0 "$NAME_Gray$本质上是由千千万万纳米机械所组成的个体，这让她可以辅助星域资源调度和研究资源调度。可不要让她做奇怪的事情哦？"
  RG_leader_trait_general_gray_skill:0 "§Y风暴将至§!"
  RG_leader_trait_general_gray_skill_desc:0 "灰色风暴在L星团中席卷无数纪元。倘若风暴再度到来，想必那星球上的人们所看到的景色一定永生难忘吧。"
- RG_leader_trait_tempest_incoming_effect:0 "\n$t$§Y每击杀一个敌军单位§!：\n$tt$§G  额外陆军伤害 +5%§!\n§G  额外陆军生命值 +5%§!$t$\n当前BUFF层数：§G[owner.rg_general_skill_combat_daypassed_variable]§!£time£\n$tt$§G直接击杀一支敌对陆军的概率增加：§!§Y1%§!\n当前概率为：§R[owner.rg_general_skill_combat_killed_variable]%§!"
+ RG_leader_trait_tempest_incoming_effect:0 "$ARMY_EFFECTS_TXT$:\n$t$每击杀一支敌对陆军:\n$tt$$MOD_ARMY_DAMAGE_MULT$: §G+5%§!\n$tt$$MOD_ARMY_HEALTH$: §G+5%§!\n$tt$§Y直接击杀一支敌对陆军的概率§!: §G+1%§!\n$t$当前§YBUFF层数§!: §Y[owner.rg_general_skill_combat_daypassed_variable]§!\n$t$当前§Y直接击杀一支敌对陆军的概率§!为: §Y[owner.rg_general_skill_combat_killed_variable]%§!"
  RG_leader_trait_admiral_nanorebuild_gray:0 "§Y灰质重塑§!"
- RG_leader_trait_admiral_nanorebuild_gray_desc:0 "创造与解构，纳米机器席卷之处我们无所不能。"
- RG_leader_trait_admiral_nanorebuild_effect:0 "\n$t$§Y每击杀一个敌军单位§!：\n$t$§G重组计数器 +1§!\n$t$当前计数器层数：§G[owner.rg_nanorebuild_counter]§!\n$tt$§Y该领袖所在舰队损失舰船时：消耗1计数器层数立即重塑舰船。灰风母舰无法被该技能重组。§!"
+ RG_leader_trait_admiral_nanorebuild_gray_desc:0 "灰色风暴在L星团中席卷无数纪元。\n创造与解构，纳米机器席卷之处我们无所不能。"
+ RG_leader_trait_admiral_nanorebuild_effect:0 "$FLEET_EFFECTS_TXT$:\n$t$每摧毁一艘敌军舰船:\n$tt$§Y重塑计数器层数§!: §G+1§!\n$t$这位领袖所在舰队损失舰船时:\n$tt$消耗§Y重塑计数器层数§!立即重建舰船。\n$t$当前§Y重塑计数器层数§!: §Y[owner.rg_nanorebuild_counter]§!\n$t$§Y$NAME_Gray$§!无法被该技能重建。\n\n$RG_leader_trait_tempest_incoming_effect$"
+
+ preset_rg_scion: "§Y誓约计划国§!"
+ preset_rg_scion_desc: "出于某种不可告人的目的，远古堕落帝国将其视若己出。他们的远古宗主不会允许其誓约国受到任何外部干扰。"
+
+ rg_nanite_leader:0"§Y纳米机器个体§!"
+ rg_nanite_leader_plural:0"§Y纳米机器个体§!"
+ rg_nanite_leader_description:0"§Y本质上是由千千万万纳米机械所组成的个体。因为能做到，所以将无所不能。§!"
+ rg_nanite_leader_plural_with_icon:0"£offical£ $rg_nanite_leader_plural$"
+
+ concept_rg_scion: "$preset_rg_scion$"
+ concept_rg_scion_desc: "$preset_rg_scion_desc$"
+
+ concept_rg_gray: "$NAME_Gray$"
+ concept_rg_gray_desc: "$gray_backstory$"
+
+ RG_leader_trait_ruler_gray_tt:0 "§E随每技能等级提升的效果:§!"
+ RG_leader_trait_variable_tt:0 "§E随变量层数提升的效果:§!"
 
  SMALL_GRAY_MIX_ARMOR:0 "§Y「梦想领域」§!"
  MEDIUM_GRAY_MIX_ARMOR:0 "§Y「梦想领域」§!"
@@ -39,7 +62,10 @@
  RG_gatebuilder_thruster:0 "§Y「漫步星海」§!"
  origin_rg_gray:0 "§Y遥远约定§!"
  origin_rg_gray_desc:0 "你偷偷说服了$NAME_Gray$从遥远的L星团前来看望你"
- origin_tooltip_rg_gray_effects:0 "开局时拥有$NAME_Gray$,并在一个孤立的L-星团中开始你的冒险。你将很难有重见银河的机会。\n\n§R<但...代价是什么？>§！\n§Y- 为防止重复选择，该起源被重复选择时将被替换成隐藏起源§！§H<你也事龙>§！§Y并开局获得全部L星门认知。§！\n§R- 多人游戏中存在重复龙开起源国家，L星团国家将无法触发中期开门事件。§！\n§R- 该起源被AI帝国占用时L-星团将被AI帝国占用。唔，你懂的。§！"
+ origin_tooltip_rg_gray_effects:0 "—开局时获得['concept_rg_gray']的帮助\n—母星系：一个孤立的L-星团中开始你的冒险\n—原$HOME_SYSTEM$通过一个['concept_l_gates']连接到['concept_l_gates']网络中。\n\n§R<但...你将很难有重见银河的机会。>§！\n§Y—该起源无法重复选择。§！\n§Y—该起源被AI帝国占用时L-星团将被AI帝国占用。唔，你懂的§！"
+ rg_origin_scion:0 "§Y未来追迹§!"
+ rg_origin_scion_desc:0 "剧本疑似被什么人改写了。你将在$NAME_Gray$无微不至的监护下成长。"
+ origin_tooltip_rg_scion_effects:0 "开局时将作为['concept_rg_gray']['concept_fallen_empire']的附属国。['concept_rg_gray']将保护你的国家不受外敌侵犯，有时候还会给予你一定的帮助。\n—['concept_rg_gray']['concept_fallen_empire']宗主的['concept_rg_scion', £scion£誓约计划国]\n—$HOME_SYSTEM$通过一个['concept_l_gates']连接到['concept_l_gates']网络中。\n—['concept_rg_gray']['concept_fallen_empire']无视星系设置必定出现在一个孤立的L星团中\n—将会受到['concept_rg_gray']视若己出的保护。\n\n§R<但这同样会成为阻碍你发展的障碍...>§！\n§Y—这是一个未完成的起源。仅供开发测试使用。请不要在正式游戏中使用。§！"
  RG_SHIP_AURA_NANOBOT_CLOUD:0 "§Y「漫播飞尘」§!"
  RG_SHIP_AURA_NANOBOT_CLOUD_DESC:0 "§Y散播希望，还有绝望。§!\n多用途微型纳米机器。$NAME_Gray$可以通过布置一个高浓度纳米机器人场来维修同星系内的友方舰船。"
  RG_BOMBER_HANGAR_AP_BOMB:0 "§Y「落光」§!"
@@ -95,6 +121,15 @@
  RG_Interdictor_ANTIMATTER_REACTOR_DESC:0 "$ANTIMATTER_REACTOR_DESC$"
  RG_Interdictor_ZERO_POINT_REACTOR:0 "$ZERO_POINT_REACTOR$"
  RG_Interdictor_ZERO_POINT_REACTOR_DESC:0 "$ZERO_POINT_REACTOR_DESC$"
+
+ RG_Mothership_FISSION_REACTOR:0 "$FISSION_REACTOR$"
+ RG_Mothership_FISSION_REACTOR_DESC:0 "$FISSION_REACTOR_DESC$"
+ RG_Mothership_FUSION_REACTOR:0 "$FUSION_REACTOR$"
+ RG_Mothership_FUSION_REACTOR_DESC:0 "$FUSION_REACTOR_DESC$"
+ RG_Mothership_COLD_FUSION_REACTOR:0 "$COLD_FUSION_REACTOR$"
+ RG_Mothership_COLD_FUSION_DESC:0 "$COLD_FUSION_DESC$"
+ RG_Mothership_ANTIMATTER_REACTOR:0 "$ANTIMATTER_REACTOR$"
+ RG_Mothership_ANTIMATTER_REACTOR_DESC:0 "$ANTIMATTER_REACTOR_DESC$"
  RG_Mothership_ZERO_POINT_REACTOR:0 "$ZERO_POINT_REACTOR$"
  RG_Mothership_ZERO_POINT_REACTOR_DESC:0 "$ZERO_POINT_REACTOR_DESC$"
 
@@ -146,6 +181,83 @@
  RG_SCIENCE_CLOAKING_1_DESC:0 "$CLOAKING_1_DESC$"
  RG_SCIENCE_CLOAKING_EMPTY:0 "空槽"
 
+ RG_COMBAT_COMPUTER_SWARM_DEFAULT:0 "$COMBAT_COMPUTER_SWARM_DEFAULT$"
+ RG_COMBAT_COMPUTER_SWARM_DEFAULT_DESC:0 "$COMBAT_COMPUTER_SWARM_DEFAULT_DESC$"
+ RG_COMBAT_COMPUTER_PICKET_DEFAULT:0 "$COMBAT_COMPUTER_PICKET_DEFAULT$"
+ RG_COMBAT_COMPUTER_PICKET_DEFAULT_DESC:0 "$COMBAT_COMPUTER_PICKET_DEFAULT_DESC$"
+ RG_COMBAT_COMPUTER_LINE_DEFAULT:0 "$COMBAT_COMPUTER_LINE_DEFAULT$"
+ RG_COMBAT_COMPUTER_LINE_DEFAULT_DESC:0 "$COMBAT_COMPUTER_LINE_DEFAULT_DESC$"
+ RG_COMBAT_COMPUTER_ARTILLERY_DEFAULT:0 "$COMBAT_COMPUTER_ARTILLERY_DEFAULT$"
+ RG_COMBAT_COMPUTER_ARTILLERY_DEFAULT_DESC:0 "$COMBAT_COMPUTER_ARTILLERY_DEFAULT_DESC$"
+ RG_COMBAT_COMPUTER_TORPEDO_DEFAULT:0 "$COMBAT_COMPUTER_TORPEDO_DEFAULT$"
+ RG_COMBAT_COMPUTER_TORPEDO_DEFAULT_DESC:0 "$COMBAT_COMPUTER_TORPEDO_DEFAULT_DESC$"
+
+ RG_COMBAT_COMPUTER_SWARM_BASIC:0 "$COMBAT_COMPUTER_SWARM_BASIC$"
+ RG_COMBAT_COMPUTER_SWARM_BASIC_DESC:0 "$COMBAT_COMPUTER_SWARM_BASIC_DESC$"
+ RG_COMBAT_COMPUTER_SWARM_ADVANCED:0 "$COMBAT_COMPUTER_SWARM_ADVANCED$"
+ RG_COMBAT_COMPUTER_SWARM_ADVANCED_DESC:0 "$COMBAT_COMPUTER_SWARM_ADVANCED_DESC$"
+ RG_COMBAT_COMPUTER_SWARM_SAPIENT:0 "$COMBAT_COMPUTER_SWARM_SAPIENT$"
+ RG_COMBAT_COMPUTER_SWARM_SAPIENT_DESC:0 "$COMBAT_COMPUTER_SWARM_SAPIENT_DESC$"
+ RG_COMBAT_COMPUTER_SWARM_AUTONOMOUS:0 "$COMBAT_COMPUTER_SWARM_AUTONOMOUS$"
+ RG_COMBAT_COMPUTER_SWARM_AUTONOMOUS_DESC:0 "$COMBAT_COMPUTER_SWARM_AUTONOMOUS_DESC$"
+ RG_COMBAT_COMPUTER_SWARM_PRECOG:0 "$COMBAT_COMPUTER_SWARM_PRECOG$"
+ RG_COMBAT_COMPUTER_SWARM_PRECOG_DESC:0 "$COMBAT_COMPUTER_SWARM_PRECOG_DESC$"
+
+ RG_COMBAT_COMPUTER_TORPEDO_BASIC:0 "$COMBAT_COMPUTER_TORPEDO_BASIC$"
+ RG_COMBAT_COMPUTER_TORPEDO_BASIC_DESC:0 "$COMBAT_COMPUTER_TORPEDO_BASIC_DESC$"
+ RG_COMBAT_COMPUTER_TORPEDO_ADVANCED:0 "$COMBAT_COMPUTER_TORPEDO_ADVANCED$"
+ RG_COMBAT_COMPUTER_TORPEDO_ADVANCED_DESC:0 "$COMBAT_COMPUTER_TORPEDO_ADVANCED_DESC$"
+ RG_COMBAT_COMPUTER_TORPEDO_SAPIENT:0 "$COMBAT_COMPUTER_TORPEDO_SAPIENT$"
+ RG_COMBAT_COMPUTER_TORPEDO_SAPIENT_DESC:0 "$COMBAT_COMPUTER_TORPEDO_SAPIENT_DESC$"
+ RG_COMBAT_COMPUTER_TORPEDO_AUTONOMOUS:0 "$COMBAT_COMPUTER_TORPEDO_AUTONOMOUS$"
+ RG_COMBAT_COMPUTER_TORPEDO_AUTONOMOUS_DESC:0 "$COMBAT_COMPUTER_TORPEDO_AUTONOMOUS_DESC$"
+ RG_COMBAT_COMPUTER_TORPEDO_PRECOG:0 "$COMBAT_COMPUTER_TORPEDO_PRECOG$"
+ RG_COMBAT_COMPUTER_TORPEDO_PRECOG_DESC:0 "$COMBAT_COMPUTER_TORPEDO_PRECOG_DESC$"
+
+ RG_COMBAT_COMPUTER_PICKET_BASIC:0 "$COMBAT_COMPUTER_PICKET_BASIC$"
+ RG_COMBAT_COMPUTER_PICKET_BASIC_DESC:0 "$COMBAT_COMPUTER_PICKET_BASIC_DESC$"
+ RG_COMBAT_COMPUTER_PICKET_ADVANCED:0 "$COMBAT_COMPUTER_PICKET_ADVANCED$"
+ RG_COMBAT_COMPUTER_PICKET_ADVANCED_DESC:0 "$COMBAT_COMPUTER_PICKET_ADVANCED_DESC$"
+ RG_COMBAT_COMPUTER_PICKET_SAPIENT:0 "$COMBAT_COMPUTER_PICKET_SAPIENT$"
+ RG_COMBAT_COMPUTER_PICKET_SAPIENT_DESC:0 "$COMBAT_COMPUTER_PICKET_SAPIENT_DESC$"
+ RG_COMBAT_COMPUTER_PICKET_AUTONOMOUS:0 "$COMBAT_COMPUTER_PICKET_AUTONOMOUS$"
+ RG_COMBAT_COMPUTER_PICKET_AUTONOMOUS_DESC:0 "$COMBAT_COMPUTER_PICKET_AUTONOMOUS_DESC$"
+ RG_COMBAT_COMPUTER_PICKET_PRECOG:0 "$COMBAT_COMPUTER_PICKET_PRECOG$"
+ RG_COMBAT_COMPUTER_PICKET_PRECOG_DESC:0 "$COMBAT_COMPUTER_PICKET_PRECOG_DESC$"
+
+ RG_COMBAT_COMPUTER_ARTILLERY_BASIC:0 "$COMBAT_COMPUTER_ARTILLERY_BASIC$"
+ RG_COMBAT_COMPUTER_ARTILLERY_BASIC_DESC:0 "$COMBAT_COMPUTER_ARTILLERY_BASIC_DESC$"
+ RG_COMBAT_COMPUTER_ARTILLERY_ADVANCED:0 "$COMBAT_COMPUTER_ARTILLERY_ADVANCED$"
+ RG_COMBAT_COMPUTER_ARTILLERY_ADVANCED_DESC:0 "$COMBAT_COMPUTER_ARTILLERY_ADVANCED_DESC$"
+ RG_COMBAT_COMPUTER_ARTILLERY_SAPIENT:0 "$COMBAT_COMPUTER_ARTILLERY_SAPIENT$"
+ RG_COMBAT_COMPUTER_ARTILLERY_SAPIENT_DESC:0 "$COMBAT_COMPUTER_ARTILLERY_SAPIENT_DESC$"
+ RG_COMBAT_COMPUTER_ARTILLERY_AUTONOMOUS:0 "$COMBAT_COMPUTER_ARTILLERY_AUTONOMOUS$"
+ RG_COMBAT_COMPUTER_ARTILLERY_AUTONOMOUS_DESC:0 "$COMBAT_COMPUTER_ARTILLERY_AUTONOMOUS_DESC$"
+ RG_COMBAT_COMPUTER_ARTILLERY_PRECOG:0 "$COMBAT_COMPUTER_ARTILLERY_PRECOG$"
+ RG_COMBAT_COMPUTER_ARTILLERY_PRECOG_DESC:0 "$COMBAT_COMPUTER_ARTILLERY_PRECOG_DESC$"
+
+ RG_COMBAT_COMPUTER_LINE_BASIC:0 "$COMBAT_COMPUTER_LINE_BASIC$"
+ RG_COMBAT_COMPUTER_LINE_BASIC_DESC:0 "$COMBAT_COMPUTER_LINE_BASIC_DESC$"
+ RG_COMBAT_COMPUTER_LINE_ADVANCED:0 "$COMBAT_COMPUTER_LINE_ADVANCED$"
+ RG_COMBAT_COMPUTER_LINE_ADVANCED_DESC:0 "$COMBAT_COMPUTER_LINE_ADVANCED_DESC$"
+ RG_COMBAT_COMPUTER_LINE_SAPIENT:0 "$COMBAT_COMPUTER_LINE_SAPIENT$"
+ RG_COMBAT_COMPUTER_LINE_SAPIENT_DESC:0 "$COMBAT_COMPUTER_LINE_SAPIENT_DESC$"
+ RG_COMBAT_COMPUTER_LINE_AUTONOMOUS:0 "$COMBAT_COMPUTER_LINE_AUTONOMOUS$"
+ RG_COMBAT_COMPUTER_LINE_AUTONOMOUS_DESC:0 "$COMBAT_COMPUTER_LINE_AUTONOMOUS_DESC$"
+ RG_COMBAT_COMPUTER_LINE_PRECOG:0 "$COMBAT_COMPUTER_LINE_PRECOG$"
+ RG_COMBAT_COMPUTER_LINE_PRECOG_DESC:0 "$COMBAT_COMPUTER_LINE_PRECOG_DESC$"
+
+ RG_COMBAT_COMPUTER_CARRIER_BASIC:0 "$COMBAT_COMPUTER_CARRIER_BASIC$"
+ RG_COMBAT_COMPUTER_CARRIER_BASIC_DESC:0 "$COMBAT_COMPUTER_CARRIER_BASIC_DESC$"
+ RG_COMBAT_COMPUTER_CARRIER_ADVANCED:0 "$COMBAT_COMPUTER_CARRIER_ADVANCED$"
+ RG_COMBAT_COMPUTER_CARRIER_ADVANCED_DESC:0 "$COMBAT_COMPUTER_CARRIER_ADVANCED_DESC$"
+ RG_COMBAT_COMPUTER_CARRIER_SAPIENT:0 "$COMBAT_COMPUTER_CARRIER_SAPIENT$"
+ RG_COMBAT_COMPUTER_CARRIER_SAPIENT_DESC:0 "$COMBAT_COMPUTER_CARRIER_SAPIENT_DESC$"
+ RG_COMBAT_COMPUTER_CARRIER_AUTONOMOUS:0 "$COMBAT_COMPUTER_CARRIER_AUTONOMOUS$"
+ RG_COMBAT_COMPUTER_CARRIER_AUTONOMOUS_DESC:0 "$COMBAT_COMPUTER_CARRIER_AUTONOMOUS_DESC$"
+ RG_COMBAT_COMPUTER_CARRIER_PRECOG:0 "$COMBAT_COMPUTER_CARRIER_PRECOG$"
+ RG_COMBAT_COMPUTER_CARRIER_PRECOG_DESC:0 "$COMBAT_COMPUTER_CARRIER_PRECOG_DESC$"
+
  RG_ID_wsg_alpha_REACTOR:0 "§Y阿尔法结晶反应堆§!"
  RG_ID_SHIP_THRUSTER_WSG:0 "§Y暗物质α推进器§!"
  RG_ID_SHIP_THRUSTER_WSG_DESC:0 "利用暗物质与阿尔法融合后产生的巨大能量来推动我们的飞船。"
@@ -167,16 +279,16 @@
  RG_ABSLUTEFIELD:0 "§R绝对领域！§!"
  RG_ABSLUTEFIELD_DESC:0 "§R你不要过来啊啊啊啊！！§!"
 
- RG_GrayMotherShip_BEHAVIOR_DESC:0 "§H自由战术：§!$NAME_Gray$会听从你的直接指挥，无视一切敌人执行命令。"
- rg_carrier_BEHAVIOR_DESC:0 "§H航母战术：§!飞船会停留在超视距（§Y400§!），并在战斗开始后尝试后撤。"
- rg_aura_BEHAVIOR_DESC:0 "§H光环战术：§!飞船会停留在超视距（§Y600§!），并在战斗开始后尝试后撤。"
- RG_artillery_BEHAVIOR_DESC:0 "§H炮兵战术：§!飞船会保持在射程内（§Y400§!）开火，并用远距离武器攻击敌人。"
- RG_battle_BEHAVIOR_DESC:0 "§H战列战术：§!飞船会保持在射程内（§Y110§!）开火，并用远距离武器攻击敌人。"
- RG_torpedo_BEHAVIOR_DESC:0 "§H雷击战术：§!飞船会保持在射程内（§Y180§!）开火，并用远距离武器攻击敌人。"
- RG_line_BEHAVIOR_DESC:0 "§H线列战术：§!飞船会尽可能与敌舰保持近距离（§Y50§!），为友军吸收伤害。"
- RG_AA_BEHAVIOR_DESC:0 "§H对空战术：§!飞船会在远距离（§Y150§!）执行舰队防空支援任务，并尝试与敌舰保持距离。"
- RG_COLOSSUS_BEHAVIOR_DESC:0 "§H自由战术：§!飞船会听从你的直接指挥，无视一切敌人执行命令。"
- RG_icebreak_BEHAVIOR_DESC:0 "§H破冰战术：§!飞船会无视一切径直撞向敌舰（§Y1§!）！硬碰硬的较量，我们永不沉没。"
+ RG_GrayMotherShip_BEHAVIOR_DESC:0 "§H自由战术:§!$NAME_Gray$会听从你的直接指挥，无视一切敌人执行命令。"
+ rg_carrier_BEHAVIOR_DESC:0 "§H航母战术:§!飞船会停留在超视距（§Y400§!），并在战斗开始后尝试后撤。"
+ rg_aura_BEHAVIOR_DESC:0 "§H光环战术:§!飞船会停留在超视距（§Y600§!），并在战斗开始后尝试后撤。"
+ RG_artillery_BEHAVIOR_DESC:0 "§H炮兵战术:§!飞船会保持在射程内（§Y400§!）开火，并用远距离武器攻击敌人。"
+ RG_battle_BEHAVIOR_DESC:0 "§H战列战术:§!飞船会保持在射程内（§Y110§!）开火，并用远距离武器攻击敌人。"
+ RG_torpedo_BEHAVIOR_DESC:0 "§H雷击战术:§!飞船会保持在射程内（§Y180§!）开火，并用远距离武器攻击敌人。"
+ RG_line_BEHAVIOR_DESC:0 "§H线列战术:§!飞船会尽可能与敌舰保持近距离（§Y50§!），为友军吸收伤害。"
+ RG_AA_BEHAVIOR_DESC:0 "§H对空战术:§!飞船会在远距离（§Y150§!）执行舰队防空支援任务，并尝试与敌舰保持距离。"
+ RG_COLOSSUS_BEHAVIOR_DESC:0 "§H自由战术:§!飞船会听从你的直接指挥，无视一切敌人执行命令。"
+ RG_icebreak_BEHAVIOR_DESC:0 "§H破冰战术:§!飞船会无视一切径直撞向敌舰（§Y1§!）！硬碰硬的较量，我们永不沉没。"
 
  RG_COMBAT_COMPUTER_CARRIER:0 "§Y$NAME_Gray$作战计算机-航母战术§!"
  RG_COMBAT_COMPUTER_CHARGE:0 "§Y$NAME_Gray$作战计算机-线列战术§!"
@@ -284,10 +396,13 @@
  RG_const_country:0 "$NAME_Gray$-自动工程队"
  requires_rg_graylevel_higherthan_25:0 "§Y$NAME_Gray$必须达到10级§!"
  requires_rg_graylevel_higherthan_20:0 "§Y$NAME_Gray$必须达到20级§!"
- requires_rg_graylevel_higherthan_50:0 "§Y需要前置科技：§!$tech_juggernaut$"
+ requires_rg_graylevel_higherthan_50:0 "§Y需要前置科技:§!$tech_juggernaut$"
  rg_nothing:0 ""
  rg_nothing_desc:0 ""
 
+ pc_rg_grayhabitat: "纳米空间站点"
+ pc_rg_grayhabitat_desc: "一座由纳米机械组成的深空居所，能提供仿佛行星一般的居住体验，具体而言是指行星上的城市区域。完全由纳米机器人组成使得建筑如梦幻般瞬间出现，由纳米机器组成的实体承担着空间站点的一切生产工作。"
+
  rg_ap_nantiematter:0 "§Y纳米物质构成工程§!"
  rg_ap_nantiematter_desc:0 "如果能够对L星门建造者的物质与科技进行一次彻底的构成研究，这些强力的纳米机器将极大的提升我们的军备水平。这需要我们获得足够的L星门认知。"
  rg_ap_nantiematter_tooltip:0 "§Y这表明了一切。§!"
@@ -328,16 +443,16 @@
  RG_CARRIER_RADAR_tool_tip:0 "§H大幅提升舰船开火距离至§!§Y600§H，用于修复超出舰载机射程从而不开火的问题。§!"
  RG_FLAK_PHOENIX_tool_tip:0 "§H距离:§! §Y5§!§H以内的敌舰将会使用舰体撞击。“永不沉没”§!"
  RG_AUTOCONST_HANGER_tool_tip:0 "§H自动工程队模块将会在星系探索完成后自动释放工程舰建造哨站。§!"
- RG_PLANET_KILLER_tool_tip:0 "伤害： §Y35000-350000§!\n冷却： §Y30.00£time£§!\n命中： §Y100%§!\n追踪： §Y100%§!\n射程： §Y0§! ~ §Y800§!\n发射扇面： §Y25§!度\n平均伤害： §Y5250.00/£time£§!\n\n§G+100% 船体伤害§!\n§G+100% 护盾伤害§!\n§G+100% 装甲伤害§!\n§G+100% 护盾穿透§!\n§G+100% 装甲穿透§!\n\n该武器依据目标舰船大小的§G100%§!施加额外的倍乘伤害。"
+ RG_PLANET_KILLER_tool_tip:0 "伤害: §Y35000-350000§!\n冷却: §Y30.00£time£§!\n命中: §Y100%§!\n追踪: §Y100%§!\n射程: §Y0§! ~ §Y800§!\n发射扇面: §Y25§!度\n平均伤害: §Y5250.00/£time£§!\n\n§G+100% 船体伤害§!\n§G+100% 护盾伤害§!\n§G+100% 装甲伤害§!\n§G+100% 护盾穿透§!\n§G+100% 装甲穿透§!\n\n该武器依据目标舰船大小的§G100%§!施加额外的倍乘伤害。"
 
  RG_revive_component:0 "§Y「折纸」§!"
  RG_REVIVE_COMPONENT_tooltip:0 "§H据说能够瞬间重组舰船的神奇设备。真想真正的看一眼。§!"
 
  RG_CORVETTE_CLOAKING_3:0 "§Y「记忆中的流星」§!"
  RG_CORVETTE_CLOAKING_3_DESC:0 "通过$NAME_Gray$精细的能量输入调控，改装过的隐形场能够保留绝大多数的护盾强度的同时提高隐形场强度。但这种改造却无法量产。"
- RG_CLOAKING_3_TOOLTIP:0 "\n隐形时护盾强度削减： §R-10%§!"
+ RG_CLOAKING_3_TOOLTIP:0 "\n隐形时护盾强度削减: §R-10%§!"
 
- TECH_UNLOCK_RG_CLOAKING_3_TITLE: "§H解锁部件：§!$RG_CORVETTE_CLOAKING_3$"
+ TECH_UNLOCK_RG_CLOAKING_3_TITLE: "§H解锁部件:§!$RG_CORVETTE_CLOAKING_3$"
  TECH_UNLOCK_RG_CLOAKING_3_DESC: "§H$RG_CORVETTE_CLOAKING_3$§!\n$tech_gray_cloaking_3_desc$"
 
  rg_gray_army_base:0 "§Y自走纳米机器战体§!"
@@ -354,29 +469,29 @@
  RG_leader_trait_admiral_fake_dragon:0 "§Y龙的灵魂§!"
  RG_leader_trait_admiral_fake_dragon_desc:0 "迷途的灵魂虽然不是龙，却想要化身为龙。你也是龙，也好。"
  RG_leader_trait_admiral_timed_life:0 "§Y计时的生命§!"
- RG_leader_trait_admiral_timed_life_desc:0 "\n§G模拟龙的属性会随着年龄增长。\n$t$§Y每增长一岁提供§!：\n$tt$§G  额外舰船武器伤害 +1%§!\n§G  额外装甲生命值 +1%§!\n§G  额外船体生命值 +1%§!$t$\n当前§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G岁§!\n她是从一次实验中诞生的模拟生命。时间每流逝一个月，她就老去一岁。倘若无法找到永生的方法，脆弱的灵魂就将落叶归根。"
+ RG_leader_trait_admiral_timed_life_desc:0 "\n§G模拟龙的属性会随着年龄增长。\n$t$§Y每增长一岁提供§!:\n$tt$§G  额外舰船武器伤害 +1%§!\n§G  额外装甲生命值 +1%§!\n§G  额外船体生命值 +1%§!$t$\n当前§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G岁§!\n她是从一次实验中诞生的模拟生命。时间每流逝一个月，她就老去一岁。倘若无法找到永生的方法，脆弱的灵魂就将落叶归根。"
 
  RG_leader_trait_admiral_born_tobe_dragon:0 "§Y羽化成龙§!"
- RG_leader_trait_admiral_born_tobe_dragon_desc:0 "\n§G模拟龙的属性会随着年龄增长。\n$t$§Y每增长一岁提供§!：\n$tt$§G  额外舰船武器伤害 +1%§!\n§G  额外装甲生命值 +1%§!\n§G  额外船体生命值 +1%§!$t$\n当前§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G岁§!\n梦想中的龙终于变成了梦想中的样子。传说她一拳打开了壳化身为龙。"
+ RG_leader_trait_admiral_born_tobe_dragon_desc:0 "\n§G模拟龙的属性会随着年龄增长。\n$t$§Y每增长一岁提供§!:\n$tt$§G  额外舰船武器伤害 +1%§!\n§G  额外装甲生命值 +1%§!\n§G  额外船体生命值 +1%§!$t$\n当前§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G岁§!\n梦想中的龙终于变成了梦想中的样子。传说她一拳打开了壳化身为龙。"
 
  rg_fake_dragon_desc:0 "模拟龙是在$NAME_Gray$的神秘实验中诞生的模拟生命。虽然由纳米机器组成但却无法自主控制这些纳米机器。随着纳米机器失去维护能力，模拟龙的未来也变得愈加扑朔迷离。"
- rg_timed_life_millennium:0 "§R千年魂环§!：模拟龙已经一千岁了~恭喜你。然而什么都没有发生！"
- rg_timed_life_millennium_reborn:0 "§Y发光的§!§R千年魂环§!：模拟龙已经一千岁了~§R你是怎么做到的？难道一千年真的如此短暂吗？§!\n你获得了§R废物认证§!~"
+ rg_timed_life_millennium:0 "§R千年魂环§!:模拟龙已经一千岁了~恭喜你。然而什么都没有发生！"
+ rg_timed_life_millennium_reborn:0 "§Y发光的§!§R千年魂环§!:模拟龙已经一千岁了~§R你是怎么做到的？难道一千年真的如此短暂吗？§!\n你获得了§R废物认证§!~"
  RG_sim_dragon_species:0 "伪装的龙"
  RG_SIMULATION_DRAGON_SPECIES:0 "伪装的龙"
 
  MESSAGE_KOGASA_VIRUS_EXTERMINATED:0 "§R检测到伞病毒威胁§!"
- rg_kogasa_exterminated_desc:0 "守护进程检测到$NAME_Gray$人格完整性遭到篡改，污染目标已被净化，处理方案：无害化处理。"
+ rg_kogasa_exterminated_desc:0 "守护进程检测到$NAME_Gray$人格完整性遭到篡改，污染目标已被净化，处理方案:无害化处理。"
 
  situation_rg_gray_mod1:0 "§Y$NAME_Gray$改造工程§!"
  situation_rg_gray_mod1_desc:0 "由于L星团资源太缺乏，$NAME_Gray$的舰体已经很久没有维护了。通过调集足够的资源$NAME_Gray$能够将母舰状态恢复到完全体。为了执行这项计划，$NAME_Gray$需要我们的工程团队的帮助。\n§R切换$NAME_Gray$形态将会导致计划失败。§!"
 
- situation_rg_gray_mod1_stage_1:0 "§Y第一阶段：基本舰体修复阶段§!"
- situation_rg_gray_mod1_stage_2:0 "§Y第二阶段：武器载点重构阶段§!"
- situation_rg_gray_mod1_stage_3:0 "§Y第三阶段：可行性验证阶段§!"
- situation_rg_gray_mod1_stage_4:0 "§Y第四阶段：歼星武器设计阶段§!"
- situation_rg_gray_mod1_stage_5:0 "§Y第五阶段：全舰纳米化设计阶段§!"
- situation_rg_gray_mod1_stage_6:0 "§Y第六阶段：最终试航阶段§!"
+ situation_rg_gray_mod1_stage_1:0 "§Y第一阶段:基本舰体修复阶段§!"
+ situation_rg_gray_mod1_stage_2:0 "§Y第二阶段:武器载点重构阶段§!"
+ situation_rg_gray_mod1_stage_3:0 "§Y第三阶段:可行性验证阶段§!"
+ situation_rg_gray_mod1_stage_4:0 "§Y第四阶段:歼星武器设计阶段§!"
+ situation_rg_gray_mod1_stage_5:0 "§Y第五阶段:全舰纳米化设计阶段§!"
+ situation_rg_gray_mod1_stage_6:0 "§Y第六阶段:最终试航阶段§!"
 
  situation_rg_gray_mod1_stage_1_tooltip:0 "$rg_story.23.desc$"
  situation_rg_gray_mod1_stage_2_tooltip:0 "$rg_story.24.desc$"
@@ -411,20 +526,20 @@
  situation_rg_gray_mod2:0 "§Y$NAME_Gray$旗舰改造工程§!"
  situation_rg_gray_mod2_desc:0 "我们的科学家相信，随着我们对$NAME_Gray$舰体和科技的研究成果的积累，我们能够设计一种巨型的旗舰舰体。如果取得成功，$NAME_Gray$母舰将获得足以匹敌堕落帝国的战斗力。为了这项伟大的项目，我们需要调集巨量的资源。一旦资源准备妥当，项目可以立即开始\n§H这是一项长期工程，因此切换$NAME_Gray$形态不会导致计划失败。§!"
 
- situation_rg_gray_mod2_stage_1:0 "§Y第一阶段：基本力学验证阶段§!"
- situation_rg_gray_mod2_stage_2:0 "§Y第二阶段：纳米构成研究阶段§!"
- situation_rg_gray_mod2_stage_3:0 "§Y第三阶段：工程场地建设阶段§!"
- situation_rg_gray_mod2_stage_4:0 "§Y第四阶段：反应堆稳定研究阶段§!"
- situation_rg_gray_mod2_stage_5:0 "§Y第五阶段：主武器载点设计阶段§!"
- situation_rg_gray_mod2_stage_6:0 "§Y第六阶段：舱室布局设计阶段§!"
- situation_rg_gray_mod2_stage_7:0 "§Y第七阶段：舰体龙骨铺设阶段§!"
- situation_rg_gray_mod2_stage_8:0 "§Y第八阶段：舰体主结构铺设阶段§!"
- situation_rg_gray_mod2_stage_9:0 "§Y第九阶段：超空间引擎验证阶段§!"
- situation_rg_gray_mod2_stage_10:0 "§Y第十阶段：子系统吊装阶段§!"
- situation_rg_gray_mod2_stage_11:0 "§Y第十一阶段：全舰纳米化设计阶段§!"
- situation_rg_gray_mod2_stage_12:0 "§Y第十二阶段：最终试航阶段§!"
- situation_rg_gray_mod2_stage_13:0 "§Y第十三阶段：居住区划设计阶段§!"
- situation_rg_gray_mod2_stage_14:0 "§Y第十四阶段：主宰船坞铺设阶段§!"
+ situation_rg_gray_mod2_stage_1:0 "§Y第一阶段:基本力学验证阶段§!"
+ situation_rg_gray_mod2_stage_2:0 "§Y第二阶段:纳米构成研究阶段§!"
+ situation_rg_gray_mod2_stage_3:0 "§Y第三阶段:工程场地建设阶段§!"
+ situation_rg_gray_mod2_stage_4:0 "§Y第四阶段:反应堆稳定研究阶段§!"
+ situation_rg_gray_mod2_stage_5:0 "§Y第五阶段:主武器载点设计阶段§!"
+ situation_rg_gray_mod2_stage_6:0 "§Y第六阶段:舱室布局设计阶段§!"
+ situation_rg_gray_mod2_stage_7:0 "§Y第七阶段:舰体龙骨铺设阶段§!"
+ situation_rg_gray_mod2_stage_8:0 "§Y第八阶段:舰体主结构铺设阶段§!"
+ situation_rg_gray_mod2_stage_9:0 "§Y第九阶段:超空间引擎验证阶段§!"
+ situation_rg_gray_mod2_stage_10:0 "§Y第十阶段:子系统吊装阶段§!"
+ situation_rg_gray_mod2_stage_11:0 "§Y第十一阶段:全舰纳米化设计阶段§!"
+ situation_rg_gray_mod2_stage_12:0 "§Y第十二阶段:最终试航阶段§!"
+ situation_rg_gray_mod2_stage_13:0 "§Y第十三阶段:居住区划设计阶段§!"
+ situation_rg_gray_mod2_stage_14:0 "§Y第十四阶段:主宰船坞铺设阶段§!"
 
  situation_rg_gray_mod2_stage_1_tooltip:0 "$rg_story.30.desc$"
  situation_rg_gray_mod2_stage_2_tooltip:0 "$rg_story.31.desc$"

localisation/simp_chinese/RG_ships_l_simp_chinese.yml

@@ -30,6 +30,9 @@
  RG_gray_warship_base_key:0 "§Y$NAME_Gray$船体§!"
  RG_gray_capitalship_key:0 "§Y$NAME_Gray$旗舰船体§!"
 
+ RG_graygoo_juggernaut_behind_key:0 "§Y$NAME_Gray$主宰尾翼§!"
+ RG_graygoo_capitalship_behind_key:0 "§Y$NAME_Gray$旗舰尾翼§!"
+
 
 # Fleet names
  NAME_RG_GRAY_scienceship:0 "纳米机器科研单元"
@@ -55,7 +58,7 @@
  RG_icebreaker_interdictor:0 "纳米机器破冰单元"
  NAME_Nanite_Mothership_Carrier:0 "风暴中心"
  NAME_Nanite_Mothership_titan:0 "风暴缔造者"
- RG_RG_ORBITAL_RING_TIER_1_STARBASE:0 "风暴之眼"
+ RG_ORBITAL_RING_TIER_1_STARBASE:0 "风暴之眼"
  NAME_RG_Nanite_Starbase:0 "灰色浪潮"
  NAME_RG_armed_transport_ship:0 "纳米机器压制单元"
  NAME_RG_armed_colony_ship:0 "纳米机器模拟单元"

realgray-stellaris-mod.code-workspace

@@ -0,0 +1,19 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "D:/SteamLibrary/steamapps/common/Stellaris/common"
+		},
+		{
+			"path": "D:/SteamLibrary/steamapps/common/Stellaris/events"
+		},
+		{
+			"path": "D:/SteamLibrary/steamapps/common/Stellaris/gfx"
+		},
+		{
+			"path": "D:/SteamLibrary/steamapps/common/Stellaris/localisation"
+		}
+	]
+}