补

改版本号
补补
2025-06-27 14:40:44 +08:00 · 2025-06-27 14:34:17 +08:00 · 2025-06-22 20:12:43 +08:00 · 2025-06-22 20:08:51 +08:00 · 2025-06-22 15:07:36 +08:00 · 2025-06-07 11:30:06 +08:00
51 changed files with 2020 additions and 2191 deletions
--- a/common/bombardment_stances/!_RG_bombardment_stances.txt
+++ b/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 = {
--- a/common/buildings/RG_nano_buildings.txt
+++ b/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 = {
--- a/common/council_agendas/rg_agenda.txt
+++ b/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
+}
--- a/common/defines/rg_defines.txt
+++ b/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)
-# }
--- a/common/districts/rg_station_districts.txt
+++ b/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
--- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.499.txt
+++ b/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
-		}
-	}
-}
--- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.500.txt
+++ b/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 = {
@@ -165,7 +164,6 @@ option = {
 		}
 	}
 }
-inline_script = "events/rg_wsg_marry_gray_option_500_scripts"
 option = {
 	name = graygoo.500.d
 	default_hide_option = yes
--- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.501.txt
+++ b/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 = {
@@ -139,7 +138,6 @@ option = {
 		}
 	}
 }
-inline_script = "events/rg_wsg_marry_gray_option_scripts"
 option = {
 	name = graygoo.500.d
 	tag = hire_leader
--- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.502.txt
+++ b/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 = {
@@ -330,7 +329,6 @@ option = {
 		}
 	}
 }
-inline_script = "events/rg_wsg_marry_gray_option_scripts"
 option = {
 	name = graygoo.500.d
 	tag = hire_leader
--- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.503.txt
+++ b/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 = {
@@ -289,7 +288,6 @@ option = {
 		}
 	}
 }
-inline_script = "events/rg_wsg_marry_gray_option_scripts"
 option = {
 	name = graygoo.500.d
 	tag = hire_leader
--- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.504.txt
+++ b/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 = {
--- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.505.txt
+++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.505.txt
@@ -177,7 +177,6 @@ option = {
 		}
 	}
 }
-inline_script = "events/rg_wsg_marry_gray_option_scripts"
 #	option = { # 开启建造中继器
 #		name = rg_event.5.e
 #		trigger = {
--- a/common/inline_scripts/events/rg_test_gray_skill_varible.txt
+++ b/common/inline_scripts/events/rg_test_gray_skill_varible.txt
@@ -1,71 +0,0 @@
-# event:graygoo.499
-# 初始化小灰领袖等级
-set_variable = {
-    which = rg_gray_level
-    value = 1
-}
-
-#Country event_target:gray_owner
-#存储当前领袖等级
-rg_save_gray_leader_level_effect = {
-    every_owned_leader = {
-        if = {
-            ###等级检测
-            limit = {
-                has_leader_flag = rg_gray_leader
-            }
-			#由于目前是leader域，所以不能直接导出等级
-            #导出等级到暂存
-            export_trigger_value_to_variable = {
-                trigger = has_skill
-                variable = rg_gray_level_temp
-            }
-			#把leader域中的变量存到country域中
-            #导入变量
-            owner = {
-                set_variable = {
-                    which = rg_gray_level
-                    value = prev.rg_gray_level_temp
-                }
-            }
-            #清理暂存区
-            clear_variable = rg_gray_level_temp
-        }
-    }
-}
-    random_owned_leader = {
-		#是小灰领袖
-		limit = {
-			has_leader_flag = rg_gray_leader
-		}
-		export_trigger_value_to_variable = {
-			trigger = has_skill
-			variable = rg_gray_level_temp
-		}
-		owner = {
-			set_variable = {
-				which = rg_gray_level
-				value = prev.rg_gray_level_temp
-			}
-		}
-    }
-}
-#country scope
-#用的时候就
-check_variable = {
-	which = rg_gray_level
-	value >= 10
-}
-
-#Country event_target:gray_owner
-#等级导入，把存储的领袖等级赋予到领袖身上
-rg_set_varible_as_leader_level_effect = {
-    random_owned_leader = {
-        limit = {
-            has_leader_flag = rg_gray_leader
-        }
-        set_skill = owner.rg_gray_level
-    }
-}
-
-
--- a/common/inline_scripts/events/rg_wsg_marry_gray_option_500_scripts.txt
+++ b/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
-		}
-	}
-}
--- a/common/inline_scripts/events/rg_wsg_marry_gray_option_504_scripts.txt
+++ b/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
-		}
-	}
-}
--- a/common/inline_scripts/events/rg_wsg_marry_gray_option_scripts.txt
+++ b/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 }}
-}
--- a/common/inline_scripts/pop_categories/trait_production.txt
+++ b/common/inline_scripts/pop_categories/trait_production.txt
@@ -1,145 +0,0 @@
-produces = {
-    trigger = {
-        exists = planet
-        planet = {
-            owner = {
-                RG_tradition5_or_gray_owner_trigger = yes
-            }
-            rg_is_pc_nano = yes
-        }
-        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
-}
--- a/common/leader_classes/RG_leader_classes.txt
+++ b/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"
-# }
--- a/common/megastructures/RG_oribital_ring.txt
+++ b/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
--- a/common/message_types/RG_message_types.txt
+++ b/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
+}
--- a/common/scripted_effects/RG_event_effects.txt
+++ b/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,36 +32,87 @@ rg_event_effect_event1_dragon = {
 	}
 }

