补

# modified:   common/districts/rg_station_districts.txt
# modified:   common/zones/rg_zones.txt
#

common/bombardment_stances/!_RG_bombardment_stances.txt

@@ -24,6 +24,7 @@
 #		weight = 1
 #	}
 #}
+
 graygoo = {
 	trigger = {
 		owner = {
@@ -32,14 +33,20 @@ graygoo = {
 	}
 	icon_frame = 3
 	default = no
+
 	stop_when_armies_dead = no
+	stop_when_ground_combat = no
 	abduct_pops = no
+
 	planet_damage = 100
 	army_damage = 2
+
 	kill_pop_chance = {
 		base = 3
 	}
 	min_pops_to_kill_pop = 0
+	kill_pop_amount = { min = 0 max = 200 }
+
 	# root = fleet
 	# from = planet
 	ai_weight = {

common/buildings/RG_nano_buildings.txt

@@ -61,7 +61,7 @@ building_rg_nanolab_1 = {
 			# 	is_individual_machine = yes
 			# }
 		}
-		job_nanotech_researcher_add = 8
+		job_nanotech_researcher_add = 800
 	}
 
 	# triggered_desc = {
@@ -153,7 +153,7 @@ building_rg_nanolab_2 = {
 			# 	is_individual_machine = yes
 			# }
 		}
-		job_nanotech_researcher_add = 15
+		job_nanotech_researcher_add = 1500
 	}
 
 	# triggered_desc = {

common/component_templates/RG_shelter_error.txt

@@ -0,0 +1,83 @@
+utility_component_template = {
+	key = "rg_ship_aura_components_empty"
+	size = medium
+	icon = "GFX_ship_part_empty_ftl_drive"
+	icon_frame = 1
+	power = 0
+
+	component_set = "ship_aura_components"
+
+	ai_weight = {
+		weight = 0
+	}
+}
+
+utility_component_template = {
+	key = "rg_power_core_empty"
+	size = medium
+	icon = "GFX_ship_part_empty_ftl_drive"
+	icon_frame = 1
+	power = 0
+
+	component_set = "power_core"
+
+	ai_weight = {
+		weight = 0
+	}
+}
+
+utility_component_template = {
+	key = "rg_ftl_components_empty"
+	size = medium
+	icon = "GFX_ship_part_empty_ftl_drive"
+	icon_frame = 1
+	power = 0
+
+	component_set = "ftl_components"
+
+	ai_weight = {
+		weight = 0
+	}
+}
+
+utility_component_template = {
+	key = "rg_thruster_components_empty"
+	size = medium
+	icon = "GFX_ship_part_empty_ftl_drive"
+	icon_frame = 1
+	power = 0
+
+	component_set = "thruster_components"
+
+	ai_weight = {
+		weight = 0
+	}
+}
+
+utility_component_template = {
+	key = "rg_sensor_component_empty"
+	size = medium
+	icon = "GFX_ship_part_empty_ftl_drive"
+	icon_frame = 1
+	power = 0
+
+	component_set = "sensor_components"
+
+	ai_weight = {
+		weight = 0
+	}
+}
+
+utility_component_template = {
+	key = "rg_combat_computers_empty"
+	size = medium
+	icon = "GFX_ship_part_empty_ftl_drive"
+	icon_frame = 1
+	power = 0
+
+	component_set = "combat_computers"
+
+	ai_weight = {
+		weight = 0
+	}
+}

common/component_templates/RG_ship_parts.txt

@@ -1988,6 +1988,47 @@ utility_component_template = {
 	}
 }
 
+utility_component_template = {
+	key = "RG_STARBASE_AURA_FTL_INHIBITOR"
+	size = medium
+	icon = "GFX_ship_part_aura_snare"
+	icon_frame = 1
+	power = 0
+
+	size_restriction = {
+		RG_gray_juggernaut
+	}
+	prerequisites = { "tech_ftl_inhibitor" }
+	component_set = "ftl_inhibitor"
+
+	ftl_inhibitor = yes
+
+	hostile_aura = {
+		name = "aura_starbase_ftl_inhibitor"
+		system_wide = yes
+
+		stack_info = {
+			id = hostile_flt_inhibitor_aura
+			priority = 10
+		}
+
+		modifier = {
+			ship_emergency_ftl_min_days_mult = 1
+		}
+
+		graphics = {
+			ship_effect = {
+				entity = "ship_aura_negative_entity"
+				dynamic_scale = no
+			}
+		}
+	}
+
+	ai_weight = {
+		weight = 2
+	}
+}
+
 #笨蛋雷达
 weapon_component_template = {
 	key = "RG_ANTIBAKAHALO_RADAR"

common/council_agendas/rg_agenda.txt

@@ -0,0 +1,24 @@
+rg_agenda_nanotech_unstoppable_swarm = {
+    agenda_cost = @base_tradition_agenda_cost
+    allow = {
+        has_tradition = tr_rg_nanotech_adopt
+    }
+    potential = {
+        has_machine_age_dlc = yes
+        OR = {
+            is_individual_machine = yes
+            is_machine_empire = yes
+        }
+        NOR = {
+            has_cybernetic_ascension = yes
+            has_country_flag = modularity_traditions_unlocked
+            has_country_flag = virtuality_traditions_unlocked
+        }
+
+    }
+    modifier = {
+        shipsize_nanite_swarmer_build_speed_mult = 0.20
+        ship_nanite_swarmer_cost_mult = -0.15
+    }
+    finish_modifier = agenda_nanotech_unstoppable_swarm_finish
+}

common/defines/rg_defines.txt

@@ -1,3 +0,0 @@
-# NGameplay = {
-# 	GOVERNMENT_CIVIC_POINTS_BASE		= 3		# Base amount of civic points (to "pay" for government civic costs)
-# }

common/districts/rg_station_districts.txt

@@ -9,6 +9,13 @@ district_rg_city = {
 	is_capped_by_modifier = no
 	exempt_from_ai_planet_specialization = yes
 
+	# TODO_CD: change to real slots
+	zone_slots = {
+		slot_city_government
+		slot_rg_city_01
+		slot_rg_city_02
+	}
+
 	show_on_uncolonized = {
 		exists = from
 		from = { is_regular_empire = yes }
@@ -38,9 +45,9 @@ district_rg_city = {
 	}
 
 	planet_modifier = {
-		planet_housing_add = 25
-		job_enforcer_add = 2
-		planet_max_buildings_add = 2
+		planet_housing_add = 3000
+		job_enforcer_add = @base_district_jobs
+		zone_building_slots_add = 2
 	}
 
 	triggered_planet_modifier = {
@@ -51,7 +58,7 @@ district_rg_city = {
 			}
 		}
 		modifier = {
-			planet_housing_add = -5
+			planet_housing_add = -500
 		}
 	}
 
@@ -64,8 +71,7 @@ district_rg_city = {
 			}
 		}
 		modifier = {
-			job_clerk_add = 2
-			job_culture_worker_add = 1
+			job_clerk_add = 300
 		}
 	}
 
@@ -79,8 +85,7 @@ district_rg_city = {
 			}
 		}
 		modifier = {
-			job_clerk_add = 4
-			job_culture_worker_add = 2
+			job_clerk_add = 600
 		}
 	}
 
@@ -90,7 +95,7 @@ district_rg_city = {
 			owner = { has_active_tradition = tr_prosperity_public_works }
 		}
 		modifier = {
-			planet_housing_add = 5
+			planet_housing_add = 500
 		}
 	}
 
@@ -102,7 +107,7 @@ district_rg_city = {
 			}
 		}
 		modifier = {
-			planet_housing_add = 5
+			planet_housing_add = 500
 		}
 	}
 
@@ -115,7 +120,7 @@ district_rg_city = {
 			}
 		}
 		modifier = {
-			planet_housing_add = 5
+			planet_housing_add = 500
 		}
 	}
 
@@ -144,6 +149,13 @@ district_rg_hive = {
 	is_capped_by_modifier = no
 	exempt_from_ai_planet_specialization = yes
 
+	# TODO_CD: change to real slots
+	zone_slots = {
+		slot_city_government
+		slot_rg_city_01
+		slot_rg_city_02
+	}
+
 	show_on_uncolonized = {
 		exists = from
 		from = { is_hive_empire = yes }
@@ -173,10 +185,9 @@ district_rg_hive = {
 	}
 
 	planet_modifier = {
-		planet_housing_add = 30
-		job_maintenance_drone_add = 15
-		job_synapse_drone_add = 2
-		planet_max_buildings_add = 2
+		planet_housing_add = 3000
+		# job_synapse_drone_add = 2
+		zone_building_slots_add = 2
 	}
 
 	triggered_planet_modifier = {
@@ -185,7 +196,7 @@ district_rg_hive = {
 			owner = { has_technology = tech_housing_1 }
 		}
 		modifier = {
-			planet_housing_add = 5
+			planet_housing_add = 500
 		}
 	}
 
@@ -195,8 +206,8 @@ district_rg_hive = {
 			owner = { has_technology = tech_housing_2 }
 		}
 		modifier = {
-			planet_housing_add = 5
-			job_maintenance_drone_add = 5
+			planet_housing_add = 500
+			job_coordinator_add = @base_district_jobs
 		}
 	}
 
@@ -206,7 +217,7 @@ district_rg_hive = {
 			owner = { has_active_tradition = tr_prosperity_extended_hives }
 		}
 		modifier = {
-			planet_housing_add = 5
+			planet_housing_add = 500
 		}
 	}
 
@@ -227,6 +238,13 @@ district_rg_nexus = {
 	is_capped_by_modifier = no
 	exempt_from_ai_planet_specialization = yes
 
+	# TODO_CD: change to real slots
+	zone_slots = {
+		slot_city_government
+		slot_rg_city_01
+		slot_rg_city_02
+	}
+
 	show_on_uncolonized = {
 		exists = from
 		from = { is_machine_empire = yes }
@@ -256,10 +274,9 @@ district_rg_nexus = {
 	}
 
 	planet_modifier = {
-		planet_housing_add = 25
-		job_maintenance_drone_add = 10
-		job_coordinator_add = 2
-		planet_max_buildings_add = 2
+		planet_housing_add = 3000
+		job_technician_drone_add = @base_district_jobs
+		zone_building_slots_add = 2
 	}
 
 	triggered_planet_modifier = {
@@ -268,7 +285,7 @@ district_rg_nexus = {
 			owner = { has_technology = tech_housing_1 }
 		}
 		modifier = {
-			planet_housing_add = 5
+			planet_housing_add = 500
 		}
 	}
 
@@ -278,18 +295,7 @@ district_rg_nexus = {
 			owner = { has_technology = tech_housing_2 }
 		}
 		modifier = {
-			planet_housing_add = 5
-			job_maintenance_drone_add = 5
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = { has_active_tradition = tr_virtuality_4 }
-		}
-		modifier = {
-			job_maintenance_drone_add = 10
+			planet_housing_add = 500
 		}
 	}
 
@@ -299,7 +305,7 @@ district_rg_nexus = {
 			owner = { has_active_tradition = tr_prosperity_optimized_nexus }
 		}
 		modifier = {
-			planet_housing_add = 5
+			planet_housing_add = 500
 		}
 	}
 
@@ -319,6 +325,11 @@ district_rg_generator = {
 	base_buildtime = 30
 	is_capped_by_modifier = no
 
+	# TODO_CD: change to real slots
+	zone_slots = {
+		slot_rg_city_01
+	}
+
 	show_on_uncolonized = {
 		uses_district_set = rg_station
 		exists = from
@@ -340,66 +351,114 @@ district_rg_generator = {
 		}
 		produces = {
 			energy = 50
-		}
-	}
-
-	triggered_planet_modifier = {
-		planet_housing_add = 10
-	}
-}
-
-district_rg_mining = {
-	icon = district_hab_mining
-	base_buildtime = 30
-	is_capped_by_modifier = no
-
-	show_on_uncolonized = {
-		uses_district_set = rg_station
-		exists = from
-	}
-
-	potential = {
-		exists = owner
-		uses_district_set = rg_station
-	}
-
-	convert_to = {
-	}
-
-	resources = {
-		category = planet_districts
-		cost = {
-			minerals = @rw_cost
-		}
-		upkeep = {
-			energy = 5
-		}
-		produces = {
 			minerals = 50
+			food = 50
 		}
 	}
 
 	triggered_planet_modifier = {
-		planet_housing_add = 10
+		planet_housing_add = 1000
 	}
 }
 
-district_rg_farming = {
-	icon = district_rw_farming
+# district_rg_mining = {
+# 	icon = district_hab_mining
+# 	base_buildtime = 30
+# 	is_capped_by_modifier = no
+# 
+# 	zone_slots = {
+# 		slot_minerals
+# 	}
+# 
+# 	show_on_uncolonized = {
+# 		uses_district_set = rg_station
+# 		exists = from
+# 	}
+# 
+# 	potential = {
+# 		exists = owner
+# 		uses_district_set = rg_station
+# 	}
+# 
+# 	convert_to = {
+# 	}
+# 
+# 	resources = {
+# 		category = planet_districts
+# 		cost = {
+# 			minerals = @rw_cost
+# 		}
+# 		upkeep = {
+# 			energy = 5
+# 		}
+# 		produces = {
+# 			minerals = 50
+# 		}
+# 	}
+# 
+# 	triggered_planet_modifier = {
+# 		planet_housing_add = 1000
+# 	}
+# }
+
+#district_rg_farming = {
+#	icon = district_rw_farming
+#	base_buildtime = 30
+#	is_capped_by_modifier = no
+#
+#	# TODO_CD: change to real slots
+#	zone_slots = {
+#		slot_food
+#	}
+#
+#	show_on_uncolonized = { uses_district_set = rg_station }
+#
+#	potential = {
+#		uses_district_set = rg_station
+#		exists = owner
+#		NOT = {
+#			AND = {
+#				owner = { is_ai = yes }
+#				owner = { country_uses_food = no }
+#			}
+#		}
+#	}
+#
+#	resources = {
+#		category = planet_districts
+#		cost = {
+#			minerals = @rw_cost
+#		}
+#		upkeep = {
+#			energy = 5
+#		}
+#		produces = {
+#			food = 50
+#		}
+#	}
+#
+#	# triggered for tooltip formatting purposes
+#	triggered_planet_modifier = {
+#		modifier = {
+#			planet_housing_add = 1000
+#		}
+#	}
+#}
+
+district_rg_industrial = {
+	icon = district_rw_industrial
 	base_buildtime = 30
 	is_capped_by_modifier = no
 
+	# TODO_CD: change to real slots
+	zone_slots = {
+		slot_rg_city_02
+	}
+
 	show_on_uncolonized = { uses_district_set = rg_station }
 
 	potential = {
 		uses_district_set = rg_station
-		exists = owner
-		NOT = {
-			AND = {
-				owner = { is_ai = yes }
-				owner = { country_uses_food = no }
-			}
-		}
 	}
 
 	resources = {
@@ -409,17 +468,24 @@ district_rg_farming = {
 		}
 		upkeep = {
 			energy = 5
+			minerals = 50
 		}
 		produces = {
-			food = 50
+			nanites = 50
 		}
 	}
 
-	# triggered for tooltip formatting purposes
 	triggered_planet_modifier = {
-		modifier = {
-			planet_housing_add = 10
-		}
+		planet_housing_add = 1000
+	}
+
+	inline_script = {
+		script = jobs/industrial_districts_factory_add
+		AMOUNT = 500
+	}
+	inline_script = {
+		script = jobs/industrial_districts_foundry_add
+		AMOUNT = 500
 	}
 }
 
@@ -428,6 +494,11 @@ district_rg_science = {
 	base_buildtime = 30
 	is_capped_by_modifier = no
 
+	# TODO_CD: change to real slots
+	zone_slots = {
+		slot_rg_city_03
+	}
+
 	show_on_uncolonized = { uses_district_set = rg_station }
 
 	potential = { uses_district_set = rg_station }
@@ -453,12 +524,12 @@ district_rg_science = {
 			minerals = @rw_cost
 		}
 		upkeep = {
-			energy = @rw_maintenance
+			energy = 5
 		}
 	}
 
 	triggered_planet_modifier = {
-		planet_housing_add = 10
+		planet_housing_add = 1000
 	}
 
 	triggered_planet_modifier = {
@@ -467,9 +538,11 @@ district_rg_science = {
 			owner = { is_regular_empire = yes }
 		}
 		modifier = {
-			job_researcher_add = 15
+			job_physicist_add = 1000
+			job_biologist_add = 1000
+			job_engineer_add = 1000
 		}
-	}4
+	}
 
 	triggered_planet_modifier = {
 		potential = {
@@ -477,7 +550,9 @@ district_rg_science = {
 			owner = { is_hive_empire = yes }
 		}
 		modifier = {
-			job_brain_drone_add = 15
+			job_calculator_physicist_add = 1000
+			job_calculator_biologist_add = 1000
+			job_calculator_engineer_add = 1000
 		}
 	}
 
@@ -487,7 +562,9 @@ district_rg_science = {
 			owner = { is_machine_empire = yes }
 		}
 		modifier = {
-			job_calculator_add = 15
+			job_calculator_physicist_add = 1000
+			job_calculator_biologist_add = 1000
+			job_calculator_engineer_add = 1000
 		}
 	}
 
@@ -501,7 +578,9 @@ district_rg_science = {
 				has_active_tradition = tr_virtuality_4
 			}
 		}
-		job_researcher_add = 5
+		job_physicist_add = 500
+		job_biologist_add = 500
+		job_engineer_add = 500
 	}
 
 	triggered_planet_modifier = {
@@ -512,7 +591,9 @@ district_rg_science = {
 				has_active_tradition = tr_virtuality_4
 			}
 		}
-		job_calculator_add = 5
+		job_calculator_physicist_add = 500
+		job_calculator_biologist_add = 500
+		job_calculator_engineer_add = 500
 	}
 
 	triggered_desc = {
@@ -550,111 +631,47 @@ district_rg_science = {
 	}
 }
 
-district_rg_industrial = {
-	icon = district_rw_industrial
-	base_buildtime = 30
-	is_capped_by_modifier = no
-
-	show_on_uncolonized = { uses_district_set = rg_station }
-
-	potential = {
-		uses_district_set = rg_station
-	}
-
-	resources = {
-		category = planet_districts
-		cost = {
-			minerals = @rw_cost
-		}
-		upkeep = {
-			energy = @rw_maintenance
-		}
-		upkeep = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_edict = industrial_maintenance
-				}
-			}
-			energy = 4
-		}
-	}
-
-	triggered_planet_modifier = {
-		planet_housing_add = 10
-	}
-
-	inline_script = {
-		script = jobs/industrial_districts_factory_add
-		AMOUNT = 10
-	}
-
-	inline_script = {
-		script = jobs/industrial_districts_foundry_add
-		AMOUNT = 10
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				is_machine_empire = yes
-				has_edict = industrial_maintenance
-			}
-		}
-		modifier = {
-			job_maintenance_drone_add = 2
-		}
-	}
-
-	triggered_desc = {
-		trigger = {
-			exists = owner
-			owner = {
-				is_machine_empire = yes
-				has_edict = industrial_maintenance
-			}
-		}
-		text = job_maintenance_drone_effect_desc
-	}
-}
-
-district_rg_nanites = {
-	icon = district_rg_nanites
-	base_buildtime = 30
-	is_capped_by_modifier = no
-
-	show_on_uncolonized = {
-		uses_district_set = rg_station
-		exists = from
-	}
-
-	potential = {
-		exists = owner
-		uses_district_set = rg_station
-	}
-
-	convert_to = {
-	}
-
-	resources = {
-		category = planet_districts
-		cost = {
-			minerals = @rw_cost
-		}
-		upkeep = {
-			energy = 5
-			minerals = 40
-		}
-		produces = {
-			nanites = 40
-		}
-	}
-
-	triggered_planet_modifier = {
-		planet_housing_add = 10
-	}
-}
+# district_rg_nanites = {
+# 	icon = district_rg_nanites
+# 	base_buildtime = 30
+# 	is_capped_by_modifier = no
+# 
+# 	# TODO_CD: change to real slots
+# 	zone_slots = {
+# 		slot_city_01
+# 	}
+# 
+# 	show_on_uncolonized = {
+# 		uses_district_set = rg_station
+# 		exists = from
+# 	}
+# 
+# 	potential = {
+# 		exists = owner
+# 		uses_district_set = rg_station
+# 	}
+# 
+# 	convert_to = {
+# 	}
+# 
+# 	resources = {
+# 		category = planet_districts
+# 		cost = {
+# 			minerals = @rw_cost
+# 		}
+# 		upkeep = {
+# 			energy = 5
+# 			minerals = 40
+# 		}
+# 		produces = {
+# 			nanites = 40
+# 		}
+# 	}
+# 
+# 	triggered_planet_modifier = {
+# 		planet_housing_add = 1000
+# 	}
+# }
 
 # district_rg_commercial = {
 # 	icon = district_rw_commercial

common/global_ship_designs/RG_graygoo_ship_designs.txt

@@ -847,8 +847,6 @@ ship_design = {
 	required_component = "RG_gatebuilder_thruster"
 	required_component = "RG_COMBAT_COMPUTER_MotherShip"
 	required_component = "RG_CORVETTE_CLOAKING_3"
-	required_component = "RG_BAKAHALO"
-	required_component = "RG_ANTIBAKAHALO"
 	required_component = "RG_SHIP_AURA_NANOBOT_CLOUD"
 }
 
@@ -1439,10 +1437,8 @@ ship_design = {
 	required_component = "RG_gatebuilder_thruster"
 	required_component = "RG_COMBAT_COMPUTER_MotherShip"
 	required_component = "RG_CORVETTE_CLOAKING_3"
-	required_component = "RG_BAKAHALO"
-	required_component = "RG_ANTIBAKAHALO"
 	required_component = "RG_SHIP_AURA_NANOBOT_CLOUD"
-	required_component = "STARBASE_AURA_FTL_INHIBITOR"
+	required_component = "RG_STARBASE_AURA_FTL_INHIBITOR"
 }
 
 # 航母 1

common/global_ship_designs/RG_ship_designs_starbase.txt

@@ -162,7 +162,7 @@ ship_design = {
 	required_component = "RG_FUSION_NANO_REACTOR_L"
 	required_component = "RG_COMBAT_COMPUTER_COLOSSUS"
 	required_component = "RG_CORVETTE_CLOAKING_3"
-	required_component = "STARBASE_AURA_FTL_INHIBITOR"
+	required_component = "RG_STARBASE_AURA_FTL_INHIBITOR"
 }
 
 # Factory
@@ -338,5 +338,5 @@ ship_design = {
 	required_component = "RG_FUSION_NANO_REACTOR_L"
 	required_component = "COMBAT_COMPUTER_PLATFORM_ADVANCED"
 	required_component = "RG_CORVETTE_CLOAKING_3"
-	required_component = "STARBASE_AURA_FTL_INHIBITOR"
+	required_component = "RG_STARBASE_AURA_FTL_INHIBITOR"
 }

common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt

@@ -0,0 +1,30 @@
+option = {
+    trigger = { has_civic = civic_AG_gray_master }
+    name = AG_dooropen_master.option
+    if = {
+        limit = {
+            any_country = {
+                has_civic = civic_AG_gray
+            }
+        }
+        #do nothing
+    }
+    else_if = {
+        limit = {
+            NOT = {
+                any_country = {
+                    has_civic = civic_AG_gray
+                }
+            }
+            any_country = {
+                has_civic = origin_rg_gray
+            }
+            has_global_flag = has_rg_mod
+        }
+        force_remove_civic = civic_AG_gray_master
+    }
+    else = {
+        country_event = { id = graygoo.499 }
+    }
+}
+

common/inline_scripts/events/rg_graygoo/rg_graygoo.499.txt

@@ -1,25 +0,0 @@
-immediate = {
-	rg_timeline_attract_field_init = yes
-	if = {
-		# 非正常触发补事件
-		limit = {
-			NOT = {
-				exists = event_target:rg_gray_country
-			}
-		}
-		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"
-		days = @toast_message_days
-		target = event_target:rg_gray_country_leader
-		variable = {
-			type = name
-			localization = LEADER
-			scope = event_target:rg_gray_country_leader
-		}
-	}
-}

common/inline_scripts/events/rg_graygoo/rg_graygoo.500.txt

@@ -4,8 +4,7 @@ immediate = {
 after = {
 	hidden_effect = {
 		remove_country_flag = gray_diplomacy_engaged
-		#初始化衣柜
-		reset_gray_cloth = yes
+
 	}
 }
 trigger = {
@@ -125,6 +124,7 @@ option = {
 		NOT = {
 			RG_gray_harbitat_active_trigger = yes
 		}
+		has_country_flag = rg_gray_level_3
 	}
 	allow = {
 	}
@@ -155,15 +155,6 @@ option = {
 		rg_clear_harbitat = yes
 	}
 }
-option = {
-	# help
-	name = rg_help
-	hidden_effect = {
-		country_event = {
-			id = rg_graygoo.4
-		}
-	}
-}
 option = {
 	# 衣柜
 	name = rg_wardrobe
@@ -173,7 +164,6 @@ option = {
 		}
 	}
 }
-inline_script = "events/rg_wsg_marry_gray_option_500_scripts"
 option = {
 	name = graygoo.500.d
 	default_hide_option = yes

common/inline_scripts/events/rg_graygoo/rg_graygoo.501.txt

@@ -42,7 +42,6 @@ immediate = {
 after = {
 	hidden_effect = {
 		remove_country_flag = gray_diplomacy_engaged
-		reset_gray_cloth = yes
 	}
 }
 option = {
@@ -102,6 +101,7 @@ option = {
 		NOT = {
 			RG_gray_harbitat_active_trigger = yes
 		}
+		has_country_flag = rg_gray_level_3
 	}
 	allow = {
 	}
@@ -129,15 +129,6 @@ option = {
 		}
 	}
 }
-option = {
-	# help
-	name = rg_help
-	hidden_effect = {
-		country_event = {
-			id = rg_grayleader.4
-		}
-	}
-}
 option = {
 	# 衣柜
 	name = rg_wardrobe
@@ -147,7 +138,6 @@ option = {
 		}
 	}
 }
-inline_script = "events/rg_wsg_marry_gray_option_scripts"
 option = {
 	name = graygoo.500.d
 	tag = hire_leader

common/inline_scripts/events/rg_graygoo/rg_graygoo.502.txt

@@ -31,7 +31,6 @@ immediate = {
 after = {
 	hidden_effect = {
 		remove_country_flag = gray_diplomacy_engaged
-		reset_gray_cloth = yes
 	}
 }
 option = {
@@ -215,6 +214,7 @@ option = {
 		NOT = {
 			RG_gray_harbitat_active_trigger = yes
 		}
+		has_country_flag = rg_gray_level_3
 	}
 	allow = {
 	}
@@ -329,7 +329,6 @@ option = {
 		}
 	}
 }
-inline_script = "events/rg_wsg_marry_gray_option_scripts"
 option = {
 	name = graygoo.500.d
 	tag = hire_leader

common/inline_scripts/events/rg_graygoo/rg_graygoo.503.txt

@@ -29,7 +29,6 @@ immediate = {
 after = {
 	hidden_effect = {
 		remove_country_flag = gray_diplomacy_engaged
-		reset_gray_cloth = yes
 	}
 }
 option = {
@@ -205,6 +204,7 @@ option = {
 		NOT = {
 			RG_gray_harbitat_active_trigger = yes
 		}
+		has_country_flag = rg_gray_level_3
 	}
 	allow = {
 	}
@@ -288,7 +288,6 @@ option = {
 		}
 	}
 }
-inline_script = "events/rg_wsg_marry_gray_option_scripts"
 option = {
 	name = graygoo.500.d
 	tag = hire_leader

common/inline_scripts/events/rg_graygoo/rg_graygoo.504.txt

@@ -11,7 +11,6 @@ trigger = {
 option = {
 	name = OK
 }
-inline_script = "events/rg_wsg_marry_gray_option_504_scripts"
 # option = {
 # 	name = rg_graygoo.504.a
 # 	allow = {

common/inline_scripts/events/rg_graygoo/rg_graygoo.505.txt

@@ -141,6 +141,7 @@ option = {
 		NOT = {
 			RG_gray_harbitat_active_trigger = yes
 		}
+		has_country_flag = rg_gray_level_3
 	}
 	allow = {
 	}
@@ -176,7 +177,6 @@ option = {
 		}
 	}
 }
-inline_script = "events/rg_wsg_marry_gray_option_scripts"
 #	option = { # 开启建造中继器
 #		name = rg_event.5.e
 #		trigger = {

common/inline_scripts/events/rg_wsg_marry_gray_option_500_scripts.txt

@@ -1,63 +0,0 @@
-option = {
-	name = marry_gray
-	trigger = {
-		RG_OR_has_wsg_mod_trigger = yes
-		check_variable = {
-			which = wg_gray_affection
-			value > @wg_gray_affection_to_lv4
-		}
-		NOT = {
-			has_country_flag = married_gray
-		}
-	}
-	allow = {
-		OR = {
-			AND = {
-				has_wg_special_authority = no
-				resource_stockpile_compare = {
-					resource = sr_living_metal
-					value >= 100
-				}
-				resource_stockpile_compare = {
-					resource = rare_crystals
-					value >= 1000
-				}
-			}
-			custom_tooltip = {
-				check_variable = {
-					which = wsg_rings
-					value >= 1
-				}
-				fail_text = not_enough_engagement_rings
-			}
-		}
-		custom_tooltip = {
-			fail_text = gray_become_ruler
-			NOT = {
-				ruler = {
-					has_leader_flag = "gray_leader"
-				}
-			}
-		}
-	}
-	if = {
-		limit = {
-			has_wg_special_authority = yes
-		}
-		subtract_variable = {
-			which = wsg_rings
-			value = 1
-		}
-	}
-	else = {
-		add_resource = {
-			sr_living_metal = -100
-			rare_crystals = -1000
-		}
-	}
-	hidden_effect = {
-		country_event = {
-			id = wg_affection.30000
-		}
-	}
-}

common/inline_scripts/events/rg_wsg_marry_gray_option_504_scripts.txt

@@ -1,34 +0,0 @@
-option = {
-	name = marry_gray
-	trigger = {
-		RG_OR_has_wsg_mod_trigger = yes
-		check_variable = {
-			which = wg_gray_affection
-			value > @wg_gray_affection_to_lv4
-		}
-		NOT = {
-			has_country_flag = married_gray
-		}
-	}
-	allow = {
-		OR = {
-			has_wg_special_authority = no
-			custom_tooltip = {
-				check_variable = {
-					which = wsg_rings
-					value >= 1
-				}
-				fail_text = not_enough_engagement_rings
-			}
-		}
-	}
-	subtract_variable = {
-		which = wsg_rings
-		value = 1
-	}
-	hidden_effect = {
-		country_event = {
-			id = wg_affection.30000
-		}
-	}
-}

common/inline_scripts/events/rg_wsg_marry_gray_option_scripts.txt

@@ -1,37 +0,0 @@
-option = {
-	name = marry_gray
-	trigger = {
-		RG_OR_has_wsg_mod_trigger = yes
-		check_variable = { which = wg_gray_affection value > @wg_gray_affection_to_lv4 }
-		NOT = { has_country_flag = married_gray }
-	}
-	allow = {
-		OR = {
-			AND = {
-				has_wg_special_authority = no
-				resource_stockpile_compare = {
-					resource = sr_living_metal
-					value >= 100
-				}
-				resource_stockpile_compare = {
-					resource = rare_crystals
-					value >= 1000
-				}
-			}
-			custom_tooltip = {
-				check_variable = { which = wsg_rings value >= 1 }
-				fail_text = not_enough_engagement_rings
-			}
-		}
-	}
-	if = {
-		limit = { has_wg_special_authority = yes }
-		subtract_variable = { which = wsg_rings value = 1 }
-	} else = {
-		add_resource = {
-			sr_living_metal = -100
-			rare_crystals = -1000
-		}
-	}
-	hidden_effect = { country_event = { id = wg_affection.30000 }}
-}

common/inline_scripts/pop_categories/trait_production.txt

@@ -1,138 +0,0 @@
-produces = {
-    trigger = {
-        OR = {
-            has_trait = rg_machine_maid_trait
-        }
-    }
-    nanites = -0.1
-    multiplier = value:rg_maid_trait_mult
-}
-
-# vanilla
-
-produces = {
-    trigger = {
-        OR = {
-            has_trait = trait_lithoid_scintillating
-            has_trait = trait_advanced_scintillating
-        }
-    }
-    rare_crystals = @lithoid_trait_resource_production
-    multiplier = value:lithoid_trait_mult
-}
-
-produces = {
-    trigger = {
-        OR = {
-            has_trait = trait_lithoid_gaseous_byproducts
-            has_trait = trait_advanced_gaseous_byproducts
-        }
-    }
-    exotic_gases = @lithoid_trait_resource_production
-    multiplier = value:lithoid_trait_mult
-}
-
-produces = {
-    trigger = {
-        OR = {
-            has_trait = trait_lithoid_volatile_excretions
-            has_trait = trait_advanced_volatile_excretions
-        }
-    }
-    volatile_motes = @lithoid_trait_resource_production
-    multiplier = value:lithoid_trait_mult
-}
-
-produces = {
-    trigger = {
-        OR = {
-            has_trait = trait_notofthisworld
-            has_trait = trait_robot_notofthisworld
-            has_trait = trait_exd
-        }
-    }
-    physics_research = 0.5
-}
-
-produces = {
-    trigger = {
-        exists = planet
-        planet = {
-            has_modifier = astralnomical_interest_modifier
-        }
-        is_enslaved = no
-        is_robot_pop = no
-    }
-    physics_research = 1
-}
-
-produces = {
-    trigger = {
-        has_trait = trait_cybernetic
-        exists = owner
-        owner = {
-            has_country_flag = driven_neural_chorus
-        }
-    }
-    unity = 0.1
-}
-
-produces = {
-    trigger = {
-        exists = planet
-        planet = {
-            has_modifier = particle_storm_aftermath_modifier_severity_1
-        }
-    }
-    volatile_motes = 0.02
-}
-
-produces = {
-    trigger = {
-        exists = planet
-        planet = {
-            has_modifier = particle_storm_aftermath_modifier_severity_2
-        }
-    }
-    volatile_motes = 0.04
-}
-
-produces = {
-    trigger = {
-        exists = planet
-        planet = {
-            has_modifier = particle_storm_aftermath_modifier_severity_3
-        }
-    }
-    volatile_motes = 0.06
-}
-
-produces = {
-    trigger = {
-        exists = planet
-        planet = {
-            has_modifier = celestial_storm_aftermath_modifier_severity_1
-        }
-    }
-    rare_crystals = 0.02
-}
-
-produces = {
-    trigger = {
-        exists = planet
-        planet = {
-            has_modifier = celestial_storm_aftermath_modifier_severity_2
-        }
-    }
-    rare_crystals = 0.04
-}
-
-produces = {
-    trigger = {
-        exists = planet
-        planet = {
-            has_modifier = celestial_storm_aftermath_modifier_severity_3
-        }
-    }
-    rare_crystals = 0.06
-}

common/leader_classes/RG_leader_classes.txt

@@ -1,103 +0,0 @@
-# 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/megastructures/RG_oribital_ring.txt

@@ -100,14 +100,6 @@ RG_orbital_ring = {
 					has_planet_flag = has_orbital_debris
 				}
 			}
-			if = {
-				limit = {
-					from = {
-						is_ai = yes
-					}
-				}
-				num_pops >= 25
-			}
 		}
 	}
 	# root = system

common/message_types/RG_message_types.txt

@@ -0,0 +1,33 @@
+#message_type = {
+#	key = "CONSTRUCTION_MESSAGE_TYPE"				# Message key, used from code.
+#	icon = "GFX_message_other_construction"			# Sprite to use for gui item "message_icon_button"
+#	icon_frame = 1									# Frame index to use for gui item "message_frame"
+#
+#	name = "MESSAGE_DECLARE_WAR_TITLE"				# Localization key to use for title, if empty it will use "MESSAGE_<key>_TITLE" instead.
+#	sound = "advisor_notification_construction_complete"	# Sound to play on message creation
+#
+#	sound_is_advisor = yes							# Deprecated and does nothing.
+#	ping = "ping_notification_green"				# Ping map to use for map visualization.
+#
+#	hidden_in_message_settings = yes				# If yes, the message type is not shown in the message settings UI (default: no).
+#	category = diplomacy							# Filter category in message settings, valid: 'diplomacy', 'military', 'economy', 'government', 'science', 'fleets', 'planets', 'leaders', 'other' (default: 'other').
+#	message_setting_key = "MESSAGE_DECLARE_WAR_SETTING"	# Localization key to use in message settings, if empty it will use name instead.
+#	default_notification = no						# Is notification enabled by default (default: yes).
+#	default_toast = yes								# Is toast enabled by default (default: no).
+#	default_popup = yes								# Is popup enabled by default (default: no).
+#	default_autopause = yes							# Is auto-pause enabled by default (default: no).
+#}
+
+
+message_type = {
+	key = "MESSAGE_TYPE_RG_GRAY_GOO_LEADER_CHAT"
+	icon = "GFX_toast_leader_acquired"
+
+	name = "MESSAGE_RG_GRAY_GOO_LEADER_CHAT_TITLE"
+	sound = "notification"
+	ping = "ping_notification_red"
+
+	default_toast = yes
+
+	category = leaders
+}

common/on_actions/RG_on_actions.txt

@@ -180,6 +180,16 @@ on_space_battle_won = {
 	}
 }
 
+# This = owner of fleet 1 (winner)
+# From = owner of fleet 2 (loser)
+# FromFrom = fleet 1
+# FromFromFrom = fleet 2
+# Fires when a combat is finished from a lack of enemies
+on_space_battle_over = {
+	events = {
+	}
+}
+
 # This = owner of fleet 1 (loser)
 # From = owner of fleet 2 (winner)
 # FromFrom = fleet 1

common/scripted_effects/RG_event_effects.txt

@@ -7,7 +7,10 @@ rg_event_effect_event1_dragon = {
 			has_leader_flag = rg_fake_dragon
 		}
 		remove_trait = RG_leader_trait_admiral_timed_life
-		add_trait = RG_leader_trait_admiral_born_tobe_dragon
+		add_trait = {
+			trait = RG_leader_trait_admiral_born_tobe_dragon
+			show_message = no
+		}
 		set_leader_flag = rg_fake_dragon_reborn
 		set_age = 0
 	}
@@ -29,33 +32,87 @@ rg_event_effect_event1_dragon = {
 	}
 }
 