-
-
+#fired from rg_event.1
 rg_event_effect_event1_cluster = {
+	#第一个遥远约定起源的全局标记
+	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
+	}
+	#给遥远群星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
+	# }
+}
+#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_cluster = yes
 	}
+	#调用小灰打招呼事件
+	country_event = {
+		id = rg_event.2
+		days = 30
+	}
+	#立刻开门，防止玩家再次进L星团再刨一个小灰出来
 	else = {
-		rg_event_effect_event1_dragon = yes
-	}
-}
-
-rg_event_effect_event1_cluster_galaxy = {
-	if = {
-		limit = {
-			OR = {
-				rg_has_ag_origin_trigger = yes
-				NOT = {
-					has_global_flag = origin_rg_gray_1st_global
+		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_event1_gray_galaxy = yes
-	}
-	else = {
-		rg_event_effect_event1_dragon = yes
 	}
 }

@@ -118,12 +172,6 @@ rg_event_effect_event1_gray_galaxy = {
 	}
 }

-rg_event_effect_event1_to_event2_effect = {
-	country_event = {
-		id = rg_event.2
-		days = 30
-	}
-}
 rg_event_effect_lcluster_spawn_selecter = {
 	if = {
 		limit = {
@@ -240,19 +288,4 @@ rg_event_effect_planet2027_spawn_maid_species_non_gray = {
 			}
 		}
 	}
-}
-
-rg_event_effect_event2_gray_origin_init = {
-	rg_gray_country_init = yes
-	country_event = {
-		id = graygoo.499
-	}
-	give_technology = {
-		tech = tech_minilaser_gray_1
-		message = no
-	}
-	give_technology = {
-		tech = tech_object_gray_5
-		message = no
-	}
 }
--- a/common/scripted_effects/RG_fallen_empire_effects.txt
+++ b/common/scripted_effects/RG_fallen_empire_effects.txt
@@ -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
--- a/common/scripted_effects/RG_gray_init_effects.txt
+++ b/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
 	}
 }
--- a/common/scripted_effects/RG_gray_leader_init_effects.txt
+++ b/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
 		}
 	}
-}
+}
--- a/common/scripted_effects/RG_scripted_effects.txt
+++ b/common/scripted_effects/RG_scripted_effects.txt
@@ -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
--- a/common/scripted_triggers/RG_leader_scripted_triggers.txt
+++ b/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
 			}
 		}
 	}
--- a/common/scripted_triggers/RG_scripted_triggers_planet_killers.txt
+++ b/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
 		}
 	}
--- a/common/situations/rg_gray_situations.txt
+++ b/common/situations/rg_gray_situations.txt
@@ -11,7 +11,7 @@ situation_rg_gray_mod1 = {
 				}
 			}
 		}
-		destroy_situation = this 
+		destroy_situation = this
 	}

 	on_start = {
--- a/common/solar_system_initializers/RG_fallen_empire_initializers.txt
+++ b/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
--- a/common/traditions/RG_nanotech_tradition.txt
+++ b/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
 }

--- a/common/traits/!_RG_gray_goo_traits.txt
+++ b/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
--- a/common/zone_slots/rg_zone_slots.txt
+++ b/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
+	}
+}
--- a/common/zones/rg_zones.txt
+++ b/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
+	}
+}
--- a/descriptor.mod
+++ b/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.14.*"
+name="Real Gray"
+supported_version="v3.*.*"
 remote_file_id="2136166095"
--- a/events/!_RG_gray_goo_event_overwrite.txt
+++ b/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
 	}
--- a/events/RG_cluster_events.txt
+++ b/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"
 	}
 }
--- a/events/RG_deficit_event.txt
+++ b/events/RG_deficit_event.txt
@@ -29,7 +29,7 @@ situation_event = {
 				}
 				ordered_owned_planet = {
 					limit = {
-						any_owned_pop = {
+						any_owned_pop_group = {
 							OR = {
 								is_shackled_robot = yes
 								is_non_sapient_robot = yes
@@ -48,11 +48,11 @@ situation_event = {
 			else = {
 				ordered_owned_planet = {
 					limit = {
-						any_owned_pop = {
+						any_owned_pop_group = {
 							is_robot_pop = yes
 						}
 					}
-					order_by = trigger:num_pops
+					order_by = trigger:pop_amount
 					position = 0
 					save_event_target_as = robots_planet
 					event_target:robots_planet = {
@@ -77,14 +77,14 @@ situation_event = {
 		}
 		hidden_effect = {
 			event_target:robots_planet = {
-				every_owned_pop = {
+				every_owned_pop_group = {
 					limit = {
 						OR = {
 							is_shackled_robot = yes
 							is_non_sapient_robot = yes
 						}
 					}
-					kill_pop = yes
+					kill_single_pop = yes
 				}
 			}
 			owner = {
@@ -108,12 +108,12 @@ situation_event = {
 		hidden_effect = {
 			event_target:robots_planet = {
 				while = {
-					count = recycled_robots
-					random_owned_pop = {
+					count = recycled_robots_100
+					random_owned_pop_group = {
 						limit = {
-							is_robot_pop = yes
+							is_robot_pop_group = yes
 						}
-						kill_pop = yes
+						kill_single_pop = yes
 					}
 				}
 			}
--- a/events/RG_events.txt
+++ b/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
@@ -41,14 +81,26 @@ country_event = {
 	}
 	is_triggered_only = yes
 	immediate = {
-		rg_event_effect_event2_gray_origin_init = yes
+		rg_gray_country_init = yes
+		#真正送小灰的事件调用499
+		country_event = {
+			id = graygoo.499
+		}
+		#给开局小科技
+		give_technology = {
+			tech = tech_minilaser_gray_1
+			message = no
+		}
+		give_technology = {
+			tech = tech_object_gray_5
+			message = no
+		}
 	}
 	option = {
 		name = rg_event.2.a
 		default_hide_option = yes
 	}
 }
-
 country_event = {
 	id = rg_event.3
 	title = "graygoo.500.title"
@@ -465,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 = {
@@ -1070,7 +1122,7 @@ planet_event = {
 	}

 	immediate = {
-		random_owned_pop = {
+		weighted_random_owned_pop_group = {
 			limit = {
 				is_same_species = owner_species
 			}
@@ -1080,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 = {
@@ -1108,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
+					}
 				}
 			}
 		}
@@ -1154,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 = {
@@ -1167,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 }
+			}
 		}
 	}
 }
@@ -1183,10 +1255,15 @@ country_event = { # Memorial Valuts Civic Paragon Level Tick / FROM = Leader

 	immediate = {
 		rg_create_gray_planetkiller_testship_2 = yes
-		modify_species = {
-			species = root.species
-			add_trait = rg_machine_maid_trait
+		capital_scope = {
+			every_owned_pop_group = {
+				modify_species = {
+					species = owner_main_species
+					add_trait = rg_machine_maid_trait
+				}
+			}
 		}
+
 	}
 }

@@ -1310,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
--- a/events/RG_fe_events.txt
+++ b/events/RG_fe_events.txt
@@ -7,14 +7,14 @@ country_event = {
    desc = {
        trigger = {
            NOT = {
-                has_authority = auth_machine_intelligence
+                is_machine_empire = yes
            }
        }
        text = "graygoo.402.a.desc"
    }
    desc = {
        trigger = {
-            has_authority = auth_machine_intelligence
+            is_machine_empire = yes
        }
        text = "graygoo.402.b.desc"
    }
--- a/events/RG_gray_leader_dialog_event.txt
+++ b/events/RG_gray_leader_dialog_event.txt
--- a/events/RG_grayleader_events.txt
+++ b/events/RG_grayleader_events.txt
--- a/events/RG_machine_event.txt
+++ b/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
 			}
 		}
 	}
--- a/events/RG_planert_killer_events.txt
+++ b/events/RG_planert_killer_events.txt
@@ -42,31 +42,6 @@ planet_event = {
 		}
 		set_update_modifiers_batch = end
 	}
-}	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
-				}
-			}
-			has_global_flag = has_rg_mod
-		}
-		force_remove_civic = civic_AG_gray_master
-	}
-	else = {
-		country_event = { id = graygoo.499 }
-	}
 }

 # Cracked
--- a/events/RG_planet_event.txt
+++ b/events/RG_planet_event.txt
@@ -262,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
 				}
 			}
 		}
@@ -298,11 +298,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
 						}
 					}
 					# exists = event_target:rg_gray_habitat_target