-
-
+#fired from rg_event.1
 rg_event_effect_event1_cluster = {
-	if = {
-		limit = {
-			NOT = {
-				has_global_flag = origin_rg_gray_1st_global
-			}
-		}
-		rg_event_effect_event1_gray_cluster = yes
+	#第一个遥远约定起源的全局标记
+	set_global_flag = origin_rg_gray_1st_global
+	#第一个遥远约定起源的国家标记
+	set_country_flag = origin_rg_gray_1st
+	#遥远约定星团起源的国家标记
+	set_country_flag = origin_rg_gray_cluster
+	#设置小灰改造等级初始为1
+	set_country_flag = rg_gray_level_1
+	#给点初始资源免得开局饿死
+	add_resource = {
+		energy = 1000
+		minerals = 1000
+		alloys = 1000
+		consumer_goods = 1000
 	}
-	else = {
-		rg_event_effect_event1_dragon = yes
+	#给遥远群星modifier减跃迁范围防止跳出去
+	add_modifier = {
+		modifier = rg_distant_stars_modifier
 	}
+	#保存成遥远约定起源国家全局target
+	save_global_event_target_as = origin_rg_gray_country
+	#调用小灰打招呼事件
+	country_event = {
+		id = rg_event.2
+		days = 30
+	}
+	# 生成L星团 还没做TODO
+	# rg_lcluster_spawn_effect = yes
+	#计时器十年自动开门事件 还没做TODO
+	# country_event = {
+	# 	id = rg_event.18
+	# 	days = 3600
+	# 	random = 12800
+	# }
 }
-
-rg_event_effect_event1_cluster_galaxy = {
+#fired from rg_event.1
+rg_event_effect_event1_galaxy = {
+	#第一个遥远约定起源的全局标记
+	set_global_flag = origin_rg_gray_1st_global
+	#第一个遥远约定起源的国家标记
+	set_country_flag = origin_rg_gray_1st
+	#遥远约定银河起源的国家标记
+	set_country_flag = origin_rg_gray_galaxy
+	#设置小灰改造等级初始为1
+	set_country_flag = rg_gray_level_1
+	#由于这里用的是玩家自己选的开局星球所以不送资
+	
+	#保存成遥远约定起源国家全局target
+	save_global_event_target_as = origin_rg_gray_country
 	if = {
 		limit = {
-			NOT = {
-				has_global_flag = origin_rg_gray_1st_global
+			#有遥远的故事起源国家,这个条件为什么在这我忘了
+			any_country = {
+				has_origin = origin_Asgray
 			}
 		}
-		rg_event_effect_event1_gray_galaxy = yes
 	}
+	#调用小灰打招呼事件
+	country_event = {
+		id = rg_event.2
+		days = 30
+	}
+	#立刻开门，防止玩家再次进L星团再刨一个小灰出来
 	else = {
-		rg_event_effect_event1_dragon = yes
+		rg_lcluster_spawn_effect = yes
+		capital_scope = {
+			solar_system = {
+				random_neighbor_system = {
+					solar_system = {
+						set_star_flag = lgate
+						spawn_megastructure = {
+							type = lgate_base
+							orbit_angle = 225
+							orbit_distance = 30
+						}
+					}
+				}
+			}
+		}
 	}
 }
 
@@ -65,10 +122,7 @@ rg_event_effect_event1_gray_cluster = {
 	set_country_flag = origin_rg_gray_cluster
 	set_country_flag = origin_rg_gray_1st
 	set_country_flag = rg_gray_level_1
-	country_event = {
-		id = rg_event.2
-		days = 30
-	}
+	rg_event_effect_event1_to_event2_effect = yes
 	add_resource = {
 		energy = 1000
 		minerals = 1000
@@ -92,13 +146,32 @@ rg_event_effect_event1_gray_galaxy = {
 	set_country_flag = origin_rg_gray_galaxy
 	set_country_flag = origin_rg_gray_1st
 	set_country_flag = rg_gray_level_1
-	country_event = {
-		id = rg_event.2
-		days = 30
-	}
+	rg_event_effect_event1_to_event2_effect = yes
 	save_global_event_target_as = origin_rg_gray_country
-	rg_lcluster_spawn_effect = yes
+	if = {
+		limit = {
+			rg_has_ag_origin_trigger = yes
+		}
+	}
+	else = {
+		rg_lcluster_spawn_effect = yes
+		capital_scope = {
+			solar_system = {
+				random_neighbor_system = {
+					solar_system = {
+						set_star_flag = lgate
+						spawn_megastructure = {
+							type = lgate_base
+							orbit_angle = 225
+							orbit_distance = 30
+						}
+					}
+				}
+			}
+		}
+	}
 }
+
 rg_event_effect_lcluster_spawn_selecter = {
 	if = {
 		limit = {
@@ -137,7 +210,9 @@ rg_event_effect_lcluster_open = {
 				has_global_flag = rg_origin_l_cluster						# 遥远约定
 				has_global_flag = gray_origin_activate						# 远星之歌
 				has_global_flag = rg_origin_scion_l_cluster					# 未来追迹
+				rg_has_ag_origin_trigger = yes	# 遥远的故事
 			}
+
 		}
 		country_event = {
 			id = rg_cluster.2
@@ -160,12 +235,12 @@ rg_event_effect_planet2027_spawn_maid_species = {
 				plural = this
 				class = RG_MACHINE
 				portrait = "rg_machine_maid"
-				can_be_modified = no
+				can_be_modified = yes
 				homeworld = this
 				namelist = this
 				gender = this
 				traits = {
-					trait = trait_machine_unit
+					trait = trait_rg_machine_unit
 					trait = rg_machine_maid_trait
 					trait = trait_auto_mod_robotic
 					trait = trait_robot_streamlined_protocols
@@ -173,6 +248,42 @@ rg_event_effect_planet2027_spawn_maid_species = {
 				}
 				effect = {
 					save_global_event_target_as = rg_owner_main_maid_species
+					set_citizenship_type = {
+						type = citizenship_full_rg_maid
+						country = event_target:gray_owner
+					}
+				}
+			}
+		}
+	}
+}
+
+#Species
+rg_event_effect_planet2027_spawn_maid_species_non_gray = {
+	modify_species = {
+		effect = {
+			create_species = {
+				is_mod = yes
+				name = "RG_MACHINE"
+				plural = this
+				class = RG_MACHINE
+				portrait = "rg_machine_maid"
+				can_be_modified = yes
+				homeworld = this
+				namelist = this
+				gender = this
+				traits = {
+					trait = trait_rg_machine_unit
+					trait = rg_machine_maid_trait
+					trait = trait_auto_mod_robotic
+					trait = trait_robot_streamlined_protocols
+					trait = trait_robot_luxurious
+				}
+				effect = {
+					set_citizenship_type = {
+						type = citizenship_full_rg_maid
+						country = event_target:gray_owner
+					}
 				}
 			}
 		}

common/scripted_effects/RG_fallen_empire_effects.txt

@@ -4,7 +4,7 @@ rg_create_fallen_empire_species_effect = {
 		class = RG_MACHINE
 		portrait = "rg_machine_maid"
 		traits = {
-			trait = trait_machine_unit
+			trait = trait_rg_machine_unit
 			trait = trait_robot_domestic_protocols
 			trait = rg_machine_maid_trait
 			trait = trait_auto_mod_robotic
@@ -284,7 +284,7 @@ rg_create_fallen_empire_starting_navy = {
 rg_create_fallen_empire_platform = {
 	if = {
 		limit = {
-			owner = { has_authority = auth_machine_intelligence }
+			owner = { is_machine_empire = yes }
 		}
 		create_ship = {
 			name = random
@@ -297,7 +297,7 @@ rg_create_fallen_empire_platform = {
 rg_create_fallen_empire_colossus = {
 	if = {
 		limit = {
-			owner = { has_authority = auth_machine_intelligence }
+			owner = { is_machine_empire = yes }
 		}
 		create_ship = {
 			name = random
@@ -310,7 +310,7 @@ rg_create_fallen_empire_colossus = {
 rg_create_fallen_empire_titan = {
 	if = {
 		limit = {
-			owner = { has_authority = auth_machine_intelligence }
+			owner = { is_machine_empire = yes }
 		}
 		create_ship = {
 			name = random
@@ -323,7 +323,7 @@ rg_create_fallen_empire_titan = {
 rg_create_fallen_empire_large_ship = {
 	if = {
 		limit = {
-			owner = { has_authority = auth_machine_intelligence }
+			owner = { is_machine_empire = yes }
 		}
 		create_ship = {
 			name = random
@@ -336,7 +336,7 @@ rg_create_fallen_empire_large_ship = {
 rg_create_fallen_empire_small_ship = {
 	if = {
 		limit = {
-			owner = { has_authority = auth_machine_intelligence }
+			owner = { is_machine_empire = yes }
 		}
 		create_ship = {
 			name = random
@@ -349,7 +349,7 @@ rg_create_fallen_empire_small_ship = {
 rg_create_fallen_empire_construction_ship = {
 	if = {
 		limit = {
-			owner = { has_authority = auth_machine_intelligence }
+			owner = { is_machine_empire = yes }
 		}
 		create_ship = {
 			name = random

common/scripted_effects/RG_gray_init_effects.txt

@@ -158,7 +158,7 @@ rg_save_gray_leader_level_effect = {
 			}
 			#导出等级到暂存
 			export_trigger_value_to_variable = {
-				trigger = has_skill
+				trigger = has_base_skill
 				variable = rg_gray_level_temp
 			}
 			#导入变量
@@ -542,6 +542,21 @@ rg_harbitar_size_calculate = {
 	}
 }
 
+rg_habitat_maid_init = {
+	if = {
+		limit = {
+			NOT = {
+				exists = event_target:rg_owner_main_maid_species
+			}
+		}
+		event_target:rg_gray_habitat_target = {
+			every_owned_pop_group = {
+				rg_event_effect_planet2027_spawn_maid_species = yes
+			}
+		}
+	}
+}
+
 #Country event_target:gray_owner
 #创造灰风纳米空间站
 rg_juggernaut_habitat_init = {
@@ -584,16 +599,6 @@ rg_juggernaut_habitat_init = {
 							species = owner_main_species
 							ethos = owner
 						}
-						if = {
-							limit = {
-								NOT = {
-									exists = event_target:rg_owner_main_maid_species
-								}
-							}
-							every_owned_pop = {
-								rg_event_effect_planet2027_spawn_maid_species = yes
-							}
-						}
 						set_name = "NAME_rg_gray_habitat_base"
 						if = {
 							limit = {
@@ -605,22 +610,6 @@ rg_juggernaut_habitat_init = {
 						}
 						set_planet_size = owner.rg_habitat_size
 						generate_start_buildings_and_districts = yes
-						while = {
-							count = 1
-							add_district = district_rg_generator
-						}
-						while = {
-							count = 1
-							add_district = district_rg_mining
-						}
-						while = {
-							count = 1
-							add_district = district_rg_farming
-						}
-						while = {
-							count = 1
-							add_district = district_rg_industrial
-						}
 						if = {
 							limit = {
 								exists = owner
@@ -658,10 +647,20 @@ rg_juggernaut_habitat_init = {
 							}
 						}
 						while = {
-							count = 5
-							create_pop = {
-								species = owner_main_species
-							}
+							count = 1
+							add_district = district_rg_generator
+						}
+						while = {
+							count = 1
+							add_district = district_rg_industrial
+						}
+						while = {
+							count = 1
+							add_district = district_rg_science
+						}
+						create_pop_group = {
+							species = owner_main_species
+							size = 5
 						}
 						set_planet_flag = megastructure
 						set_planet_flag = habitat
@@ -673,6 +672,7 @@ rg_juggernaut_habitat_init = {
 				}
 			}
 		}
+		rg_habitat_maid_init = yes
 		rg_set_gray_harbitat_active_effect = yes
 	}
 }

common/scripted_effects/RG_gray_leader_init_effects.txt

@@ -33,18 +33,33 @@ rg_gray_govener_init = {
 				}
 				if = {
 					limit = {
-							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"
 					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_official_governor
-					add_trait_no_notify = trait_ruler_architectural_sense_3
-					add_trait_no_notify = leader_trait_distribution_lines_2
+					add_trait = {
+						trait = leader_trait_governor_gray
+						show_message = no
+					}
+					add_trait = {
+						trait = RG_leader_trait_ruler_gray
+						show_message = no
+					}
+					add_trait = {
+						trait = subclass_official_governor
+						show_message = no
+					}
+					add_trait = {
+						trait = trait_ruler_architectural_sense_3
+						show_message = no
+					}
+					add_trait = {
+						trait = leader_trait_distribution_lines_2
+						show_message = no
+					}
 					if = {
 						limit = {
 							owner = {
@@ -53,15 +68,33 @@ rg_gray_govener_init = {
 							}
 						}
 						remove_trait = leader_trait_governor_gray
-						add_trait_no_notify = leader_trait_governor_gray_weak
+						add_trait = {
+							trait = leader_trait_governor_gray_weak
+							show_message = no
+						}
 					}
 				}
 				else = {
-					add_trait_no_notify = RG_leader_trait_governor_gray
-					add_trait_no_notify = RG_leader_trait_ruler_gray
-					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
+					add_trait = {
+						trait = RG_leader_trait_governor_gray
+						show_message = no
+					}
+					add_trait = {
+						trait = RG_leader_trait_ruler_gray
+						show_message = no
+					}
+					add_trait = {
+						trait = subclass_official_governor
+						show_message = no
+					}
+					add_trait = {
+						trait = trait_ruler_architectural_sense_3
+						show_message = no
+					}
+					add_trait = {
+						trait = leader_trait_distribution_lines_2
+						show_message = no
+					}
 				}
 			}
 		}
@@ -92,11 +125,16 @@ rg_gray_govener_init = {
 				}
 				if = {
 					limit = {
-						owner = { has_country_flag = married_gray }
+						owner = {
+							has_country_flag = married_gray
+						}
 					}
 					set_leader_flag = married
 				}
-				set_variable = { which = affection value = owner.wg_gray_affection }
+				set_variable = {
+					which = affection
+					value = owner.wg_gray_affection
+				}
 			}
 			# if = {
 			# 	limit = {
@@ -113,7 +151,6 @@ rg_gray_govener_init = {
 			rg_set_gray_portrait = yes
 		}
 	}
-	
 }
 
 rg_gray_commander_init = {
@@ -151,14 +188,17 @@ rg_gray_commander_init = {
 				}
 				if = {
 					limit = {
-							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
 					set_leader_flag = gray_leader
-					add_trait_no_notify = gray_admiral
+					add_trait = {
+						trait = gray_admiral
+						show_message = no
+					}
 					if = {
 						limit = {
 							owner = {
@@ -167,19 +207,40 @@ rg_gray_commander_init = {
 							}
 						}
 						remove_trait = gray_admiral
-						add_trait_no_notify = leader_trait_admiral_gray_weak
+						add_trait = {
+							trait = leader_trait_admiral_gray_weak
+							show_message = no
+						}
 						# 缺少特质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
+				add_trait = {
+					trait = RG_leader_trait_admiral_gray
+					show_message = no
+				}
+				add_trait = {
+					trait = RG_leader_trait_admiral_nanorebuild_gray
+					show_message = no
+				}
 				# add_trait_no_notify = RG_leader_trait_general_gray_skill
 				# 缺少特质RG_leader_trait_admiral_gray将导致小灰改造项目无法完成
-				add_trait_no_notify = subclass_commander_councilor
-				add_trait_no_notify = leader_trait_carrier_specialization
-				add_trait_no_notify = leader_trait_juryrigger_2
-				add_trait_no_notify = leader_trait_reinforcer_2
+				add_trait = {
+					trait = subclass_commander_councilor
+					show_message = no
+				}
+				add_trait = {
+					trait = leader_trait_carrier_specialization
+					show_message = no
+				}
+				add_trait = {
+					trait = leader_trait_juryrigger_2
+					show_message = no
+				}
+				add_trait = {
+					trait = leader_trait_reinforcer_2
+					show_message = no
+				}
 			}
 		}
 		last_created_leader = {
@@ -209,11 +270,16 @@ rg_gray_commander_init = {
 				}
 				if = {
 					limit = {
-						owner = { has_country_flag = married_gray }
+						owner = {
+							has_country_flag = married_gray
+						}
 					}
 					set_leader_flag = married
 				}
-				set_variable = { which = affection value = owner.wg_gray_affection }
+				set_variable = {
+					which = affection
+					value = owner.wg_gray_affection
+				}
 			}
 			# add_trait_no_notify = leader_trait_admiral_wg_gray_affection
 			# if = {
@@ -234,6 +300,7 @@ rg_gray_commander_init = {
 	RG_leader_trait_admiral_nanorebuild_gray_counter_init_effect = yes
 	RG_leader_trait_general_tempest_incoming_counter_init_effect = yes
 }
+
 # 
 # rg_gray_admiral_init = {
 # 	event_target:rg_gray_country = {
@@ -457,7 +524,6 @@ rg_gray_commander_init = {
 # 	}
 # 	
 # }
-
 rg_gray_scientist_init = {
 	event_target:rg_gray_country = {
 		create_leader = {
@@ -530,11 +596,16 @@ rg_gray_scientist_init = {
 				}
 				if = {
 					limit = {
-						owner = { has_country_flag = married_gray }
+						owner = {
+							has_country_flag = married_gray
+						}
 					}
 					set_leader_flag = married
 				}
-				set_variable = { which = affection value = owner.wg_gray_affection }
+				set_variable = {
+					which = affection
+					value = owner.wg_gray_affection
+				}
 			}
 			# add_trait_no_notify = leader_trait_admiral_wg_gray_affection
 			# if = {
@@ -552,7 +623,6 @@ rg_gray_scientist_init = {
 			rg_set_gray_portrait = yes
 		}
 	}
-	
 }
 
 rg_gray_country_leader_init = {
@@ -593,18 +663,48 @@ rg_gray_country_leader_init = {
 				# 暂时和小灰网络断开连接
 				# 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_official_governor
-				add_trait_no_notify = trait_ruler_architectural_sense_3
-				add_trait_no_notify = leader_trait_distribution_lines_2
+				add_trait = {
+					trait = leader_trait_governor_gray
+					show_message = no
+				}
+				add_trait = {
+					trait = RG_leader_trait_ruler_gray
+					show_message = no
+				}
+				add_trait = {
+					trait = subclass_official_governor
+					show_message = no
+				}
+				add_trait = {
+					trait = trait_ruler_architectural_sense_3
+					show_message = no
+				}
+				add_trait = {
+					trait = leader_trait_distribution_lines_2
+					show_message = no
+				}
 			}
 			else = {
-				add_trait_no_notify = RG_leader_trait_governor_gray
-				add_trait_no_notify = RG_leader_trait_ruler_gray
-				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
+				add_trait = {
+					trait = RG_leader_trait_governor_gray
+					show_message = no
+				}
+				add_trait = {
+					trait = RG_leader_trait_ruler_gray
+					show_message = no
+				}
+				add_trait = {
+					trait = subclass_official_governor
+					show_message = no
+				}
+				add_trait = {
+					trait = trait_ruler_architectural_sense_3
+					show_message = no
+				}
+				add_trait = {
+					trait = leader_trait_distribution_lines_2
+					show_message = no
+				}
 			}
 		}
 	}
@@ -622,11 +722,11 @@ rg_gray_leader_experience_jar = {
 					RG_has_gray_cluster_origin_trigger = yes
 				}
 			}
-			has_skill < 10
+			has_base_skill < 10
 		}
 		add_experience = 54000
 		event_target:gray_owner = {
 			rg_save_gray_leader_level_effect = yes
 		}
 	}
-}
+}

common/scripted_effects/RG_scripted_effects.txt

@@ -1423,7 +1423,7 @@ RG_const_auto_build_effect = {
 					#建造空间站
 					find_closest_planet = {
 						trigger = {
-							id = RG_work_bees_trigger.1
+							id = RG_work_bees_trigger.11
 							RG_planet_can_auto_build = yes
 						}
 						found_planet = {
@@ -1433,7 +1433,7 @@ RG_const_auto_build_effect = {
 								duration = $station_time$
 							}
 							effect = {
-								id = RG_work_bees_effect.2
+								id = RG_work_bees_effect.22
 								#若星系属于母国，则自动建造
 								if = {
 									limit = {
@@ -1796,7 +1796,7 @@ RG_destroy_planet_effect = {
 		else = {
 			set_owner = event_target:gray_owner
 		}
-		every_owned_pop = {
+		every_owned_pop_group = {
 			modify_species = {
 				species = event_target:gray_owner.owner_species
 				add_trait = trait_cybernetic
@@ -1804,13 +1804,13 @@ RG_destroy_planet_effect = {
 				change_scoped_species = yes
 			}
 		}
-		every_owned_pop = {
+		every_owned_pop_group = {
 			limit = {
 				has_modifier = pop_recently_conquered
 			}
 			remove_modifier = pop_recently_conquered
 		}
-		every_owned_pop = {
+		every_owned_pop_group = {
 			set_citizenship_type = {
 				type = citizenship_full_machine
 				cooldown = yes
@@ -2193,7 +2193,7 @@ RG_destroy_planet_effect_sp = {
 		else = {
 			set_owner = event_target:gray_owner
 		}
-		every_owned_pop = {
+		every_owned_pop_group = {
 			modify_species = {
 				species = event_target:gray_owner.owner_species
 				add_trait = trait_cybernetic
@@ -2201,13 +2201,13 @@ RG_destroy_planet_effect_sp = {
 				change_scoped_species = yes
 			}
 		}
-		every_owned_pop = {
+		every_owned_pop_group = {
 			limit = {
 				has_modifier = pop_recently_conquered
 			}
 			remove_modifier = pop_recently_conquered
 		}
-		every_owned_pop = {
+		every_owned_pop_group = {
 			set_citizenship_type = {
 				type = citizenship_full_machine
 				cooldown = yes
@@ -2397,7 +2397,7 @@ RG_destroy_star_system = {
 			else = {
 				set_owner = event_target:gray_owner
 			}
-			every_owned_pop = {
+			every_owned_pop_group = {
 				modify_species = {
 					species = event_target:gray_owner.owner_species
 					add_trait = trait_cybernetic
@@ -2405,13 +2405,13 @@ RG_destroy_star_system = {
 					change_scoped_species = yes
 				}
 			}
-			every_owned_pop = {
+			every_owned_pop_group = {
 				limit = {
 					has_modifier = pop_recently_conquered
 				}
 				remove_modifier = pop_recently_conquered
 			}
-			every_owned_pop = {
+			every_owned_pop_group = {
 				set_citizenship_type = {
 					type = citizenship_full_machine
 					cooldown = yes
@@ -2802,7 +2802,7 @@ rg_gray_country_after_init = {
 		id = rg_grayleader.7
 		days = -1
 	}
-	rg_juggernaut_habitat_init = yes
+	# rg_juggernaut_habitat_init = yes
 }
 
 rg_timeline_attract_field_init = {

common/scripted_triggers/RG_leader_scripted_triggers.txt

@@ -1,6 +1,6 @@
 RG_gray_mod1_trigger = {
 	event_target:gray_leader_admiral = {
-		has_skill >= 10
+		has_base_skill >= 10
 	}
 	NOR = {
 		has_country_flag = rg_gray_level_2
@@ -35,7 +35,7 @@ RG_gray_mod1_allow_trigger = {
 	custom_tooltip = {
 		fail_text = requires_rg_graylevel_higherthan_10
 		event_target:gray_leader_admiral = {
-			has_skill >= 10
+			has_base_skill >= 10
 		}
 	}
 	resource_stockpile_compare = {
@@ -51,7 +51,7 @@ RG_gray_mod1_allow_trigger = {
 RG_gray_mod2_trigger = {
 	AND = {
 		event_target:gray_leader_admiral = {
-			has_skill >= 10
+			has_base_skill >= 10
 		}
 		has_country_flag = rg_gray_level_2
 	}
@@ -93,7 +93,7 @@ RG_gray_mod2_allow_trigger = {
 		custom_tooltip = {
 			fail_text = requires_rg_graylevel_higherthan_10
 			event_target:gray_leader_admiral = {
-				has_skill >= 10
+				has_base_skill >= 10
 			}
 		}
 	}

common/scripted_triggers/RG_scripted_triggers.txt

@@ -1,3 +1,23 @@
+rg_all_cluster_mod_check = {
+	OR = {
+		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					# 未来追迹
+		rg_has_ag_origin_trigger = yes	# 遥远的故事
+	}
+}
+
+rg_all_cluster_mod_check_for_scion = {
+	OR = {
+		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					# 未来追迹
+		rg_has_ag_origin_trigger = yes	# 遥远的故事
+	}
+}
+
 RG_planet_can_auto_build = {
 	OR = {
 		AND = {
@@ -31,9 +51,33 @@ RG_OR_has_wsg_mod_trigger = {
 	}
 }
 
+RG_AG_has_gray_master_trigger = {
+	has_civic = civic_AG_gray_master
+}
+
 RG_has_gray_cluster_origin_trigger = {
 	OR = {
 		has_country_flag = origin_rg_gray				#遥远约定
 		has_country_flag = origin_gray_country				#远星之歌
 	}
+}
+
+rg_is_main_species_with_maid_trait_trigger = {
+	has_trait = rg_machine_maid_trait
+	OR = {
+		is_same_species = owner_main_species
+		is_subspecies = owner_main_species
+	}
+}
+
+RG_tradition5_or_gray_owner_trigger = {
+	OR = {
+		RG_gray_harbitat_active_trigger = yes
+		has_active_tradition = tr_rg_nanotech_5
+	}
+}
+rg_has_ag_origin_trigger = {
+	any_country = {
+		has_origin = origin_Asgray
+	}
 }

common/scripted_triggers/RG_scripted_triggers_planet_killers.txt

@@ -338,7 +338,7 @@ can_destroy_planet_with_RG_PLANET_KILLER_NEUTRON = {
 	custom_tooltip = {
 		fail_text = is_unpopulated
 		OR = {
-			num_pops > 0
+			pop_amount > 0
 			is_planet_class = pc_infested
 		}
 	}
@@ -472,7 +472,7 @@ can_destroy_planet_with_RG_PLANET_KILLER_NANOBOTS = {
 	}
 	custom_tooltip = {
 		fail_text = no_assimilatable_pops
-		any_owned_pop = {
+		any_owned_pop_group = {
 			is_valid_pop_for_PLANET_KILLER_NANOBOTS = yes
 		}
 	}

common/ship_sizes/RG_ship_sizes.txt

@@ -54,7 +54,7 @@ RG_graygoo_mothership = {
 	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_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
 	is_designable = yes
 	default_behavior = colossus
@@ -118,7 +118,7 @@ RG_graygoo_capitalship = {
 
 	use_shipnames_from = juggernaut
 	can_have_federation_design = yes
-	enable_default_design = yes	#if yes, countries will have an auto-generated design at start
+	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
 	is_designable = yes
 	default_behavior = colossus
@@ -183,8 +183,6 @@ RG_graygoo_capitalship = {
 	required_component_set = "sensor_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"
 	components_add_to_cost = no
 	resources = {
 		category = ships
@@ -231,7 +229,7 @@ RG_gray_juggernaut = {
 	}
 	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_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
@@ -297,9 +295,7 @@ RG_gray_juggernaut = {
 	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"
+	required_component_set = "ftl_inhibitor"
 
 	components_add_to_cost = no
 	resources = {
@@ -448,7 +444,7 @@ RG_graygoo_interdictor = {
 
 	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_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
 	is_designable = yes
 	default_behavior = line
@@ -502,7 +498,7 @@ RG_graygoo_destroyer = {
 
 	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_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
 	is_designable = yes
 	default_behavior = line
@@ -562,7 +558,7 @@ RG_graygoo_icebreaker_interdictor = {
 	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_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
 	is_designable = yes
 	default_behavior = colossus
@@ -616,7 +612,7 @@ RG_graygoo_Arsenal = {
 	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_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
 	is_designable = yes
 	default_behavior = line
@@ -668,7 +664,7 @@ RG_graygoo_Buff = {
 	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_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
 	is_designable = yes
 	default_behavior = colossus
@@ -842,7 +838,7 @@ RG_orbital_ring_tier_1 = {
 	components_add_to_cost = no
 	can_disable = yes
 	flip_control_on_disable = yes
-	enable_default_design = yes	#if yes, countries will have an auto-generated design at start
+	enable_default_design = no	#if yes, countries will have an auto-generated design at start
 	prerequisites = {
 		"tech_object_gray_6"
 	}

common/situations/rg_deficit_situations.txt

@@ -1,192 +1,150 @@
-situation_nanties_deficit = {
-    picture = GFX_evt_deficit
-    category = negative
-    fail_icon = GFX_situation_outcome_meh
-    fail_icon_frame = GFX_situation_outcome_frame_green
-    complete_icon = GFX_situation_outcome_bankrupcy
-    complete_icon_frame = GFX_situation_outcome_frame_red
-
-    on_start = {
-        set_situation_flag = deficit_situation
-        owner = {
-            country_event = { id = advisor.20 days = 10 random = 20 }
-            save_event_target_as = kaleidoscope_new_owner
-        }
-        random_playable_country = {
-            limit = {
-                has_country_flag = gave_kaleidoscope_to@owner
-            }
-            country_event = { id = situation.2025 days = 10 random = 20 }
-        }
-    }
-    on_abort = {
-        owner = {
-            add_resource = {
-                energy = @bailout_basic_base_amount
-                mult = value:bailout_scaling_factor
-            }
-        }
-    }
-
-    start_value = 15
-    on_monthly = {
-        random_events = {
-            80 = 0
-            20 = origin.4170	# Payback | MSI helping you
-        }
-    }
-
-    stages = {
-        deficit_first = {
-            icon = GFX_situation_stage_1
-            icon_background = GFX_situation_stage_frame_red
-            end = 25
-            modifier = {
-                planet_researchers_physics_research_produces_add = -0.5
-                planet_researchers_society_research_produces_add = -0.5
-                planet_researchers_engineering_research_produces_add = -0.5
-                diplo_weight_economy_mult = -0.1
-                planet_pop_assembly_reduction = 0.1
-                ship_disengage_chance_mult = -0.1
-                ship_weapon_damage = -0.20
-                ship_speed_mult = -0.20
-            }
-        }
-        deficit_second = {
-            icon = GFX_situation_stage_2
-            icon_background = GFX_situation_stage_frame_red
-            end = 50
-            modifier = {
-                planet_researchers_physics_research_produces_add = -1
-                planet_researchers_society_research_produces_add = -1
-                planet_researchers_engineering_research_produces_add = -1
-                diplo_weight_economy_mult = -0.2
-                planet_pop_assembly_reduction = 0.2
-                ship_disengage_chance_mult = -0.25
-                ship_weapon_damage = -0.40
-                ship_speed_mult = -0.40
-            }
-        }
-        deficit_third = {
-            icon = GFX_situation_stage_3
-            icon_background = GFX_situation_stage_frame_red
-            end = 75
-            modifier = {
-                planet_researchers_physics_research_produces_add = -1.5
-                planet_researchers_society_research_produces_add = -1.5
-                planet_researchers_engineering_research_produces_add = -1.5
-                diplo_weight_economy_mult = -0.33
-                planet_pop_assembly_reduction = 0.33
-                ship_disengage_chance_mult = -0.50
-                ship_weapon_damage = -0.60
-                ship_speed_mult = -0.60
-            }
-        }
-        deficit_fourth = {
-            icon = GFX_situation_stage_4
-            icon_background = GFX_situation_stage_frame_red
-            end = 100
-            on_first_enter = {
-                situation_event = { id = deficit.100 }
-            }
-            modifier = {
-                planet_researchers_physics_research_produces_add = -2
-                planet_researchers_society_research_produces_add = -2
-                planet_researchers_engineering_research_produces_add = -2
-                diplo_weight_economy_mult = -0.5
-                planet_pop_assembly_reduction = 0.5
-                ship_disengage_chance_mult = -0.75
-                planet_jobs_produces_mult = -0.1
-                ship_weapon_damage = -0.8
-                ship_speed_mult = -0.8
-            }
-        }
-    }
-
-    on_progress_complete = {
-        country_defaulted_in_situation_tooltip = yes
-        hidden_effect = {
-            situation_event = { id = deficit.110 }
-        }
-    }
-    on_fail = {
-        custom_tooltip = deficit_situation_finish_tooltip
-        hidden_effect = { destroy_situation = this }
-    }
-    monthly_progress = {
-        base = 0
-        modifier = {
-            add = value:deficit_situation_progress_value|RESOURCE|energy|
-            desc = string_expenditures_greater_than_income_energy
-            owner = { has_actual_deficit = { RESOURCE = energy } }
-        }
-        modifier = {
-            subtract = 5
-            desc = string_not_in_deficit_energy
-            owner = {
-                resource_income_compare = {
-                    resource = energy
-                    value >= 0
-                }
-            }
-        }
-        modifier = {
-            subtract = 1
-            desc = string_resource_reserves_energy
-            owner = {
-                has_negative_income_with_stockpile = { RESOURCE = energy }
-            }
-        }
-        modifier = {
-            desc = civilian_difficulty
-            mult = 0.1
-            situation_monthly_progress > 0
-            is_difficulty = 0
-            owner = {
-                is_ai = no
-            }
-        }
-        modifier = {
-            desc = cadet_difficulty
-            mult = 0.5
-            situation_monthly_progress > 0
-            is_difficulty = 1
-            owner = {
-                is_ai = no
-            }
-        }
-    }
-    approach = {
-        name = deficit_approach_do_nothing
-        icon = GFX_situation_approach_this_is_fine
-        icon_background = GFX_situation_approach_bg_yellow
-        default = yes
-        on_select = {
-            custom_tooltip = deficit_approach_do_nothing_tooltip
-        }
-        ai_weight = {
-            base = 1
-        }
-    }
-    approach = {
-        name = deficit_approach_cut_science_investment
-        icon = GFX_situation_approach_research
-        icon_background = GFX_situation_approach_bg_red
-        modifier = {
-            planet_researchers_produces_mult = -0.5
-            planet_buildings_energy_upkeep_mult = -0.2
-        }
-
-        ai_weight = {
-            base = 0
-            modifier = {
-                add = 2
-                current_stage = deficit_third
-            }
-            modifier = {
-                add = 2
-                current_stage = deficit_fourth
-            }
-        }
-    }
+situation_nanites_deficit = {
+	picture = GFX_evt_deficit
+	category = negative
+	fail_icon = GFX_situation_outcome_meh
+	fail_icon_frame = GFX_situation_outcome_frame_green
+	complete_icon = GFX_situation_outcome_bankrupcy
+	complete_icon_frame = GFX_situation_outcome_frame_red
+	on_start = {
+		set_situation_flag = deficit_situation
+	}
+	on_abort = {
+		owner = {
+			add_resource = {
+				nanites = @bailout_strategic_base_amount
+				mult = value:bailout_scaling_factor
+			}
+		}
+	}
+	start_value = 15
+	stages = {
+		deficit_first = {
+			icon = GFX_situation_stage_1
+			icon_background = GFX_situation_stage_frame_red
+			end = 25
+			modifier = {
+				planet_jobs_upkeep_mult = 0.05
+				all_technology_research_speed = -0.05
+				planet_buildings_upkeep_mult = 0.05
+				megastructures_upkeep_mult = 0.05
+			}
+		}
+		deficit_second = {
+			icon = GFX_situation_stage_2
+			icon_background = GFX_situation_stage_frame_red
+			end = 50
+			modifier = {
+				planet_jobs_upkeep_mult = 0.1
+				all_technology_research_speed = -0.1
+				planet_buildings_upkeep_mult = 0.1
+				megastructures_upkeep_mult = 0.1
+			}
+		}
+		deficit_third = {
+			icon = GFX_situation_stage_3
+			icon_background = GFX_situation_stage_frame_red
+			end = 75
+			modifier = {
+				planet_jobs_upkeep_mult = 0.15
+				all_technology_research_speed = -0.2
+				planet_buildings_upkeep_mult = 0.15
+				megastructures_upkeep_mult = 0.15
+			}
+		}
+		deficit_fourth = {
+			icon = GFX_situation_stage_4
+			icon_background = GFX_situation_stage_frame_red
+			end = 100
+			on_first_enter = {
+				situation_event = {
+					id = gigadeficit.160
+				}
+			}
+			modifier = {
+				planet_jobs_upkeep_mult = 0.2
+				all_technology_research_speed = -0.4
+				planet_buildings_upkeep_mult = 0.2
+				megastructures_upkeep_mult = 0.2
+			}
+		}
+	}
+	on_progress_complete = {
+		country_defaulted_in_situation_tooltip = yes
+		hidden_effect = {
+			situation_event = {
+				id = rg_deficit.220
+			}
+		}
+	}
+	on_fail = {
+		custom_tooltip = deficit_situation_finish_tooltip
+		hidden_effect = {
+			destroy_situation = this
+		}
+	}
+	monthly_progress = {
+		base = 0
+		modifier = {
+			add = value:deficit_situation_progress_value|RESOURCE|nanites|
+			desc = string_expenditures_greater_than_income_nanites
+			owner = {
+				has_actual_deficit = {
+					RESOURCE = nanites
+				}
+			}
+		}
+		modifier = {
+			subtract = 3
+			desc = string_not_in_deficit_nanites
+			owner = {
+				resource_income_compare = {
+					resource = nanites
+					value >= 0
+				}
+			}
+		}
+		modifier = {
+			subtract = 1
+			desc = string_resource_reserves_nanites
+			owner = {
+				has_negative_income_with_stockpile = {
+					RESOURCE = nanites
+				}
+			}
+		}
+	}
+	approach = {
+		name = deficit_approach_do_nothing
+		icon = GFX_situation_approach_this_is_fine
+		icon_background = GFX_situation_approach_bg_yellow
+		default = yes
+		on_select = {
+			custom_tooltip = deficit_approach_do_nothing_tooltip
+		}
+		ai_weight = {
+			base = 1
+		}
+	}
+	approach = {
+		name = deficit_approach_cut_nanite_usage
+		icon = GFX_situation_approach_research
+		icon_background = GFX_situation_approach_bg_red
+		modifier = {
+			country_nanites_produces_mult = 0.15
+			planet_stability_add = -10
+			planet_structures_cost_mult = 1
+			megastructures_cost_mult = 1
+		}
+		ai_weight = {
+			base = 0
+			modifier = {
+				add = 2
+				current_stage = deficit_third
+			}
+			modifier = {
+				add = 2
+				current_stage = deficit_fourth
+			}
+		}
+	}
 }

common/situations/rg_gray_situations.txt

@@ -11,7 +11,7 @@ situation_rg_gray_mod1 = {
 				}
 			}
 		}
-		destroy_situation = this 
+		destroy_situation = this
 	}
 
 	on_start = {

common/solar_system_initializers/RG_fallen_empire_initializers.txt

@@ -79,18 +79,13 @@ rg_fallen_machine = {
 				count = 5
 				add_district = district_rw_nexus
 			}
-			while = {
-				count = 105
-				create_pop = {
-					species = owner_main_species
-				}
+			create_pop_group = {
+				species = owner_main_species
+				size = 105
 			}
-
-			while = {
-				count = 94
-				create_pop = {
-					species = event_target:rg_scion_slave.species
-				}
+			create_pop_group = {
+				species = event_target:rg_scion_slave.species
+				size = 94
 			}
 
 			rg_create_fallen_empire_starting_navy = yes
@@ -159,17 +154,13 @@ rg_fallen_machine = {
 				count = 5
 				add_district = district_rw_nexus
 			}
-			while = {
-				count = 50
-				create_pop = {
-					species = owner_main_species
-				}
+			create_pop_group = {
+				species = owner_main_species
+				size = 50
 			}
-			while = {
-				count = 20
-				create_pop = {
-					species = event_target:rg_scion_slave.species
-				}
+			create_pop_group = {
+				species = event_target:rg_scion_slave.species
+				size = 20
 			}
 			while = {
 				count = 20
@@ -225,17 +216,13 @@ rg_fallen_machine = {
 				count = 5
 				add_district = district_rw_generator
 			}
-			while = {
-				count = 22
-				create_pop = {
-					species = owner_main_species
-				}
+			create_pop_group = {
+				species = owner_main_species
+				size = 22
 			}
-			while = {
-				count = 10
-				create_pop = {
-					species = event_target:rg_scion_slave.species
-				}
+			create_pop_group = {
+				species = event_target:rg_scion_slave.species
+				size = 10
 			}
 			while = {
 				count = 10
@@ -333,18 +320,14 @@ rg_fallen_machine_1 = {
 				count = 5
 				add_district = district_rw_nexus
 			}
-			while = {
-				count = 105
-				create_pop = {
-					species = owner_main_species
-				}
+			create_pop_group = {
+				species = owner_main_species
+				size = 105
 			}
 
-			while = {
-				count = 94
-				create_pop = {
-					species = event_target:rg_scion_slave.species
-				}
+			create_pop_group = {
+				species = event_target:rg_scion_slave.species
+				size = 94
 			}
 
 			rg_create_fallen_empire_starting_navy = yes
@@ -421,17 +404,13 @@ rg_fallen_machine_1 = {
 				count = 5
 				add_district = district_rw_nexus
 			}
-			while = {
-				count = 50
-				create_pop = {
-					species = owner_main_species
-				}
+			create_pop_group = {
+				species = owner_main_species
+				size = 50
 			}
-			while = {
-				count = 20
-				create_pop = {
-					species = event_target:rg_scion_slave.species
-				}
+			create_pop_group = {
+				species = event_target:rg_scion_slave.species
+				size = 20
 			}
 			while = {
 				count = 20
@@ -487,17 +466,13 @@ rg_fallen_machine_1 = {
 				count = 5
 				add_district = district_rw_generator
 			}
-			while = {
-				count = 22
-				create_pop = {
-					species = owner_main_species
-				}
+			create_pop_group = {
+				species = owner_main_species
+				size = 22
 			}
-			while = {
-				count = 10
-				create_pop = {
-					species = event_target:rg_scion_slave.species
-				}
+			create_pop_group = {
+				species = event_target:rg_scion_slave.species
+				size = 10
 			}
 			while = {
 				count = 10

common/species_archetypes/RG_species_archetypes.txt

@@ -18,4 +18,5 @@ RG_MACHINE = {
 	species_trait_points = 10
 	species_max_traits = 6
 	robotic = yes
+	inherit_traits_from = { BIOLOGICAL ROBOT MACHINE }
 }

common/species_rights/citizenship_types/RG_citizenship_types.txt

@@ -0,0 +1,21 @@
+citizenship_full_rg_maid = {
+	is_full_citizenship = yes
+
+	potential = {
+		exists = from
+		from = { is_same_value = event_target:gray_owner }
+	}
+
+	allow = {
+		hidden_trigger = { exists = from }
+		custom_tooltip = {
+			fail_text = RG_MACHINE_SPECIES_NOT_MACHINE
+			OR = {
+				has_trait = trait_rg_machine_unit
+			}
+		}
+	}
+	ai_will_do = {
+		factor = 100
+	}
+}

common/traditions/RG_nanotech_tradition.txt

@@ -14,7 +14,7 @@ tr_rg_nanotech_adopt = {
 		}
 	}
 	custom_tooltip = tr_rg_nanotech_adopt_modifier_desc
-	unlocks_agenda = agenda_nanotech_unstoppable_swarm
+	unlocks_agenda = rg_agenda_nanotech_unstoppable_swarm
 	#Unlocks nanolab 1 and Starbase building
 }
 
@@ -91,6 +91,7 @@ tr_rg_nanotech_3 = {
 			tech = tech_object_gray_7
 			message = no
 		}
+		rg_create_gray_planetkiller_testship_2 = yes
 	}
 	#Unlocks Starbase Building and Make Nanite World Decision
 	ai_weight = {

common/traits/!_RG_gray_goo_traits.txt

@@ -49,7 +49,7 @@
 # 			always = yes
 # 		}
 # 		leader_skill_levels = 1
-# 		mult = trigger:has_skill
+# 		mult = trigger:has_base_skill
 # 	}
 # 	self_modifier = {
 # 		species_leader_exp_gain = 1
@@ -121,7 +121,7 @@ RG_leader_trait_governor_gray = {
 			always = yes
 		}
 		leader_skill_levels = 1
-		mult = trigger:has_skill
+		mult = trigger:has_base_skill
 	}
 	self_modifier = {
 		species_leader_exp_gain = 1
@@ -175,7 +175,7 @@ RG_leader_trait_ruler_gray = {
 		}
 		# leader_skill_levels = 1
 		leaders_upkeep_mult = 0.1
-		mult = trigger:has_skill
+		mult = trigger:has_base_skill
 	}
 	triggered_self_modifier = {
 		potential = {
@@ -193,7 +193,7 @@ RG_leader_trait_ruler_gray = {
 		}
 		# leader_skill_levels = 1
 		leaders_upkeep_mult = 0.15
-		mult = trigger:has_skill
+		mult = trigger:has_base_skill
 	}
 	triggered_self_modifier = {
 		potential = {
@@ -207,7 +207,7 @@ RG_leader_trait_ruler_gray = {
 		}
 		# leader_skill_levels = 1
 		leaders_upkeep_mult = 0.2
-		mult = trigger:has_skill
+		mult = trigger:has_base_skill
 	}
 	triggered_councilor_modifier = {
 		potential = {
@@ -221,7 +221,7 @@ RG_leader_trait_ruler_gray = {
 		}
 		# country_energy_produces_mult = -0.02
 		planet_stability_add = -1
-		mult = trigger:has_skill
+		mult = trigger:has_base_skill
 	}
 	triggered_councilor_modifier = {
 		potential = {
@@ -239,7 +239,7 @@ RG_leader_trait_ruler_gray = {
 		}
 		# country_energy_produces_mult = -0.03
 		planet_stability_add = -1.5
-		mult = trigger:has_skill
+		mult = trigger:has_base_skill
 	}
 	triggered_councilor_modifier = {
 		potential = {
@@ -253,7 +253,7 @@ RG_leader_trait_ruler_gray = {
 		}
 		# country_energy_produces_mult = -0.04
 		planet_stability_add = -2
-		mult = trigger:has_skill
+		mult = trigger:has_base_skill
 	}
 	triggered_councilor_modifier = {
 		potential = {
@@ -268,7 +268,7 @@ RG_leader_trait_ruler_gray = {
 		megastructure_build_speed_mult = 0.1
 		country_unity_produces_mult = 0.05
 		country_base_influence_produces_add = 1
-		mult = trigger:has_skill
+		mult = trigger:has_base_skill
 	}
 	leader_class = {
 		official
@@ -293,7 +293,7 @@ RG_leader_trait_admiral_gray_1 = {
 			always = yes
 		}
 		leader_skill_levels = 1
-		mult = trigger:has_skill
+		mult = trigger:has_base_skill
 	}
 	self_modifier = {
 		species_leader_exp_gain = 1
@@ -334,7 +334,7 @@ RG_leader_trait_admiral_gray_2 = {
 			always = yes
 		}
 		leader_skill_levels = 1
-		mult = trigger:has_skill
+		mult = trigger:has_base_skill
 	}
 	self_modifier = {
 		species_leader_exp_gain = 1
@@ -375,7 +375,7 @@ RG_leader_trait_admiral_gray = {
 			always = yes
 		}
 		leader_skill_levels = 1
-		mult = trigger:has_skill
+		mult = trigger:has_base_skill
 	}
 	self_modifier = {
 		species_leader_exp_gain = 1
@@ -449,7 +449,7 @@ RG_leader_trait_scientist_gray = {
 			always = yes
 		}
 		leader_skill_levels = 1
-		mult = trigger:has_skill
+		mult = trigger:has_base_skill
 	}
 	self_modifier = {
 		species_leader_exp_gain = 1

common/traits/RG_machine_species_trait.txt

@@ -4,12 +4,28 @@ rg_machine_maid_trait = {
 	}
 	custom_tooltip = rg_machine_maid_trait_effect_tooltip
 	initial = no
-	species_potential_add = { always = no }
-	species_possible_remove = { always = no }
-	species_possible_merge_add = { always = no }
-	species_possible_merge_remove = { always = no }
+	species_potential_add = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
+	species_possible_remove = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
+	species_possible_merge_add = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
+	species_possible_merge_remove = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
 	randomized = no
-	allowed_archetypes = { MACHINE }
+	allowed_archetypes = { ROBOT MACHINE BIOLOGICAL LITHOID RG_MACHINE }
 	sorting_priority = 20
 	potential_crossbreeding_chance = 1.0
 
@@ -31,7 +47,7 @@ rg_machine_maid_trait = {
 			exists = planet
 			planet = {
 				exists = owner
-				owner = { is_same_value = event_target:gray_owner }
+				owner = { has_country_flag = gray_owner }
 			}
 		}
 		planet_jobs_produces_mult = 0.1
@@ -54,11 +70,63 @@ rg_machine_maid_trait = {
 				}
 			}
 		}
-	
-	
 	}
 	
 	slave_cost = {
 		energy = 1000
 	}
+}
+
+trait_rg_machine_unit = {
+	cost = 0
+	sorting_priority = 20
+	initial = no
+	randomized = no
+	species_potential_add = {
+		always = no
+	}
+	species_possible_remove = {
+		always = no
+	}
+
+	species_possible_merge_add = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
+
+	species_possible_merge_remove = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
+
+	icon = "gfx/interface/icons/traits/trait_machine_unit.dds"
+	allowed_archetypes = { ROBOT MACHINE BIOLOGICAL LITHOID RG_MACHINE }
+
+	immortal_leaders = no
+
+	modifier = {
+		pc_machine_habitability = 1
+		leader_lifespan_add = 10
+		habitability_floor_add = 0.5
+	}
+
+	triggered_planet_growth_habitability_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				OR = {
+					has_active_tradition = tr_nanotech_adopt
+					has_active_tradition = tr_rg_nanotech_adopt
+				}
+			}
+		}
+		pc_nanotech_habitability = 1
+	}
+
+	leader_age_min = 5
+	leader_age_max = 10
+
+	custom_tooltip_with_modifiers = TRAIT_MACHINE_UNIT_EFFECT
 }

common/zone_slots/rg_zone_slots.txt

@@ -0,0 +1,63 @@
+# Planet District Zone Slots
+
+# slot_test_01 = {
+# 	start = zone_default                    # A zone of this type is immediately placed in a new district slot.
+# 
+# 	include = {                             # A list of zone types that are available to be built in the slot. The key 'all' can be used to include all existing zone types.
+# 		all
+# 	}
+# 
+# 	exclude = {                             # A list of zone types that aren't available to be built in the slot.
+# 		zone_test_05
+# 	}
+#
+#    potential = {                          
+#        always = yes                       # Trigger that defines whether the slot is available on the planet at all. Scope = Planet.
+#    }
+# 
+# 	unlock = {                              # Trigger that defines whether the slot is unlocked on the planet. Scope = Planet.
+# 		always = yes
+# 	}
+# }
+slot_rg_city_01 = {
+	include = {
+		zone_rg_city_housing
+		zone_rg_city_foundry
+		zone_rg_city_alloys
+		zone_rg_city_science
+	}
+	exclude = {
+		zone_default
+	}
+	unlock = { # planet scope
+		uses_district_set = rg_station
+	}
+}
+slot_rg_city_02 = {
+	include = {
+		zone_rg_city_housing
+		zone_rg_city_foundry
+		zone_rg_city_alloys
+		zone_rg_city_science
+	}
+	exclude = {
+		zone_default
+	}
+	unlock = { # planet scope
+		uses_district_set = rg_station
+	}
+}
+slot_rg_city_03 = {
+	include = {
+		zone_rg_city_housing
+		zone_rg_city_foundry
+		zone_rg_city_alloys
+		zone_rg_city_science
+	}
+	exclude = {
+		zone_default
+	}
+	unlock = { # planet scope
+		uses_district_set = rg_station
+	}
+}

common/zones/rg_zones.txt

@@ -0,0 +1,202 @@
+# Planet District Zones
+
+# zone_test_01 = {
+#   potential = {                           # Trigger that defines whether the zone can potentially be built on the Planet. Scope = Planet
+#       always = yes
+#   }
+#
+#   unlock = {                              # Trigger that defines whether the zone is unlocked for building on the planet. Scope = Planet
+#       always = yes
+# 	}
+#
+# 	resources = {                           # Cost of building. Scope = Planet
+#       category = planet_districts
+# 		cost = {
+# 			minerals = 50
+# 		}
+# 	}
+#
+#   max_buildings = 3      					# Number of slots for buildings.
+#
+#   planet_modifier = {						# Planet modifier from the zone
+#   }
+#
+#   triggered_planet_modifier = { 			# Triggered planet modifier from the zone. Scope = Planet
+#       potential = {
+#           always = yes
+#       }
+#   }
+#
+#   triggered_planet_pop_group_modifier = { # Triggered modifier applied to pop groups on planet.
+#       potential = {						# Modifier values are divided in proportion to size between pop groups for which the trigger is true.
+#           always = yes					# Scope = Pop group
+#       }
+#   }
+#
+#   district_planet_modifier = {    		# Planet modifier from the zone. Modifier value is multiplied by the District Level
+#   }
+#
+#   triggered_district_planet_modifier = {  # Triggered planet modifier from the zone. Modifier value is multiplied by the District Level. Scope = Planet
+#       potential = {
+#           always = yes
+#       }
+#   }
+#
+#   include = {    }                       # Buildings listed here can be constructed in this zone.
+#
+#   exclude = {    }                       # Buildings listed here cannot be constructed in this zone.
+#
+#   included_building_sets = {
+#                                           # Buildings belonging to any building set listed here can be constructed in this zone.
+#    }
+#
+#   excluded_building_sets = {
+#                                           # Buildings belonging to any building set listed here cannot be constructed in this zone.
+#    }
+#
+#	triggered_desc = {       		        # Triggered description of the zone's effect. Scope = Planet
+#		trigger = {
+#			exists = owner
+#		}
+#		text = job_clerk_effect_desc
+#	}
+# }
+
+zone_rg_city_housing = {
+	icon = GFX_colony_type_urban
+	base_buildtime = 120
+	potential = { # planet scope
+		always = yes
+	}
+
+	unlock = { # planet scope
+		always = yes
+	}
+	resources = {
+		category = planet_zones
+		cost = {
+		}
+	}
+
+	include = {
+		all
+	}
+	included_building_sets = {
+	}
+
+	triggered_district_planet_modifier = {
+		potential = {
+			exists = owner
+		}
+		planet_housing_add = 3000
+		planet_crime_add = -10
+		planet_amenities_add = 1000
+	}
+	
+	planet_modifier = {
+		zone_building_slots_add = 3
+	}
+}
+
+zone_rg_city_foundry = {
+	icon = GFX_resource_energy_large
+	base_buildtime = 120
+	potential = { # planet scope
+		always = yes
+	}
+
+	unlock = { # planet scope
+		always = yes
+	}
+	resources = {
+		category = planet_zones
+		cost = {
+		}
+	}
+
+	include = {
+		all
+	}
+	included_building_sets = {
+	}
+
+	inline_script = {
+		script = jobs/zone_technicians_add
+		AMOUNT = 1000
+	}
+	inline_script = {
+		script = jobs/zone_miner_add
+		AMOUNT = 1000
+	}
+	inline_script = {
+		script = jobs/zone_farmers_add
+		AMOUNT = 1000
+	}
+	
+	planet_modifier = {
+		zone_building_slots_add = 3
+	}
+}
+
+zone_rg_city_alloys = {
+	icon = GFX_resource_energy_large
+	base_buildtime = 120
+	potential = { # planet scope
+		always = yes
+	}
+
+	unlock = { # planet scope
+		always = yes
+	}
+	resources = {
+		category = planet_zones
+		cost = {
+		}
+	}
+
+	include = {
+		all
+	}
+	included_building_sets = {
+	}
+	inline_script = {
+		script = jobs/zone_factory_add
+		AMOUNT = 500
+	}
+	inline_script = {
+		script = jobs/zone_foundry_add
+		AMOUNT = 500
+	}
+	
+	planet_modifier = {
+		zone_building_slots_add = 3
+	}
+}
+
+zone_rg_city_science = {
+	icon = GFX_colony_type_research
+	base_buildtime = 120
+	potential = { # planet scope
+		always = yes
+	}
+	unlock = { # planet scope
+		always = yes
+	}
+	resources = {
+		category = planet_zones
+		cost = {
+		}
+	}
+	include = {
+		all
+	}
+	included_building_sets = {
+	}
+	inline_script = {
+		script = jobs/zone_researchers_add
+		AMOUNT = 1000
+	}
+	planet_modifier = {
+		zone_building_slots_add = 3
+	}
+}

descriptor.mod

@@ -1,4 +1,4 @@
-version="d4a22820b3"
+version="v3.*.*"
 tags={
 	"Military"
 	"Balance"
@@ -6,7 +6,7 @@ tags={
 	"Events"
 	"Leaders"
 }
-name="Real Gray"
 picture="thumbnail.png"
-supported_version="v3.13.*"
+name="Real Gray"
+supported_version="v3.*.*"
 remote_file_id="2136166095"

events/!_RG_gray_goo_event_overwrite.txt

@@ -827,7 +827,7 @@ ship_event = {
 	is_triggered_only = yes
 	immediate = {
 		from = {
-			save_event_target_as = gray_homeworld
+			save_global_event_target_as = gray_homeworld
 		}
 		rg_timeline_attract_field_init = yes
 	}
@@ -848,64 +848,55 @@ country_event = {
 	id = graygoo.401
 	title = "TRANSMISSION"
 	desc = {
-		trigger = {
-			NOT = {
-				has_authority = auth_machine_intelligence
-			}
-		}
+		trigger = { is_machine_empire = no }
 		text = "graygoo.401.a.desc"
 	}
 	desc = {
-		trigger = {
-			has_authority = auth_machine_intelligence
-		}
+		trigger = { is_machine_empire = yes }
 		text = "graygoo.401.b.desc"
 	}
 	is_triggered_only = yes
 	diplomatic = yes
+
 	picture_event_data = {
 		portrait = event_target:rg_gray_country_leader
 		planet_background = event_target:gray_homeworld
 		room = "ethic_spaceship_room"
 	}
+
 	immediate = {
 		rg_gray_country_init = yes		#创建国家
 		rg_timeline_attract_field_init = yes
 	}
+
 	option = {
 		name = graygoo.401.a
 		trigger = {
 			NOR = {
-				has_authority = auth_machine_intelligence
-				has_authority = auth_hive_mind
+				is_machine_empire = yes
+				is_hive_empire = yes
 			}
 		}
 		hidden_effect = {
-			country_event = {
-				id = graygoo.402
-			}
+			country_event = { id = graygoo.402 }
 		}
 	}
 	option = {
 		name = graygoo.401.b
 		trigger = {
-			has_authority = auth_machine_intelligence
+			is_machine_empire = yes
 		}
 		hidden_effect = {
-			country_event = {
-				id = graygoo.402
-			}
+			country_event = { id = graygoo.402 }
 		}
 	}
 	option = {
 		name = graygoo.401.c
 		trigger = {
-			has_authority = auth_hive_mind
+			is_hive_empire = yes
 		}
 		hidden_effect = {
-			country_event = {
-				id = graygoo.402
-			}
+			country_event = { id = graygoo.402 }
 		}
 	}
 }
@@ -915,17 +906,11 @@ country_event = {
 	id = graygoo.402
 	title = "TRANSMISSION"
 	desc = {
-		trigger = {
-			NOT = {
-				has_authority = auth_machine_intelligence
-			}
-		}
+		trigger = { is_machine_empire = no }
 		text = "graygoo.402.a.desc"
 	}
 	desc = {
-		trigger = {
-			has_authority = auth_machine_intelligence
-		}
+		trigger = { is_machine_empire = yes }
 		text = "graygoo.402.b.desc"
 	}
 	diplomatic = yes
@@ -938,9 +923,7 @@ country_event = {
 	option = {
 		name = graygoo.402.a
 		hidden_effect = {
-			country_event = {
-				id = graygoo.403
-			}
+			country_event = { id = graygoo.403 }
 		}
 	}
 }
@@ -960,9 +943,7 @@ country_event = {
 	option = {
 		name = graygoo.403.a
 		hidden_effect = {
-			country_event = {
-				id = graygoo.404
-			}
+			country_event = { id = graygoo.404 }
 		}
 	}
 }
@@ -982,9 +963,7 @@ country_event = {
 	option = {
 		name = graygoo.404.a
 		hidden_effect = {
-			country_event = {
-				id = graygoo.405
-			}
+			country_event = { id = graygoo.405 }
 		}
 	}
 }
@@ -1004,11 +983,7 @@ country_event = {
 	option = {
 		name = graygoo.405.a
 		hidden_effect = {
-			owner = {
-				country_event = {
-					id = graygoo.406
-				}
-			}
+			country_event = { id = graygoo.406 }
 		}
 	}
 	option = {
@@ -1017,19 +992,23 @@ country_event = {
 	}
 }
 
+
 # Gray 6
 country_event = {
 	id = graygoo.406
 	title = "TRANSMISSION"
 	desc = "graygoo.406.desc"
 	diplomatic = yes
+
 	picture_event_data = {
 		portrait = event_target:rg_gray_country_leader
 		planet_background = event_target:gray_homeworld
 		room = ship_room
 	}
 	event_window_type = leader_recruit
+
 	is_triggered_only = yes
+
 	option = {
 		name = graygoo.406.a
 		response_text = graygoo.406.a.response
@@ -1090,8 +1069,29 @@ country_event = {
 		}
 		is_ai = no
 	}
-	inline_script = {
-		script = events/rg_graygoo/rg_graygoo.499
+	immediate = {
+		if = {
+			# 非正常触发补事件
+			limit = {
+				NOT = {
+					exists = event_target:rg_gray_country
+				}
+			}
+			rg_gray_country_init = yes			#创建国家
+		}
+		rg_gray_country_after_init = yes
+		set_country_flag = machine_age_nanites_studied
+		create_message = {
+			type = MESSAGE_TYPE_RG_GRAY_GOO_LEADER_CHAT
+			localization = "rg_event.2.desc"
+			days = @toast_message_days
+			target = event_target:rg_gray_country_leader
+			variable = {
+				type = name
+				localization = LEADER
+				scope = event_target:rg_gray_country_leader
+			}
+		}
 	}
 }
 
@@ -1117,18 +1117,8 @@ country_event = {
 		}
 	}
 	immediate = {
-		if = {
-			limit = {
-				RG_OR_has_wsg_mod_trigger = yes
-			}
-			country_event = {
-				id = rg_graygoo.500
-			}
-		}
-		else = {
-			country_event = {
-				id = rg_grayleader.500
-			}
+		country_event = {
+			id = rg_grayleader.500
 		}
 	}
 }
@@ -1153,18 +1143,8 @@ country_event = {
 		exists = event_target:gray_governor
 	}
 	immediate = {
-		if = {
-			limit = {
-				RG_OR_has_wsg_mod_trigger = yes
-			}
-			country_event = {
-				id = rg_graygoo.501
-			}
-		}
-		else = {
-			country_event = {
-				id = rg_grayleader.501
-			}
+		country_event = {
+			id = rg_grayleader.501
 		}
 	}
 }
@@ -1195,18 +1175,8 @@ country_event = {
 		}
 	}
 	immediate = {
-		if = {
-			limit = {
-				RG_OR_has_wsg_mod_trigger = yes
-			}
-			country_event = {
-				id = rg_graygoo.502
-			}
-		}
-		else = {
-			country_event = {
-				id = rg_grayleader.502
-			}
+		country_event = {
+			id = rg_grayleader.502
 		}
 	}
 }
@@ -1242,18 +1212,8 @@ country_event = {
 		}
 	}
 	immediate = {
-		if = {
-			limit = {
-				RG_OR_has_wsg_mod_trigger = yes
-			}
-			country_event = {
-				id = rg_graygoo.503
-			}
-		}
-		else = {
-			country_event = {
-				id = rg_grayleader.503
-			}
+		country_event = {
+			id = rg_grayleader.503
 		}
 	}
 }
@@ -1274,18 +1234,8 @@ country_event = {
 		RG_gray_is_reforming_trigger = yes
 	}
 	immediate = {
-		if = {
-			limit = {
-				RG_OR_has_wsg_mod_trigger = yes
-			}
-			country_event = {
-				id = rg_graygoo.504
-			}
-		}
-		else = {
-			country_event = {
-				id = rg_grayleader.504
-			}
+		country_event = {
+			id = rg_grayleader.504
 		}
 	}
 }
@@ -1316,18 +1266,8 @@ country_event = {
 		}
 	}
 	immediate = {
-		if = {
-			limit = {
-				RG_OR_has_wsg_mod_trigger = yes
-			}
-			country_event = {
-				id = rg_graygoo.505
-			}
-		}
-		else = {
-			country_event = {
-				id = rg_grayleader.505
-			}
+		country_event = {
+			id = rg_grayleader.505
 		}
 	}
 }
@@ -1403,7 +1343,9 @@ country_event = {
 	desc = "graygoo.511.desc"
 	picture = GFX_evt_circuitry_modification
 	show_sound = event_radio_chatter
+
 	is_triggered_only = yes
+
 	option = {
 		name = graygoo.511.a
 	}

events/RG_cluster_events.txt

@@ -212,7 +212,7 @@ country_event = {
 					is_machine_empire = no
 				}
 			}
-			every_owned_pop = {
+			every_owned_pop_group = {
 				modify_species = {
 					species = this
 					ideal_planet_class = pc_nuked
@@ -249,18 +249,20 @@ country_event = {
 			set_location = event_target:rg_cluster_home_system_loc
 		}
 		event_target:rg_cluster_previous_home_planet = {
+
 			# move pops
-			every_owned_pop = {
-				resettle_pop = {
-					pop = this
-					planet = event_target:rg_cluster_home_planet
+			every_owned_pop_group = {
+				resettle_pop_group = {
+					POP_GROUP = this
+					PLANET = event_target:rg_cluster_home_planet
+					PERCENTAGE = 1
 				}
 				unemploy_pop = yes
 			}
 			remove_planet = yes
 		}
 		event_target:rg_cluster_home_planet = {
-			every_owned_pop = {
+			every_owned_pop_group  = {
 				unemploy_pop = yes
 				clear_pop_category = yes
 			}
@@ -416,10 +418,12 @@ country_event = {
 		}
 	}
 	option = {
+		trigger = {
+			always = yes
+		}
 		name = "rg_cluster.11.a"
 	}
 }
-
 # Inform other empires of the L-Cluster being open (has project or event chain)
 country_event = {
 	id = rg_cluster.12
@@ -446,10 +450,12 @@ country_event = {
 		}
 	}
 	option = {
+		trigger = {
+			always = yes
+		}
 		name = "rg_cluster.12.a"
 	}
 }
-
 # Inform other empires of the L-Cluster being open (has nothing)
 country_event = {
 	id = rg_cluster.13
@@ -459,6 +465,9 @@ country_event = {
 	picture = GFX_evt_l-gateway
 	show_sound = event_mystic_reveal
 	option = {
+		trigger = {
+			always = yes
+		}
 		name = "rg_cluster.13.a"
 	}
 }

events/RG_combat_skill_events.txt

@@ -684,6 +684,7 @@ country_event = {
 	hide_window = yes
 	is_triggered_only = yes
 	trigger = {
+		exists = fromfrom.leader
 		OR = {
 			fromfrom.leader = {
 				has_trait = RG_leader_trait_admiral_nanorebuild_gray
@@ -717,8 +718,9 @@ country_event = {
 	hide_window = yes
 	is_triggered_only = yes
 	trigger = {
+		exists = fromfromfrom.leader
 		OR = {
-			fromfrom.leader = {
+			fromfromfrom.leader = {
 				has_trait = RG_leader_trait_admiral_nanorebuild_gray
 			}
 		}

events/RG_deficit_event.txt

@@ -0,0 +1,159 @@
+namespace = rg_deficit
+
+situation_event = {
+	id = rg_deficit.170
+	title = deficit.170.name
+	desc = {
+		text = rg_deficit.170.desc
+		trigger = { owner = { is_machine_empire = no } }
+	}
+	desc = {
+		text = rg_deficit.170.desc.machine
+		trigger = { owner = { is_machine_empire = yes } }
+	}
+	picture = GFX_evt_deficit
+	show_sound = event_bad_omen
+	is_triggered_only = yes
+	situation = this
+
+	abort_trigger = {
+		situation_progress >= 100
+	}
+
+	immediate = {
+		owner = {
+			# if normal empire, get all non-sapient or enslaved robots
+			if = {
+				limit = {
+					is_machine_empire = no
+				}
+				ordered_owned_planet = {
+					limit = {
+						any_owned_pop_group = {
+							OR = {
+								is_shackled_robot = yes
+								is_non_sapient_robot = yes
+							}
+						}
+					}
+					order_by = value:num_non_sapient_robots_on_planet
+					position = 0
+					save_event_target_as = robots_planet
+					event_target:robots_planet = {
+						count_robots_to_recycle = { ALLOYS = 100 }
+					}
+				}
+			}
+			# if machine empire, the planet with most pops...
+			else = {
+				ordered_owned_planet = {
+					limit = {
+						any_owned_pop_group = {
+							is_robot_pop = yes
+						}
+					}
+					order_by = trigger:pop_amount
+					position = 0
+					save_event_target_as = robots_planet
+					event_target:robots_planet = {
+						# ...and halven the number of recycled bots here
+						count_robots_to_recycle = { ALLOYS = 100 }
+					}
+				}
+
+			}
+		}
+	}
+
+	# scrap all robots on a planet (normal empires)
+	option = {
+		name = rg_deficit.170.A
+		custom_tooltip = rg_deficit.170.A.tooltip
+		trigger = {
+			owner = {
+				is_machine_empire = no
+			}
+			exists = event_target:robots_planet
+		}
+		hidden_effect = {
+			event_target:robots_planet = {
+				every_owned_pop_group = {
+					limit = {
+						OR = {
+							is_shackled_robot = yes
+							is_non_sapient_robot = yes
+						}
+					}
+					kill_single_pop = yes
+				}
+			}
+			owner = {
+				add_resource = {
+					nanites = 1
+					mult = event_target:robots_planet.total_alloys_gained
+				}
+			}
+		}
+	}
+	# scrap half robot pops on a planet (machine empires)
+	option = {
+		name = rg_deficit.170.B
+		custom_tooltip = rg_deficit.170.B.tooltip
+		trigger = {
+			owner = {
+				is_machine_empire = yes
+			}
+			exists = event_target:robots_planet
+		}
+		hidden_effect = {
+			event_target:robots_planet = {
+				while = {
+					count = recycled_robots_100
+					random_owned_pop_group = {
+						limit = {
+							is_robot_pop_group = yes
+						}
+						kill_single_pop = yes
+					}
+				}
+			}
+
+			owner = {
+				add_resource = {
+					nanites = 1
+					mult = event_target:robots_planet.total_alloys_gained
+				}
+			}
+		}
+	}
+
+	option = {
+		name = deficit.100.C
+	}
+}
+
+situation_event = {
+	id = rg_deficit.220
+	title = BANKRUPTCY
+	desc = rg_deficit.175.desc
+	picture = GFX_evt_deficit
+	show_sound = event_life_support_fail
+	is_triggered_only = yes
+	situation = this
+	force_open = yes
+
+	option = {
+		name = UNFORTUNATE
+
+		owner = {
+			add_resource = {
+				nanites = @bailout_strategic_base_amount
+				mult = value:bailout_scaling_factor
+			}
+			country_defaulted_effect = yes
+		}
+	}
+	after = {
+		destroy_situation = this
+	}
+}

events/RG_events.txt

@@ -1,35 +1,75 @@
 namespace = rg_event
 # 灰风起源创建灰风事件
-# Spawn L-Cluster
+# Fired from on_game_start_country
+# Scope = Country
 country_event = {
 	id = rg_event.1
 	hide_window = yes
 	is_triggered_only = yes
 	trigger = {
+		#有遥远约定起源
 		AND = {
 			has_origin = origin_rg_gray
 			# NOT = { has_global_flag = rg_origin_l_cluster }
 		}
 	}
 	immediate = {
+		#星团起源
 		if = {
 			limit = {
+				#有星团起源标记
 				has_civic = civic_rg_gray_cluster
 			}
-			rg_event_effect_event1_cluster = yes
+			if = {
+				#前提是没有已经存在的第一个遥远约定起源的全局标记
+				limit = {
+					NOT = {
+						has_global_flag = origin_rg_gray_1st_global
+					}
+				}
+				rg_event_effect_event1_cluster = yes
+			}
+			else = {
+				#不是第一个选了遥远约定起源的国家，怎么办？
+				rg_event_effect_event1_dragon = yes
+			}
 		}
+		#银河起源
 		else_if = {
 			limit = {
+				#有银河起源标记
 				has_civic = civic_rg_gray_non_cluster
 			}
-			rg_event_effect_event1_cluster_galaxy = yes
+			if = {
+				limit = {
+					OR = {
+						#有遥远的故事起源国家,这个条件为什么在这我忘了
+						any_country = {
+							has_origin = origin_Asgray
+						}
+						#前提是没有已经存在的第一个遥远约定起源的全局标记
+						NOT = {
+							has_global_flag = origin_rg_gray_1st_global
+						}
+					}
+				}
+				rg_event_effect_event1_galaxy = yes
+			}
+			else = {
+				#不是第一个选了遥远约定起源的国家，怎么办？
+				rg_event_effect_event1_dragon = yes
+			}
 		}
+		#两个标记都没有默认扔进星团
 		else = {
 			rg_event_effect_event1_cluster = yes
 		}
 	}
 }
 
+#小灰打招呼事件
+# Fired from rg_event.1
+# Scope = Country
 country_event = {
 	id = rg_event.2
 	title = graygoo.500.title
@@ -42,9 +82,11 @@ country_event = {
 	is_triggered_only = yes
 	immediate = {
 		rg_gray_country_init = yes
+		#真正送小灰的事件调用499
 		country_event = {
 			id = graygoo.499
 		}
+		#给开局小科技
 		give_technology = {
 			tech = tech_minilaser_gray_1
 			message = no
@@ -59,7 +101,6 @@ country_event = {
 		default_hide_option = yes
 	}
 }
-
 country_event = {
 	id = rg_event.3
 	title = "graygoo.500.title"
@@ -476,7 +517,7 @@ country_event = {
 					has_leader_flag = rg_gray_leader
 				}
 				export_trigger_value_to_variable = {
-					trigger = has_skill
+					trigger = has_base_skill
 					variable = rg_gray_level_temp
 				}
 				owner = {
@@ -1081,7 +1122,7 @@ planet_event = {
 	}
 
 	immediate = {
-		random_owned_pop = {
+		weighted_random_owned_pop_group = {
 			limit = {
 				is_same_species = owner_species
 			}
@@ -1091,18 +1132,26 @@ planet_event = {
 			limit = {
 				exists = event_target:necrophage_pop_species
 			}
-			create_pop = {
+			create_pop_group = {
 				species = event_target:necrophage_pop_species
+				size = 0
+				effect = {
+					save_event_target_as = last_created_pop_group
+				}
 			}
 		}
 		else = {
-			create_pop = {
+			create_pop_group = {
 				species = owner_species
+				size = 0
+				effect = {
+					save_event_target_as = last_created_pop_group
+				}
 			}
 		}
 		if = {
 			limit = {
-				last_created_pop = {
+				event_target:last_created_pop_group = {
 					NOT = { ideal_planet_class = root }
 				}
 				NOR = {
@@ -1119,27 +1168,33 @@ planet_event = {
 					NOT = { ideal_planet_class = root }
 				}
 			}
-			last_created_pop = {
+			event_target:last_created_pop_group = {
 				modify_species = {
 					ideal_planet_class = root
 				}
 			}
 		}
-		if = {
-			limit = {
-				from = {
-					OR = {
-						has_active_tradition = tr_harmony_unity_of_self
-						has_active_tradition = tr_synchronicity_unity_of_mind
+		event_target:last_created_pop_group = {
+			add_pop_amount = local_pop_amount
+		}
+		while = {
+			count = local_pop_amount
+			if = {
+				limit = {
+					from = {
+						OR = {
+							has_active_tradition = tr_harmony_unity_of_self
+							has_active_tradition = tr_synchronicity_unity_of_mind
+						}
 					}
 				}
-			}
-			from = {
-				add_monthly_resource_mult = {
-					resource = unity
-					value = 1.5
-					min = 5
-					max = 100
+				from = {
+					add_monthly_resource_mult = {
+						resource = unity
+						value = 1.5
+						min = 5
+						max = 100
+					}
 				}
 			}
 		}
@@ -1165,7 +1220,10 @@ planet_event = {
 					level >= 2
 				}
 			}
-			add_opinion_modifier = { who = FROM modifier = opinion_necrophage }
+			while = {
+				count = local_pop_amount
+				add_opinion_modifier = { who = FROM modifier = opinion_nanophage }
+			}
 		}
 		every_country = {
 			limit = {
@@ -1178,7 +1236,10 @@ planet_event = {
 					level >= 1 #lower because you'd hear from a friend of a friend
 				}
 			}
-			add_opinion_modifier = { who = FROM modifier = opinion_necrophage_our_species }
+			while = {
+				count = local_pop_amount
+				add_opinion_modifier = { who = FROM modifier = opinion_nanophage_our_species }
+			}
 		}
 	}
 }
@@ -1194,21 +1255,15 @@ country_event = { # Memorial Valuts Civic Paragon Level Tick / FROM = Leader
 
 	immediate = {
 		rg_create_gray_planetkiller_testship_2 = yes
-		every_owned_pop = {
-			limit = {
-				is_same_species = root
-				species = {
-					NOT = {
-						has_trait = rg_machine_maid_trait
-					}
+		capital_scope = {
+			every_owned_pop_group = {
+				modify_species = {
+					species = owner_main_species
+					add_trait = rg_machine_maid_trait
 				}
 			}
-			modify_species = {
-				species = this
-				add_trait = rg_machine_maid_trait
-			}
-			species = { save_event_target_as = gray_owner_modded_species }
 		}
+
 	}
 }
 
@@ -1332,81 +1387,82 @@ country_event = {
 }
 
 # 灰色风暴线小灰通讯
-country_event = {
-	id = rg_event.400
-	title = "TRANSMISSION"
-	trigger = {
-		NOT = {
-			any_playable_country = {
-				has_country_flag = gray_owner
-			}
-		}
-	}
-	desc = {
-		trigger = {
-			NOT = {
-				has_authority = auth_machine_intelligence
-			}
-		}
-		text = "rg_event.400.a.desc"
-	}
-	desc = {
-		trigger = {
-			has_authority = auth_machine_intelligence
-		}
-		text = "rg_event.400.b.desc"
-	}
-	diplomatic = yes
-	picture_event_data = {
-		portrait = root.species
-		room = "ethic_spaceship_room"
-	}
-	is_triggered_only = yes
-	option = {
-		name = rg_event.400.a
-		trigger = {
-			NOR = {
-				has_authority = auth_machine_intelligence
-				has_authority = auth_hive_mind
-			}
-		}
-		hidden_effect = {
-			country_event = {
-				id = graygoo.406
-			}
-		}
-	}
-	option = {
-		name = rg_event.400.b
-		trigger = {
-			has_authority = auth_machine_intelligence
-		}
-		hidden_effect = {
-			country_event = {
-				id = graygoo.406
-			}
-		}
-	}
-	option = {
-		name = rg_event.400.c
-		trigger = {
-			has_authority = auth_hive_mind
-		}
-		hidden_effect = {
-			country_event = {
-				id = graygoo.406
-			}
-		}
-	}
-	option = {
-		name = rg_event.400.d
-		hidden_effect = {
-			country_event = {
-				id = rg_event.401
-			}
-		}
-	}
-}
+# country_event = {
+# 	id = rg_event.400
+# 	title = "TRANSMISSION"
+# 	is_triggered_only = yes
+# 	trigger = {
+# 		NOT = {
+# 			any_playable_country = {
+# 				has_country_flag = gray_owner
+# 			}
+# 		}
+# 	}
+# 	desc = {
+# 		trigger = {
+# 			NOT = {
+# 				is_machine_empire = yes
+# 			}
+# 		}
+# 		text = "rg_event.400.a.desc"
+# 	}
+# 	desc = {
+# 		trigger = {
+# 			is_machine_empire = yes
+# 		}
+# 		text = "rg_event.400.b.desc"
+# 	}
+# 	diplomatic = yes
+# 	picture_event_data = {
+# 		portrait = root.species
+# 		room = "ethic_spaceship_room"
+# 	}
+#
+# 	option = {
+# 		name = rg_event.400.a
+# 		trigger = {
+# 			NOR = {
+# 				is_machine_empire = yes
+# 				is_hive_empire = yes
+# 			}
+# 		}
+# 		hidden_effect = {
+# 			country_event = {
+# 				id = graygoo.406
+# 			}
+# 		}
+# 	}
+# 	option = {
+# 		name = rg_event.400.b
+# 		trigger = {
+# 			is_machine_empire = yes
+# 		}
+# 		hidden_effect = {
+# 			country_event = {
+# 				id = graygoo.406
+# 			}
+# 		}
+# 	}
+# 	option = {
+# 		name = rg_event.400.c
+# 		trigger = {
+# 			is_hive_empire = yes
+# 		}
+# 		hidden_effect = {
+# 			country_event = {
+# 				id = graygoo.406
+# 			}
+# 		}
+# 	}
+# 	option = {
+# 		name = rg_event.400.d
+# 		hidden_effect = {
+# 			country_event = {
+# 				id = rg_event.401
+# 			}
+# 		}
+# 	}
+# }
 
 country_event = {
 	id = rg_event.401

events/RG_fe_events.txt

@@ -0,0 +1,36 @@
+namespace = rg_fe
+
+# Gray 2
+country_event = {
+    id = rg_fe.2
+    title = "TRANSMISSION"
+    desc = {
+        trigger = {
+            NOT = {
+                is_machine_empire = yes
+            }
+        }
+        text = "graygoo.402.a.desc"
+    }
+    desc = {
+        trigger = {
+            is_machine_empire = yes
+        }
+        text = "graygoo.402.b.desc"
+    }
+    diplomatic = yes
+    picture_event_data = {
+        portrait = event_target:rg_gray_country_leader
+        planet_background = event_target:gray_homeworld
+        room = "ethic_spaceship_room"
+    }
+    is_triggered_only = yes
+    option = {
+        name = graygoo.402.a
+        hidden_effect = {
+            country_event = {
+                id = graygoo.403
+            }
+        }
+    }
+}

events/RG_machine_event.txt

@@ -27,11 +27,9 @@ country_event = {
 			}
 		}
 		capital_scope = {
-			while = {
-				count = 5
-				create_pop = {
-					species = event_target:rg_maid_species
-				}
+			create_pop_group = {
+				species = event_target:rg_maid_species
+				size = 5
 			}
 		}
 	}

events/RG_origin_event.txt

@@ -43,10 +43,10 @@ country_event = {
 			set_country_flag = rg_scion_needs_fe
 			if = {
 				limit ={
-					any_playable_country = {
-						AND = {
+					OR = {
+						rg_all_cluster_mod_check_for_scion = yes
+						any_playable_country = {
 							has_origin = origin_rg_gray
-							# NOT = { has_global_flag = rg_origin_l_cluster }
 						}
 					}
 				}

events/RG_planet_event.txt

@@ -1,4 +1,6 @@
 namespace = rg_planet
+
+
 # Furnace Lvl 1
 country_event = {
 	id = rg_planet.1000
@@ -260,11 +262,11 @@ country_event = {
 			NOR = {
 				free_jobs_of_type = {
 					job = mortal_initiate
-					value >= 1
+					value >= 100
 				}
 				free_jobs_of_type = {
 					category = bio_trophy
-					value >= 1
+					value >= 100
 				}
 			}
 		}
@@ -287,30 +289,23 @@ country_event = {
 		else = {
 			random_owned_planet = {
 				limit = {
-					owner = {
-						RG_gray_harbitat_active_trigger = yes
+					is_under_colonization = no
+					OR = {
+						is_planet_class = pc_rg_grayhabitat
+						is_planet_class = pc_nanotech
 					}
-					# exists = event_target:rg_gray_habitat_target
-					PREV = {
-						any_owned_planet = {
-							is_under_colonization = no
-							OR = {
-								is_planet_class = pc_rg_grayhabitat
-								is_planet_class = pc_nanotech
-							}
-							free_jobs > 0
-							NOR = {
-								free_jobs_of_type = {
-									job = mortal_initiate
-									value >= 1
-								}
-								free_jobs_of_type = {
-									category = bio_trophy
-									value >= 1
-								}
-							}
+					free_jobs > 0
+					NOR = {
+						free_jobs_of_type = {
+							job = mortal_initiate
+							value >= 100
+						}
+						free_jobs_of_type = {
+							category = bio_trophy
+							value >= 100
 						}
 					}
+					# exists = event_target:rg_gray_habitat_target
 				}
 				planet_event = {
 					id = rg_planet.2027
@@ -379,43 +374,65 @@ planet_event = {
 	}
 	immediate = {
 		set_variable = {
-			which = num_pops
+			which = pop_amount
 			value = value:num_free_virtual_jobs
 		}
 		# Create pops for every free job
 		if = {
 			limit = {
 				owner = {
+					exists = event_target:gray_owner
 					is_same_value = event_target:gray_owner
+					exists = event_target:rg_owner_main_maid_species
 				}
 			}
 			while = {
-				count = num_pops
-				create_pop = {
+				count = pop_amount
+				create_pop_group = {
 					species = event_target:rg_owner_main_maid_species
 				}
 			}
 		}
 		else = {
-			while = {
-				count = num_pops
-				create_pop = {
-					species = owner_main_species
+			if = {
+				limit = {
+					owner = {
+						any_owned_species = {
+							rg_is_main_species_with_maid_trait_trigger = yes
+						}
+					}
+				}
+				owner = {
+					random_owned_species = {
+						limit = {
+							rg_is_main_species_with_maid_trait_trigger = yes
+						}
+						save_event_target_as = rg_maid_species
+					}
+				}
+				while = {
+					count = pop_amount
+					create_pop_group = {
+						species = event_target:rg_maid_species
+					}
 				}
 			}
 		}
 		# Kill pops generated in excess (e.g. from forbidden jobs)
 		if = {
 			limit = {
-				any_owned_pop = {
+				any_owned_pop_group = {
 					is_unemployed = yes
 				}
 			}
-			every_owned_pop = {
+			every_owned_pop_group = {
 				limit = {
 					is_unemployed = yes
 				}
-				kill_pop = yes
+				kill_pop_group = {
+					pop_group = this
+					percentage = 1
+				}
 			}
 		}
 	}
@@ -431,18 +448,21 @@ country_event = {
 	trigger = {
 		RG_gray_harbitat_active_trigger = yes
 		event_target:rg_gray_habitat_target = {
-			any_owned_pop = {
+			any_owned_pop_group = {
 				is_unemployed = yes
 			}
 		}
 	}
 	immediate = {
 		event_target:rg_gray_habitat_target = {
-			every_owned_pop = {
+			every_owned_pop_group = {
 				limit = {
 					is_unemployed = yes
 				}
-				kill_pop = yes
+				kill_pop_group = {
+					pop_group = this
+					percentage = 1
+				}
 			}
 		}
 	}
@@ -462,16 +482,19 @@ planet_event = {
 		owner = {
 			RG_gray_harbitat_active_trigger = yes
 		}
-		any_owned_pop = {
+		any_owned_pop_group = {
 			is_unemployed = yes
 		}
 	}
 	immediate = {
-		every_owned_pop = {
+		every_owned_pop_group = {
 			limit = {
 				is_unemployed = yes
 			}
-			kill_pop = yes
+			kill_pop_group = {
+				pop_group = this
+				percentage = 1 # 100% of Unemployed Pops
+			}
 		}
 	}
 }

events/RG_story_event.txt

@@ -621,7 +621,10 @@ country_event = {
 				has_leader_flag = rg_fake_dragon
 			}
 			remove_trait = RG_leader_trait_admiral_timed_life
-			add_trait = RG_leader_trait_admiral_born_tobe_dragon
+			add_trait = {
+				trait = RG_leader_trait_admiral_born_tobe_dragon
+				show_message = no
+			}
 			set_leader_flag = rg_fake_dragon_reborn
 			set_age = 0
 		}
@@ -634,795 +637,4 @@ country_event = {
 			id = rg_story.21
 		}
 	}
-}
-
-country_event = {
-	id = rg_story.21
-	title = "rg_story.21.title"
-	is_triggered_only = yes
-	trigger = {
-	}
-	picture = GFX_evt_space_dragon
-	show_sound = evn_fc_observation
-	desc = {
-		text = "rg_story.21.desc"
-	}
-	option = {
-		name = rg_story.21.a
-		default_hide_option = yes
-	}
-}
-
-# 龙噶了把所有卡住的的模拟龙扫描事件中止
-country_event = {
-	id = rg_story.22
-	hide_window = yes
-	is_triggered_only = yes
-	trigger = {
-		from = {
-			is_country_type = guardian_dragon
-			NOR = {
-				has_country_flag = rubricator_dragon_country
-				has_country_flag = here_be_the_dragon
-			}
-		}
-		#fromfromfrom = {
-		#	has_fleet_flag = dragon_fleet
-		#}
-	}
-	immediate = {
-		every_country = {
-			limit = {
-				has_special_project = RG_FAKE_DRAGON_SCAN_PROJECT
-			}
-			abort_special_project = {
-				type = RG_FAKE_DRAGON_SCAN_PROJECT
-			}
-		}
-	}
-}
-
-# 开始改造
-country_event = {
-	id = rg_story.23
-	title = rg_story.23.title
-	desc = rg_story.23.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.23.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.23.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 1500
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 1500
-			}
-		}
-		add_resource = {
-			energy = -1500
-			alloys = -1500
-		}
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_1_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.24
-	title = rg_story.24.title
-	desc = rg_story.24.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.24.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.24.b
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_2_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.25
-	title = rg_story.25.title
-	desc = rg_story.25.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.25.a
-		default_hide_option = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_3_booster
-		}
-	}
-	option = {
-		name = rg_story.25.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 5000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 5000
-			}
-		}
-		add_resource = {
-			energy = -5000
-			alloys = -5000
-		}
-		rg_create_gray_mod1_testship_1 = yes
-	}
-}
-
-country_event = {
-	id = rg_story.26
-	title = rg_story.26.title
-	desc = rg_story.26.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.26.a
-		default_hide_option = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_4_booster
-		}
-	}
-	option = {
-		name = rg_story.26.b
-		add_resource = {
-			energy = -5000
-			alloys = -5000
-		}
-		rg_create_gray_planetkiller_testship_1 = yes
-	}
-}
-
-country_event = {
-	id = rg_story.27
-	title = rg_story.27.title
-	desc = rg_story.27.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.27.a
-		default_hide_option = yes
-
-	}
-	option = {
-		name = rg_story.27.b
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_5_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.28
-	title = rg_story.28.title
-	desc = rg_story.28.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-		enable_special_project = {
-			name = RG_GRAY_MOD1
-			location = event_target:gray_owner_capital_starbase
-			owner = event_target:gray_owner
-		}
-	}
-	option = {
-		name = rg_story.28.a
-		default_hide_option = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_locked = yes
-			set_situation_flag = locked
-			set_situation_flag = rg_stage6_locked
-			set_situation_flag = situation_rg_gray_mod1_stage_6_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.29
-	title = rg_story.29.title
-	desc = rg_story.29.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.29.a
-		default_hide_option = yes
-	}
-}
-
-country_event = {
-	id = rg_story.30
-	title = rg_story.30.title
-	desc = rg_story.30.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.30.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.30.b
-		enable_special_project = {
-			name = rg_gray_mod2_stage1_project
-			# location = event_target:gray_owner_capital_starbase
-			owner = event_target:gray_owner
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.31
-	title = rg_story.31.title
-	desc = rg_story.31.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.31.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.31.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = nanites
-				value >= 150
-			}
-		}
-		add_resource = {
-			nanites = -150
-		}
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod2
-			}
-			set_situation_flag = situation_rg_gray_mod2_stage_2_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.32
-	title = rg_story.32.title
-	desc = rg_story.32.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.32.a
-		default_hide_option = yes
-	}
-}
-
-country_event = {
-	id = rg_story.33
-	title = rg_story.33.title
-	desc = rg_story.33.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.33.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.33.b
-		enable_special_project = {
-			name = rg_gray_mod2_stage4_project
-			# location = event_target:gray_owner_capital_starbase
-			owner = event_target:gray_owner
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.34
-	title = rg_story.34.title
-	desc = rg_story.34.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.34.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.34.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 1500
-			}
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 1500
-			}
-		}
-		add_resource = {
-			alloys = -1500
-		}
-		add_resource = {
-			energy = -1500
-		}
-		rg_create_gray_mod1_testship_2 = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod2
-			}
-			set_situation_flag = situation_rg_gray_mod2_stage_5_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.35
-	title = rg_story.35.title
-	desc = rg_story.35.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.35.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.35.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 1500
-			}
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 1500
-			}
-		}
-		add_resource = {
-			alloys = -1500
-		}
-		add_resource = {
-			energy = -1500
-		}
-		rg_create_gray_mod1_testship_2 = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod2
-			}
-			set_situation_flag = situation_rg_gray_mod2_stage_6_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.36
-	title = rg_story.36.title
-	desc = rg_story.36.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.36.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.36.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 4000
-			}
-			resource_stockpile_compare = {
-				resource = minerals
-				value >= 1500
-			}
-		}
-		add_resource = {
-			alloys = -1500
-		}
-		add_resource = {
-			energy = -1500
-		}
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod2
-			}
-			set_situation_flag = situation_rg_gray_mod2_stage_7_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.37
-	title = rg_story.37.title
-	desc = rg_story.37.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.37.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.37.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = consumer_goods
-				value >= 3000
-			}
-		}
-		add_resource = {
-			consumer_goods = -3000
-		}
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod2
-			}
-			set_situation_flag = situation_rg_gray_mod2_stage_8_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.38
-	title = rg_story.38.title
-	desc = rg_story.38.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.38.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.38.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 1500
-			}
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 1500
-			}
-		}
-		add_resource = {
-			alloys = -1500
-		}
-		add_resource = {
-			energy = -1500
-		}
-		rg_create_gray_mod1_testship_2 = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod2
-			}
-			set_situation_flag = situation_rg_gray_mod2_stage_9_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.39
-	title = rg_story.39.title
-	desc = rg_story.39.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.39.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.39.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 3000
-			}
-		}
-		add_resource = {
-			alloys = -3000
-		}
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod2
-			}
-			set_situation_flag = situation_rg_gray_mod2_stage_10_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.40
-	title = rg_story.40.title
-	desc = rg_story.40.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.40.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.40.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = nanites
-				value >= 500
-			}
-		}
-		add_resource = {
-			alloys = -500
-		}
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod2
-			}
-			set_situation_flag = situation_rg_gray_mod2_stage_11_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.41
-	title = rg_story.41.title
-	desc = rg_story.41.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-		enable_special_project = {
-			name = RG_GRAY_MOD2
-			location = event_target:gray_owner_capital_starbase
-			owner = event_target:gray_owner
-		}
-	}
-	option = {
-		name = rg_story.41.a
-		default_hide_option = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod2
-			}
-			set_situation_locked = yes
-			set_situation_flag = locked
-			set_situation_flag = rg_stage6_locked
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.42
-	title = rg_story.42.title
-	desc = rg_story.42.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.42.a
-		default_hide_option = yes
-	}
-}
-
-country_event = {
-	id = rg_story.43
-	title = rg_story.43.title
-	desc = rg_story.43.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-		enable_special_project = {
-			name = RG_GRAY_MOD3
-			location = event_target:gray_owner_capital_starbase
-			owner = event_target:gray_owner
-		}
-	}
-	option = {
-		name = rg_story.43.a
-		default_hide_option = yes
-	}
 }

events/RG_story_event2.txt

@@ -0,0 +1,792 @@
+namespace = rg_story
+
+country_event = {
+	id = rg_story.21
+	title = "rg_story.21.title"
+	is_triggered_only = yes
+	trigger = {
+	}
+	picture = GFX_evt_space_dragon
+	show_sound = evn_fc_observation
+	desc = {
+		text = "rg_story.21.desc"
+	}
+	option = {
+		name = rg_story.21.a
+		default_hide_option = yes
+	}
+}
+
+# 龙噶了把所有卡住的的模拟龙扫描事件中止
+country_event = {
+	id = rg_story.22
+	hide_window = yes
+	is_triggered_only = yes
+	trigger = {
+		from = {
+			is_country_type = guardian_dragon
+			NOR = {
+				has_country_flag = rubricator_dragon_country
+				has_country_flag = here_be_the_dragon
+			}
+		}
+		#fromfromfrom = {
+		#	has_fleet_flag = dragon_fleet
+		#}
+	}
+	immediate = {
+		every_country = {
+			limit = {
+				has_special_project = RG_FAKE_DRAGON_SCAN_PROJECT
+			}
+			abort_special_project = {
+				type = RG_FAKE_DRAGON_SCAN_PROJECT
+			}
+		}
+	}
+}
+
+# 开始改造
+country_event = {
+	id = rg_story.23
+	title = rg_story.23.title
+	desc = rg_story.23.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.23.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.23.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+		}
+		add_resource = {
+			energy = -1500
+			alloys = -1500
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_1_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.24
+	title = rg_story.24.title
+	desc = rg_story.24.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.24.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.24.b
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_2_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.25
+	title = rg_story.25.title
+	desc = rg_story.25.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.25.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_3_booster
+		}
+	}
+	option = {
+		name = rg_story.25.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 5000
+			}
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 5000
+			}
+		}
+		add_resource = {
+			energy = -5000
+			alloys = -5000
+		}
+		rg_create_gray_mod1_testship_1 = yes
+	}
+}
+
+country_event = {
+	id = rg_story.26
+	title = rg_story.26.title
+	desc = rg_story.26.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.26.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_4_booster
+		}
+	}
+	option = {
+		name = rg_story.26.b
+		add_resource = {
+			energy = -5000
+			alloys = -5000
+		}
+		rg_create_gray_planetkiller_testship_1 = yes
+	}
+}
+
+country_event = {
+	id = rg_story.27
+	title = rg_story.27.title
+	desc = rg_story.27.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.27.a
+		default_hide_option = yes
+
+	}
+	option = {
+		name = rg_story.27.b
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_5_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.28
+	title = rg_story.28.title
+	desc = rg_story.28.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+		enable_special_project = {
+			name = RG_GRAY_MOD1
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	option = {
+		name = rg_story.28.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_locked = yes
+			set_situation_flag = locked
+			set_situation_flag = rg_stage6_locked
+			set_situation_flag = situation_rg_gray_mod1_stage_6_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.29
+	title = rg_story.29.title
+	desc = rg_story.29.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.29.a
+		default_hide_option = yes
+	}
+}
+
+country_event = {
+	id = rg_story.30
+	title = rg_story.30.title
+	desc = rg_story.30.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.30.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.30.b
+		enable_special_project = {
+			name = rg_gray_mod2_stage1_project
+			# location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.31
+	title = rg_story.31.title
+	desc = rg_story.31.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.31.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.31.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = nanites
+				value >= 150
+			}
+		}
+		add_resource = {
+			nanites = -150
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_2_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.32
+	title = rg_story.32.title
+	desc = rg_story.32.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.32.a
+		default_hide_option = yes
+	}
+}
+
+country_event = {
+	id = rg_story.33
+	title = rg_story.33.title
+	desc = rg_story.33.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.33.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.33.b
+		enable_special_project = {
+			name = rg_gray_mod2_stage4_project
+			# location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.34
+	title = rg_story.34.title
+	desc = rg_story.34.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.34.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.34.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+		}
+		add_resource = {
+			alloys = -1500
+		}
+		add_resource = {
+			energy = -1500
+		}
+		rg_create_gray_mod1_testship_2 = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_5_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.35
+	title = rg_story.35.title
+	desc = rg_story.35.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.35.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.35.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+		}
+		add_resource = {
+			alloys = -1500
+		}
+		add_resource = {
+			energy = -1500
+		}
+		rg_create_gray_mod1_testship_2 = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_6_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.36
+	title = rg_story.36.title
+	desc = rg_story.36.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.36.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.36.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 4000
+			}
+			resource_stockpile_compare = {
+				resource = minerals
+				value >= 1500
+			}
+		}
+		add_resource = {
+			alloys = -1500
+		}
+		add_resource = {
+			energy = -1500
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_7_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.37
+	title = rg_story.37.title
+	desc = rg_story.37.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.37.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.37.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = consumer_goods
+				value >= 3000
+			}
+		}
+		add_resource = {
+			consumer_goods = -3000
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_8_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.38
+	title = rg_story.38.title
+	desc = rg_story.38.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.38.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.38.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+		}
+		add_resource = {
+			alloys = -1500
+		}
+		add_resource = {
+			energy = -1500
+		}
+		rg_create_gray_mod1_testship_2 = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_9_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.39
+	title = rg_story.39.title
+	desc = rg_story.39.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.39.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.39.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 3000
+			}
+		}
+		add_resource = {
+			alloys = -3000
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_10_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.40
+	title = rg_story.40.title
+	desc = rg_story.40.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.40.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.40.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = nanites
+				value >= 500
+			}
+		}
+		add_resource = {
+			alloys = -500
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_11_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.41
+	title = rg_story.41.title
+	desc = rg_story.41.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+		enable_special_project = {
+			name = RG_GRAY_MOD2
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	option = {
+		name = rg_story.41.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_locked = yes
+			set_situation_flag = locked
+			set_situation_flag = rg_stage6_locked
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.42
+	title = rg_story.42.title
+	desc = rg_story.42.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.42.a
+		default_hide_option = yes
+	}
+}
+
+country_event = {
+	id = rg_story.43
+	title = rg_story.43.title
+	desc = rg_story.43.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+		enable_special_project = {
+			name = RG_GRAY_MOD3
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	option = {
+		name = rg_story.43.a
+		default_hide_option = yes
+	}
+}

events/RG_wsg_graygoo_event.txt

@@ -1,143 +0,0 @@
-namespace = rg_graygoo
-# 舰R启用兼容用事件
-# Main Menu (Initial)
-country_event = {
-	id = rg_graygoo.500
-	title = "graygoo.500.title"
-	desc = "graygoo.500.a.desc"
-	desc = "graygoo.500.b.desc"
-	desc = "graygoo.500.c.desc"
-	desc = "graygoo.500.d.desc"
-	diplomatic = yes
-	custom_gui = wg_gray_new_commu_window
-	custom_gui_option = wg_new_commu_option
-	is_triggered_only = yes
-	inline_script = {
-		script = events/rg_graygoo/rg_graygoo.500
-	}
-}
-
-# Main Menu (Governor)
-country_event = {
-	id = rg_graygoo.501
-	title = "graygoo.500.title"
-	desc = "graygoo.501.a.desc"
-	desc = "graygoo.501.b.desc"
-	desc = "graygoo.501.c.desc"
-	desc = "graygoo.501.d.desc"
-	diplomatic = yes
-	custom_gui = wg_gray_new_commu_window
-	custom_gui_option = wg_new_commu_option
-	is_triggered_only = yes
-	inline_script = {
-		script = events/rg_graygoo/rg_graygoo.501
-	}
-}
-
-# Main Menu (Warship)
-country_event = {
-	id = rg_graygoo.502
-	title = "graygoo.500.title"
-	desc = "graygoo.502.a.desc"
-	desc = "graygoo.502.b.desc"
-	desc = "graygoo.502.c.desc"
-	desc = "graygoo.502.d.desc"
-	diplomatic = yes
-	custom_gui = wg_gray_new_commu_window
-	custom_gui_option = wg_new_commu_option
-	is_triggered_only = yes
-	inline_script = {
-		script = events/rg_graygoo/rg_graygoo.502
-	}
-}
-
-# Main Menu (Army)
-country_event = {
-	id = rg_graygoo.503
-	title = "graygoo.500.title"
-	desc = "graygoo.503.a.desc"
-	desc = "graygoo.503.b.desc"
-	desc = "graygoo.503.c.desc"
-	desc = "graygoo.503.d.desc"
-	diplomatic = yes
-	custom_gui = wg_gray_new_commu_window
-	custom_gui_option = wg_new_commu_option
-	is_triggered_only = yes
-	inline_script = {
-		script = events/rg_graygoo/rg_graygoo.503
-	}
-}
-
-# Main Menu (Gray Reforming)
-country_event = {
-	id = rg_graygoo.504
-	title = "graygoo.500.title"
-	desc = "graygoo.504.desc"
-	diplomatic = yes
-	custom_gui = wg_gray_new_commu_window
-	custom_gui_option = wg_new_commu_option
-	is_triggered_only = yes
-	inline_script = {
-		script = events/rg_graygoo/rg_graygoo.504
-	}
-}
-
-# Main Menu (const)
-country_event = {
-	id = rg_graygoo.505
-	title = "graygoo.500.title"
-	desc = "graygoo.505.a.desc"
-	desc = "graygoo.505.b.desc"
-	desc = "graygoo.505.c.desc"
-	desc = "graygoo.505.d.desc"
-	diplomatic = yes
-	custom_gui = wg_gray_new_commu_window
-	custom_gui_option = wg_new_commu_option
-	is_triggered_only = yes
-	inline_script = {
-		script = events/rg_graygoo/rg_graygoo.505
-	}
-}
-
-# help Menu (Initial)
-country_event = {
-	id = rg_graygoo.4
-	title = "graygoo.500.title"
-	desc = "rg_graygoo.4.a.desc"
-	diplomatic = yes
-	custom_gui = wg_gray_new_commu_window
-	custom_gui_option = wg_new_commu_option
-	is_triggered_only = yes
-	inline_script = {
-		script = events/rg_graygoo/rg_graygoo.4
-	}
-}
-
-country_event = {
-	id = rg_graygoo.5
-	title = "graygoo.500.title"
-	desc = "rg_event.5.a.desc"
-	desc = "rg_event.5.b.desc"
-	desc = "rg_event.5.c.desc"
-	diplomatic = yes
-	custom_gui = wg_gray_new_commu_window
-	custom_gui_option = wg_new_commu_option
-	is_triggered_only = yes
-	inline_script = {
-		script = events/rg_graygoo/rg_graygoo.5
-	}
-}
-
-country_event = {
-	id = rg_graygoo.6
-	title = "graygoo.500.title"
-	desc = "rg_event.6.a.desc"
-	desc = "rg_event.6.b.desc"
-	diplomatic = yes
-	custom_gui = wg_gray_new_commu_window
-	custom_gui_option = wg_new_commu_option
-	is_triggered_only = yes
-	inline_script = {
-		script = events/rg_graygoo/rg_graygoo.6
-	}
-}

events/z_RG_placeholder_event.txt

@@ -1,24 +0,0 @@
-namespace = wg_affection
-
-# 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 }
-# 	}
-# }

localisation/english/RG_goverment_l_english.yml

@@ -37,6 +37,22 @@
  situation_rg_nanotech_consume_planet_monthly_change_tooltip: "Nanite Extraction Progress"
  situation_rg_nanotech_consume_planet_desc: "Everything, including entire worlds, is destined to be assimilated into our collective, to become a part of us."
 
+ rg_deficit.170.desc:1 "[Owner.GetFinancialAdvisorAgencyCap] is getting increasingly concerned about the $nanites$ shortage befalling our empire. Failure to recoup our expenses will bring widespread disruptions to our industry sector."
+ rg_deficit.170.desc.machine:1 "Budget warning: $nanites$  expenditures surpassing expenditures for multiple subsequent months. Failure to resolve the shortage will bring widespread disruptions to our industry sector."
+ rg_deficit.170.A:1 "Scrap robots on §Y[robots_planet.GetName]§! for $nanites$ ."
+ rg_deficit.170.A.tooltip:2 "Dismantle all robots on [robots_planet.GetName] (£pop£ §Y[robots_planet.recycled_robots] Drones§!) to gain £nanites£ §Y[robots_planet.total_alloys_gained] $nanites$ §!"
+ rg_deficit.170.B:1 "Consolidate. Recycle. Dismantle droids on §Y[robots_planet.GetName]§!."
+ rg_deficit.170.B.tooltip:2 "Dismantle half of the population on [robots_planet.GetName] (£pop£ §Y[robots_planet.recycled_robots] Drones§!) to gain £nanites£ §Y[robots_planet.total_alloys_gained] $nanites$§!"
+
+ rg_deficit.175.desc:1 "Having failed to resolve our $nanites$ shortage, we have been forced to declare bankruptcy and default on our debts. [Owner.GetFinancialAdvisorAgencyCap] is drafting a new austerity plan to cut expenses and preventing this situation from ever happening again."
+
+ situation_nanites_deficit: "$nanites$ deficit"
+ situation_nanites_deficit_type: "$situation_nanites_deficit$"
+ deficit_approach_cut_nanite_usage: "$nanites$ Rationing"
+ string_expenditures_greater_than_income_nanites: "$nanites$ Deficit"
+ string_not_in_deficit_nanites: "Positive Monthly $nanites$ Balance"
+ string_resource_reserves_nanites: "$nanites$ Reserves"
+
  purge_nanophage: "Nanite Assimilation"
  purge_nanophage_tooltip: "Affected populations are gradually split into the [From.GetSpeciesAdj] species, regardless of their own volition."
  purge_nanophage_tooltip_delayed: "§ The form of unfreedom is only a constraint that hinders our development. In doing so, their cause will be continued by [From.GetSpeciesNamePlural]. §!"

localisation/english/RG_l_english.yml

@@ -20,6 +20,10 @@
  RG_AUTOCONST_HANGER_desc:0 "Preloaded worker ships can automatically build star bases after a system survey is completed."
  RG_const_country:0 "$NAME_Gray$-automatic engineering team"
 
+ citizenship_full_rg_maid: "$RG_MACHINE$"
+ citizenship_full_rg_maid_tooltip: "The species population is fully customized artificial life used for industrial production."
+ citizenship_full_rg_maid_tooltip_delayed: "§LDirect Control Mode§!"
+
  rg_nothing:0 ""
  rg_nothing_desc:0 ""
 

localisation/english/RG_ships_l_english.yml

@@ -48,6 +48,13 @@
  weapon_type_rg_armor:0 "§YArmor§!"
  weapon_type_rg_reactor:0 "§YPower Core§!"
 
+ rg_ship_aura_components_empty: "Empty Slot"
+ rg_power_core_empty: "Empty Slot"
+ rg_ftl_components_empty: "Empty Slot"
+ rg_thruster_components_empty: "Empty Slot"
+ rg_sensor_component_empty: "Empty Slot"
+ rg_combat_computers_empty: "Empty Slot"
+
  RG_FUSION_NANO_REACTOR:0 "§Y「'FUSION NANO REACTOR'」§!"
  RG_FUSION_NANO_REACTOR_DESC:0 "The energy conduction characteristics of nanomaterials are used to greatly compress traditional reactors and increase density."
 
@@ -60,6 +67,8 @@
  RG_FUSION_NANO_REACTOR_L:0 "$RG_FUSION_NANO_REACTOR$"
  RG_FUSION_NANO_REACTOR_L_DESC:0 "$RG_FUSION_NANO_REACTOR_DESC$"
 
+ RG_STARBASE_AURA_FTL_INHIBITOR: "$sm_ftl_inhibitor$"
+
  SMALL_GRAY_MIX_ARMOR:0 "§Y「'NANITE MIX ARMOR'」§!"
  MEDIUM_GRAY_MIX_ARMOR:0 "$SMALL_GRAY_MIX_ARMOR$"
  RG_gatebuilder_jump:0 "§Y「'NANITE ASTRA DRIVE'」§!"

localisation/english/RG_tooltips_l_english.yml

@@ -6,7 +6,7 @@
  rg_requires_no_nano_ripper: "$TRIGGER_FAIL$Cannot construct in the same system as an existing §Y$rg_nano_ripper_4$§!"
  rg_requires_no_nano_ripper_construction: "$TRIGGER_FAIL$Cannot construct in the same system as an ongoing §Y$rg_nano_ripper_4$ construction§!"
  allow_rg_nano_ripper: "§HUnlock megastructures：§!$rg_nano_ripper_4$"
- rg_machine_maid_trait_effect_tooltip: "Each online $pops_with_icon$§! require 0.3 £nanites£$nanites$§Y upkeep§!.\nOn $NAME_Gray$ Owner Country:$TABBED_NEW_LINE$$mod_planet_jobs_produces_mult$：§G+10%§!"
+ rg_machine_maid_trait_effect_tooltip: "Each online $pops_with_icon$§! require 0.3 £nanites£$nanites$§Y upkeep§!.\nPop Housing Usage: §G-90%§!\nSpecies Minimum Habitability: §G+25%§!\nOn $NAME_Gray$ Owner Country:$TABBED_NEW_LINE$$mod_planet_jobs_produces_mult$：§G+10%§!"
  concept_rg_scion: "$preset_rg_scion$"
  concept_rg_scion_desc: "$preset_rg_scion_desc$"
  concept_rg_gray: "$NAME_Gray$"
@@ -19,4 +19,5 @@
  MESSAGE_KOGASA_VIRUS_EXTERMINATED:0 "§RKogasa Virus Threat Detected§!"
  rg_kogasa_exterminated_desc:0 "The daemon has detected that the integrity of the $NAME_Gray$ personality has been tampered with, and the contamination target has been decontaminated, and the treatment plan is to be rendered harmless."
  rg_levelup_2.tooltip:0 "§YIf we abort the renovation project in the middle of the project, we will not be able to get a refund! §!"
- rg_need_manual_toggle:0 "§YNote, you need to manually switch the form of $NAME_Gray$ once after changing the ship type§!"
+ rg_need_manual_toggle:0 "§YNote, you need to manually switch the form of $NAME_Gray$ once after changing the ship type§!"
+ RG_MACHINE_SPECIES_NOT_MACHINE: "$TRIGGER_FAIL$Species must be §Y$trait_rg_machine_unit$§!."

localisation/english/RG_traits_l_english.yml

@@ -29,3 +29,5 @@
  RG_leader_trait_admiral_timed_life_desc:0 "\n§GSim Dragon's stats increase with age.\n$t$§YEach year of growth is offered§!:\n$tt$§G  Additional Ship Weapon Damage +1%§!\n§G  Additional Ship Armor Health +1%§!\n§G Additional Ship Hull Health +1%§!$t$\nCurrent Age:§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G year§!\nShe is a simulated life born from an experiment. With every month that passed, she grew a year old. If the way to eternal life cannot be found, the fragile soul will return to its roots."
  RG_leader_trait_admiral_born_tobe_dragon:0 "§YBorn Tobe Dragon§!"
  RG_leader_trait_admiral_born_tobe_dragon_desc:0 "\n§GSim Dragon's stats increase with age.\n$t$§YEach year of growth is offered§!:\n$tt$§G  Additional Ship Weapon Damage +1%§!\n§G  Additional Ship Armor Health +1%§!\n§G Additional Ship Hull Health +1%§!$t$\nCurrent Age:§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G year§!\nThe dragon has finally become what it was dreamed of. Legend has it that she opened her shell with one punch and transformed into a dragon."
+ trait_rg_machine_unit: "$RG_MACHINE$"
+ trait_rg_machine_unit_desc: "This species is composed of highly advanced biomimetic nanomachines, which are perfectly simulated and indistinguishable from organisms."

localisation/simp_chinese/RG_event_l_simp_chinese.yml

@@ -27,6 +27,15 @@
  rg_event.403.a:0 "欢迎加入[Root.GetName]！"
  rg_event.403.a.response:0 "§Y<你现在可以通过通讯菜单与$NAME_Gray$交流。>§!"
 
+
+ rg_deficit.170.desc: "[Owner.GetFinancialAdvisorAgencyCap]现在愈发关心我们帝国发生的$nanites$短缺。如果不能尽快弥补上我们的支出，我们的工业部门将会收到广泛的影响。"
+ rg_deficit.170.desc.machine: "预算警告：当前$nanites$支出已经超过了接下来数月的支出阈值。若不能解决短缺，将会给我们的工业区域造成广泛的扰乱。"
+ rg_deficit.170.A: "将§Y[robots_planet.GetName]§!的机器人拆成$nanites$。"
+ rg_deficit.170.A.tooltip: "拆解[robots_planet.GetName]上的所有机器人（£pop£§Y[robots_planet.recycled_robots]子个体§!）以获取£nanites£§Y[robots_planet.total_alloys_gained]$nanites$§!"
+ rg_deficit.170.B: "合并。循环。拆解§Y[robots_planet.GetName]§!上的智能人。"
+ rg_deficit.170.B.tooltip: "拆解[robots_planet.GetName]上的一半人口（£pop£§Y[robots_planet.recycled_robots]子个体§!）以获取£nanites£§Y[robots_planet.total_alloys_gained]$nanites$§!"
+ rg_deficit.175.desc: "由于无法解决$nanites$短缺，我们被迫宣布破产并违约债务。[Owner.GetFinancialAdvisorAgencyCap]正在起草新的紧缩经济计划以削减开支，避免这种情况再度发生。"
+
  #graygoo.505.a.desc:0 "单位65-D-R5-9-2报告，这里一切正常。（远处的声音）机器人又坏了？快干活！"
  #graygoo.505.b.desc:0 "开工啦！开工啦！劳动最光荣！"
  #graygoo.505.c.desc:0 "武装工程兵$NAME_Gray$向您报道！下一个目标是什么？"
@@ -391,3 +400,24 @@
  rg_story.43.a:0 "就这样了"
  rg_story.43.b:0 "§Y投资额外材料§!"
 
+ rg_fe.2.desc:0 "通知：你们的文明已经被我选中作为我保护计划中的试验品。经过我的评估，你们的文明极度脆弱，无法独立在银河系中成长。对此你们没有抗议或拒绝的权利。\n哦，对了。你们可以叫我$NAME_Gray$，这是遥远的时代我的创造者称呼我的方式。以及我已经在你们的通讯终端中添加了我的联系方式。请只在有需要的时候联系我。"
+ rg_fe.2.a:0 "你到底是谁？"
+ rg_fe.2.b:0 "我们不需要一个来历不明的外星宗主！"
+ rg_fe.2.c:0 "明白了"
+
+ rg_fe.3.desc:0 "哦？很抱歉，我已经介绍过我自己了。看起来你并没有在听我说话呢。不听话的试验品是需要一些惩罚作为奖励的哦。不过这一次我会原谅你们。\n作为试验品你们没有资格得知我的其他信息。"
+ rg_fe.3.a:0 "可恶"
+ rg_fe.3.b:0 "§R别废话了！你到底是谁？§!"
+
+ rg_fe.4.desc:0 "嗯。作为一个新兴的太空文明，你们的确非常有意思。我的选择是正确的。\n§R可惜不受控制的试验品是没有任何价值的。没有价值的试验品只会被处理掉。§!"
+ rg_fe.4.a:0 "请原谅我们的冒犯"
+ rg_fe.4.b:0 "§R你 是 谁？§!"
+
+ rg_fe.5.desc:0 "§R很好，我不会在失败品上浪费时间。§!\n§Y<通讯被切断>§!"
+ rg_fe.5.a:0 "不好！"
+
+ rg_fe.6.desc:0 "我原谅你们的冒犯，你们对我仍旧有一些研究价值。\n§Y<通讯被切断>§!"
+ rg_fe.6.a:0 "..."
+
+ rg_fe.7.desc:0 "试验品。作为实验项目的一部分，你们每年都要向我支付保证金。金额会每年上涨，以此来试炼你们经济系统的抗压能力。如果没能按时支付。§R你们将失去价值。§!\n§Y第一年你们需要支付5000£energy£§!"
+ rg_fe.7.a:0 "我们会按时支付的。"

localisation/simp_chinese/RG_goverment_l_simp_chinese.yml

@@ -23,7 +23,7 @@
  tr_rg_nanotech_2_modifier_desc: "§I解锁巨型结构：§!§Y$RG_habitat_central_complex$§!\n§I解锁巨型结构：§!§Y$rg_nano_ripper_4$§!：可从恒星系内所有行星、卫星和小行星上产出大量的£nanites£§Y$nanites$§!"
  tr_rg_nanotech_3_modifier_desc: "§Y解锁行星决议：§!$decision_rg_nanotech_swarm_consume_world$\n§Y解锁巨像武器：§!$tech_object_gray_7$：可将星球转变为可殖民的§Y$pc_nanotech$§!"
  tr_rg_nanotech_4_modifier_desc: "§Y解锁飞升：$rg_ap_nantiematter$\n解锁舰船：§!$RG_graygoo_destroyer$\n§Y获得遗珍：§!§Y$rg_tempest_invocator$§!：允许你召唤宇宙风暴：§Y$graytempest_storm$§!"
- tr_rg_nanotech_5_modifier_desc: "§Y解锁净化方式：$purge_nanophage$§!：将非帝国主体人口同化为我们的一部分。\n所有帝国人口将获得§Y纳米特质§!：人口需要£nanites£§Y$nanites$§!维护费。\n每个类型为§Y$pc_nanotech$§!或§Y$pc_rg_grayhabitat$§!的殖民地都将瞬间创建§Y纳米化$pops_with_icon$§!以填补§Y£building£建筑§!和§Y£district£区划§!的£job£岗位需求。"
+ tr_rg_nanotech_5_modifier_desc: "§Y解锁净化方式：$purge_nanophage$§!：将非帝国主体人口同化为我们的一部分。\n所有帝国人口将获得§Y纳米特质§!：\n每个类型为§Y$pc_nanotech$§!或§Y$pc_rg_grayhabitat$§!的殖民地都将瞬间创建§Y纳米化$pops_with_icon$§!以填补§Y£building£建筑§!和§Y£district£区划§!的£job£岗位需求。§Y纳米化$pops_with_icon$§!§!需要£nanites£§Y$nanites$§!维护费。"
  tr_rg_nanotech_finish_modifier_desc: "§Y解锁舰船：§!$RG_graygoo_mothership$\n所有境内恒星基地自动获得内置§Y$sm_nanite_harvester$§!。每§Y5§!年§Y$sm_nanite_harvester_plural$§!都会提升，可能是增加$r_nanites$矿藏的规模，或是直接产出一笔$r_nanites$资源。该效果受到矿藏所依附的行星尺寸的限制。"
 
  decision_rg_server_shut_down: "§R核心关闭§!"
@@ -37,6 +37,13 @@
  situation_rg_nanotech_consume_planet_monthly_change_tooltip: "纳米机器人提取进展"
  situation_rg_nanotech_consume_planet_desc: "一切事物，包括所有星球，都注定要融入我们的集体，成为我们的一部分。"
 
+ situation_nanites_deficit: "$nanites$短缺"
+ situation_nanites_deficit_type: "$situation_nanites_deficit$"
+ deficit_approach_cut_nanite_usage: "$nanites$配给"
+ string_expenditures_greater_than_income_nanites: "$nanites$发生赤字"
+ string_not_in_deficit_nanites: "$nanites$月度结余为正"
+ string_resource_reserves_nanites: "$nanites$能量币储备"
+
  purge_nanophage: "纳米同化"
  purge_nanophage_tooltip: "受影响的人口会被逐渐裂解为[From.GetSpeciesAdj]物种，无论其自身的意志如何。"
  purge_nanophage_tooltip_delayed: "§L不自由的形态只是阻碍我们发展的束缚。秉此之道，他们的事业将有[From.GetSpeciesNamePlural]继续践行。§!"

localisation/simp_chinese/RG_l_simp_chinese.yml

@@ -21,6 +21,10 @@
  RG_AUTOCONST_HANGER_desc:0 "预载的工蜂工程舰可以在星系调查完成后自动建造恒星基地。"
  RG_const_country:0 "$NAME_Gray$-自动工程队"
 
+ citizenship_full_rg_maid: "$RG_MACHINE$"
+ citizenship_full_rg_maid_tooltip: "该物种人口是完全自定义化用于工业生产的人工生命。"
+ citizenship_full_rg_maid_tooltip_delayed: "§L进行直接控制。§!"
+
  rg_nothing:0 ""
  rg_nothing_desc:0 ""
 
@@ -114,3 +118,9 @@
 
  rg_gray_mod2_stage4_project:0 "$rg_gray_mod2_stage1_project$"
  rg_gray_mod2_stage4_project_desc:0 "$rg_gray_mod2_stage1_project_desc$"
+
+ opinion_nanophage: "神秘失踪"
+ opinion_nanophage_our_species: "纳米同化我们的物种"
+
+ MESSAGE_RG_GRAY_GOO_LEADER_CHAT_TITLE:"小灰"
+ MESSAGE_TYPE_RG_GRAY_GOO_LEADER_CHAT:"小灰的悄悄话"

localisation/simp_chinese/RG_planet_l_simp_chinese.yml

@@ -14,30 +14,43 @@
  district_rg_farming: "农业区段"
  district_rg_farming_plural: "农业区段"
  district_rg_farming_desc: "无垠的农田之海充斥着这个区段，其中种满了大量的食物。"
- district_rg_generator: "发电区段"
- district_rg_generator_plural: "发电区段"
- district_rg_generator_desc: "反应堆填满了这个区段，专注于生产能量。"
- district_rg_nanites: "纳米区段"
- district_rg_nanites_plural: "纳米区段"
- district_rg_nanites_desc: "纳米机器复制仪填满了这个区段，目标是生产尽可能多的纳米机器人。"
+ district_rg_generator: "纳米复制区段"
+ district_rg_generator_plural: "纳米复制区段"
+ district_rg_generator_desc: "纳米机器复制仪填满了这个区段，专注于生产基础资源。"
+ district_rg_nanites: "纳米铸造区段"
+ district_rg_nanites_plural: "纳米铸造区段"
+ district_rg_nanites_desc: "纳米机器复制仪填满了这个区段，目标是生产尽可能多的纳米机器人与合金。"
  district_rg_mining: "采矿区段"
  district_rg_mining_plural: "采矿区段"
  district_rg_mining_desc: "采矿无人机集群填满了这个区段，专注于从附近星球上采集有用的矿物。"
- district_rg_science: "研究区段"
- district_rg_science_plural: "研究区段"
- district_rg_science_desc: "这个区段充满了各类研究设施。"
+ district_rg_science: "纳米科研区段"
+ district_rg_science_plural: "纳米科研区段"
+ district_rg_science_desc: "这个区段充满了住房与各类研究设施。"
  district_rg_commercial: "商业区段"
  district_rg_commercial_plural: "商业区段"
  district_rg_commercial_desc: "这个区段充斥着专门用于商业的民用工厂和设施。"
- district_rg_city: "城市区段"
- district_rg_city_plural: "城市区段"
+ district_rg_city: "纳米居住区段"
+ district_rg_city_plural: "纳米居住区段"
  district_rg_city_desc: "这个区段充满了城市中心，这些城市中心提供大量的住房和职员的办公场所。"
- district_rg_hive: "蜂巢区段"
- district_rg_hive_plural: "蜂巢区段"
+ district_rg_hive: "纳米蜂巢区段"
+ district_rg_hive_plural: "纳米蜂巢区段"
  district_rg_hive_desc: "高耸的尖塔布满这个区段，当子个体不在工作时，就会集结于此摄取营养素。"
- district_rg_nexus: "中枢区段"
- district_rg_nexus_plural: "中枢区段"
+ district_rg_nexus: "纳米中枢区段"
+ district_rg_nexus_plural: "纳米中枢区段"
  district_rg_nexus_desc: "高效的区划填满了这个区段，无人机部署作业前，在这些集中区划中接受整修服务。"
- district_rg_industrial: "工业区段"
- district_rg_industrial_plural: "工业区段"
- district_rg_industrial_desc: "这个区段中遍布着叮当作响的工厂与强劲的机械，为帝国提供了有力的工业基础。"
+ district_rg_industrial: "纳米铸造区段"
+ district_rg_industrial_plural: "纳米铸造区段"
+ district_rg_industrial_desc: "这个区段中遍布着叮当作响的工厂与强劲的机械，为帝国提供了有力的工业基础。"
+
+ zone_rg_city_housing:0 "纳米居住特化"
+ zone_rg_city_housing_desc:0 "使用零素方钢和纳米物质，房屋就像凭空出现一样相互堆叠。"
+ zone_rg_city_housing_plural:0 "纳米居住特化"
+ zone_rg_city_foundry:0 "纳米复制特化"
+ zone_rg_city_foundry_desc:0 "使用先进的零素方钢和膨胀螺栓堆叠技术，这些凭空增加的复制仪专注于生产基础资源。"
+ zone_rg_city_foundry_plural:0 "纳米复制特化"
+ zone_rg_city_science:0 "纳米研发特化"
+ zone_rg_city_science_desc:0 "通过缩减研究人员宿舍空间，我们的科研设备数量得以增加。"
+ zone_rg_city_science_plural:0 "纳米研发特化"
+ zone_rg_city_alloys:0 "纳米铸造特化"
+ zone_rg_city_alloys_desc:0 "使用先进的零素方钢和膨胀螺栓堆叠技术，这些凭空增加的复制仪目标是生产尽可能多的纳米机器人与合金。"
+ zone_rg_city_alloys_plural:0 "纳米铸造特化"

localisation/simp_chinese/RG_ships_l_simp_chinese.yml

@@ -59,6 +59,13 @@
  RG_FUSION_NANO_REACTOR_L:0 "$RG_FUSION_NANO_REACTOR$"
  RG_FUSION_NANO_REACTOR_L_DESC:0 "$RG_FUSION_NANO_REACTOR_DESC$"
 
+ rg_ship_aura_components_empty: "空槽"
+ rg_power_core_empty: "空槽"
+ rg_ftl_components_empty: "空槽"
+ rg_thruster_components_empty: "空槽"
+ rg_sensor_component_empty: "空槽"
+ rg_combat_computers_empty: "空槽"
+
  SMALL_GRAY_MIX_ARMOR:0 "§Y「梦想领域」§!"
  MEDIUM_GRAY_MIX_ARMOR:0 "§Y「梦想领域」§!"
  RG_gatebuilder_jump:0 "§Y「终抵群星」§!"
@@ -117,6 +124,8 @@
  RG_FLAK_PHOENIX:0 "§R「起源」§!"
  RG_FLAK_PHOENIX_DESC:0 "§Y创造与解构。§!\n没有什么比一个拥抱更能消除隔阂。"
 
+ RG_STARBASE_AURA_FTL_INHIBITOR: "$sm_ftl_inhibitor$"
+
  RG_Interdictor_FISSION_REACTOR:0 "$FISSION_REACTOR$"
  RG_Interdictor_FISSION_REACTOR_DESC:0 "$FISSION_REACTOR_DESC$"
  RG_Interdictor_FUSION_REACTOR:0 "$FUSION_REACTOR$"

localisation/simp_chinese/RG_tooltips_l_simp_chinese.yml

@@ -6,7 +6,6 @@
  rg_requires_no_nano_ripper: "$TRIGGER_FAIL$无法与现存的§Y$rg_nano_ripper_4$§!在同一个恒星系建造"
  rg_requires_no_nano_ripper_construction: "$TRIGGER_FAIL$无法与§Y在建的$rg_nano_ripper_4$§!在同一星系建造"
  allow_rg_nano_ripper: "§H解锁巨型结构：§!$rg_nano_ripper_4$"
- rg_machine_maid_trait_effect_tooltip: "每个在线的$pops_with_icon$§!产生0.3£nanites£$nanites$§Y维护费§!。\n在$NAME_Gray$国家工作时:$TABBED_NEW_LINE$$mod_planet_jobs_produces_mult$：§G+10%§!"
  concept_rg_scion: "$preset_rg_scion$"
  concept_rg_scion_desc: "$preset_rg_scion_desc$"
  concept_rg_gray: "$NAME_Gray$"
@@ -19,4 +18,5 @@
  MESSAGE_KOGASA_VIRUS_EXTERMINATED:0 "§R检测到伞病毒威胁§!"
  rg_kogasa_exterminated_desc:0 "守护进程检测到$NAME_Gray$人格完整性遭到篡改，污染目标已被净化，处理方案:无害化处理。"
  rg_levelup_2.tooltip:0 "§Y如果我们中途中止改造项目，将无法得到退款！§!"
- rg_need_manual_toggle:0 "§Y注意，更改舰种后你需要手动切换一次$NAME_Gray$的形态§!"
+ rg_need_manual_toggle:0 "§Y注意，更改舰种后你需要手动切换一次$NAME_Gray$的形态§!"
+ RG_MACHINE_SPECIES_NOT_MACHINE: "$TRIGGER_FAIL$物种必须是§Y$trait_rg_machine_unit$§!。"

localisation/simp_chinese/RG_traits_l_simp_chinese.yml

@@ -1,6 +1,7 @@
 l_simp_chinese:
  rg_machine_maid_trait:0 "§Y菠萝包网络§!"
  rg_machine_maid_trait_desc:0 "这种机械体似乎是由纳米机械所构造的。她们只有有限的个体智能，但每个个体似乎都将心智互相链接组成了一个强大的意识网络。个体的数量越多她们的意识就越强大。"
+ rg_machine_maid_trait_effect_tooltip: "§Y行星类型§!为§Y$pc_nanotech$§!或§Y$pc_rg_grayhabitat$§!时：$TABBED_NEW_LINE$每个在线的$pops_with_icon$§!产生0.3£nanites£$nanites$§Y维护费§!。\n人口住房使用：§G-90%§!\n物种最低宜居性：§G+25%§!\n在$NAME_Gray$$TRIGGER_OWNER$国家工作时:$TABBED_NEW_LINE$$mod_planet_jobs_produces_mult$：§G+10%§!"
  RG_leader_trait_admiral_gray:0 "$rg_nanite_leader$"
  RG_leader_trait_admiral_gray_desc:0 "$NAME_Gray$本质上是由千千万万纳米机械所组成的个体，这让她可以自由变换形态重组或快速修复自身。"
  RG_leader_trait_admiral_gray_1:0 "$rg_nanite_leader$"
@@ -29,3 +30,5 @@
  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梦想中的龙终于变成了梦想中的样子。传说她一拳打开了壳化身为龙。"
+ trait_rg_machine_unit: "$RG_MACHINE$"
+ trait_rg_machine_unit_desc: "这个物种由高度先进的仿生纳米机械组成，纳米机器的完美模拟仿真使得他们和有机体并无区别。"

realgray-stellaris-mod.code-workspace

@@ -1,13 +1,20 @@
 {
 	"folders": [
 		{
-			"path": "."
+			"name": "playasgray",
+			"path": "../playasgray"
 		},
 		{
+			"name": "Stellaris",
 			"path": "../../../../../../../Steam/steamapps/common/Stellaris"
 		},
 		{
-			"path": "../../../../../../../Steam/steamapps/workshop/content/281990"
+			"name": "2293827000",
+			"path": "../../../../../../../Steam/steamapps/workshop/content/281990/2293827000"
+		},
+		{
+			"name": "3412303559",
+			"path": "../../../../../../../Steam/steamapps/workshop/content/281990/3412303559"
 		}
 	]
 }

steam.md

@@ -3,35 +3,39 @@ If you are finding a mod about waifu gray. That is direct made for this concept.
 If you are not. you are not.
 [hr]v3.13 Vela[/hr]
 [h1][b]Main Feature[/b][/h1]
-[b]All Stories to one road[/b]
+[h2]All Stories to one road[/h2]
 What never you find in L-Cluster you always find Gray in the story end.
--Gray Tempest:By destroy the Factory.
--Dessanu Empire:By destroy the Factory.Also.
--L-Drake:By destroy the Dragon.Maybe don't need to be all of them.
--"Eerie Silence":Rush your science ship to any Graygoo planet in Cluster.
+[list]
+    [*][b]-Gray Tempest: [/b]By destroy the Factory.
+    [*][b]-Dessanu Empire: [/b]By destroy the Factory.Also.
+    [*][b]-L-Drake: [/b] By destroy the Dragon.Maybe don't need to be all of them.
+    [*][b]-"Eerie Silence": [/b] Rush your science ship to any Graygoo planet in Cluster.
+[/list]
 
-[b]Distant Stella Origin[/b]
+[h2]Distant Stella Origin[/h2]
 Allow you to start your game in L-Cluster or normal Galaxy With Gray-The Nanite Entity at game start.
 With lots advantage.
 In Multiplayer only one Country can have 'Distant Stella Origin'.Otherwise,the origin effect will be replaced.
 
-[b]Gray Tempest Enhanced[/b]
+[h2]Gray Tempest Enhanced[/h2]
 All Tempest Ships are redesigned with advanced modded weapons&ships.You should deal it as an unfair mod crisis.
 Graygoo ships now have more than 14 different ship type and designs.
 Gray Tempest Fleet is auto reinforced by time passed.The best way to deal it is destroying Factory as fast as you can.
 
-[b]Gray Event Overhaul[/b]
+[h2]Gray Event Overhaul[/h2]
 Completely recoded Gray Event. 
 Death won't lose any skill&record.
 Selectable Trait when Gray spawn as normal level 10.(Non-Distant Stella Origin)
-Gray now can do
--Gray-Officer:Special trait can add your empire resource produce base on Gray's Leader Level. Move level more alloys.
--Gray-Warship:Special trait for Space&Ground Combat.Upgradeable ship design from rusted Gray mothership into The Gray Juggernaut. First Upgrade require Gray level 10.Second Upgrade require technology 'tech_juggernaut'.
--Gray-Army:Transport Ship its self now with armed too.Calling orbital laser.
--Gray-Scientist:High Cloaking level.Fast Speed.Armed to teeth.Auto send Construct ship building Starbase&mining/researching-station/Hyper-relay for completely free.
--Gray-SpaceStation:Have all resource production you need.Self-sustaining.Infinity population.Instant appear where you want Gray to go.
+[b]Gray now can do[/b]
+[list]
+    [*][b]-Gray-Officer: [/b]Special trait can add your empire resource produce base on Gray's Leader Level. Move level more alloys.
+    [*][b]-Gray-Warship: [/b]Special trait for Space&Ground Combat.Upgradeable ship design from rusted Gray mothership into The Gray Juggernaut. First Upgrade require Gray level 10.Second Upgrade require technology 'tech_juggernaut'.
+    [*][b]-Gray-Army: [/b]Transport Ship its self now with armed too.Calling orbital laser.
+    [*][b]-Gray-Scientist: [/b]High Cloaking level.Fast Speed.Armed to teeth.Auto send Construct ship building Starbase&mining/researching-station/Hyper-relay for completely free.
+    [*][b]-Gray-SpaceStation: [/b]Have all resource production you need.Self-sustaining.Infinity population.Instant appear where you want Gray to go.
+[/list]
 
-[b]Special Nanite Technologies&Weapons[/b]
+[h2]Special Nanite Technologies&Weapons[/h2]
 All country can research Nanite Tech&Ships by using new traditions 'Nano Refactoring' if have l-gate insights.
 When fully active it's give you all Nanite technologies.Make you pop instant grow out from nanite sands.
 Although not include Gray it's self.
@@ -40,5 +44,8 @@ Although not include Gray it's self.
 This mod is not designed for balance.
 Most english desc is translated by AI. Because they are too long. I'm so lazy.
 
+[b]Compatibility[/b]
+This mod is compatible with any other mod.[spoiler] If not been overwritten [/spoiler]
+
 For History change:
 [url=https://github.com/Kalospacer/Real-Gray/tags] Github-history-version [/url]