@@ -374,7 +374,7 @@ planet_event = {
 	}
 	immediate = {
 		set_variable = {
-			which = num_pops
+			which = pop_amount
 			value = value:num_free_virtual_jobs
 		}
 		# Create pops for every free job
@@ -387,8 +387,8 @@ planet_event = {
 				}
 			}
 			while = {
-				count = num_pops
-				create_pop = {
+				count = pop_amount
+				create_pop_group = {
 					species = event_target:rg_owner_main_maid_species
 				}
 			}
@@ -411,8 +411,8 @@ planet_event = {
 					}
 				}
 				while = {
-					count = num_pops
-					create_pop = {
+					count = pop_amount
+					create_pop_group = {
 						species = event_target:rg_maid_species
 					}
 				}
@@ -421,15 +421,18 @@ planet_event = {
 		# 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
+				}
 			}
 		}
 	}
@@ -445,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
+				}
 			}
 		}
 	}
@@ -476,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
+			}
 		}
 	}
 }
--- a/events/RG_story_event.txt
+++ b/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
-	}
 }
--- a/events/RG_story_event2.txt
+++ b/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
+	}
+}
--- a/events/RG_wsg_graygoo_event.txt
+++ b/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
-	}
-}
--- a/events/z_RG_placeholder_event.txt
+++ b/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 }
-# 	}
-# }
--- a/localisation/simp_chinese/RG_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_l_simp_chinese.yml
@@ -118,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:"小灰的悄悄话"
--- a/localisation/simp_chinese/RG_planet_l_simp_chinese.yml
+++ b/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 "纳米铸造特化"
--- a/realgray-stellaris-mod.code-workspace
+++ b/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"
 		}
 	]
 }
Author	SHA1	Message	Date
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	3b9b7af09c	补	2025-06-27 14:40:44 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	204808c988	改版本号	2025-06-27 14:34:17 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	a9831480ac	补补	2025-06-22 20:12:43 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	c8357ada5c	删点过期的舰R兼容	2025-06-22 20:08:51 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	8245aaf07f	暂存	2025-06-22 15:07:36 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	976e42359c	"新增纳米科技不可阻挡蜂群议程及灰国领袖初始化效果调整"	2025-06-07 11:30:06 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	7bfd943359	"新增区域议程文件"	2025-06-07 11:29:58 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	ac0458900b	Changes 修	2025-05-09 14:59:02 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	08708a26e4	Changes 写点事件	2025-05-09 14:36:34 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	cd821c03a2	# Changes to be committed: # modified: common/districts/rg_station_districts.txt # modified: common/zones/rg_zones.txt #	2025-05-07 16:02:57 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	9947c005ae	"更新纳米区段翻译并添加城市特化区域定义"	2025-05-07 15:04:35 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	e0b33131d0	has_skill	2025-05-06 21:26:43 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	37d17762b3	4.0.2	2025-05-06 13:58:35 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	b1e8581377	暂存	2025-05-06 13:00:31 +08:00