Update RG_event_effects.txt: Modify maid species properties and add free servant jobs in RG_planet_event

Fix event effect save target for planet2027 maid species and gray goo habitat init
Update rg_station_districts.txt: Remove unused 'mult' attribute in district_rg_generator
2024-09-17 13:48:36 +08:00 · 2024-09-17 13:37:01 +08:00 · 2024-09-17 13:34:23 +08:00 · 2024-09-17 13:32:31 +08:00 · 2024-09-17 05:25:06 +08:00 · 2024-09-17 05:18:40 +08:00
68 changed files with 5190 additions and 1901 deletions
--- a/common/ascension_perks/rg_ascension_perks.txt
+++ b/common/ascension_perks/rg_ascension_perks.txt
@@ -11,15 +11,17 @@ rg_ap_nantiematter = {
 			can_research_technology = tech_lgate_activation
 		}
 		NOT = {
-			has_ascension_perk = rg_nantiematter
+			has_ascension_perk = rg_ap_nantiematter
 		}
 	}
 	potential = {
 		OR = {
 			has_country_flag = origin_rg_gray
 			has_country_flag = gray_owner
-			has_event_chain = l_cluster_chain
-			has_technology = tech_lgate_activation
+			AND = {
+				has_event_chain = l_cluster_chain
+				has_technology = tech_lgate_activation
+			}
 		}
 		is_ai = no
 	}
--- a/common/component_templates/RG_combat_computers.txt
+++ b/common/component_templates/RG_combat_computers.txt
--- a/common/component_templates/RG_interdictor_parts.txt
+++ b/common/component_templates/RG_interdictor_parts.txt
@@ -175,37 +175,6 @@ utility_component_template = {
 	}
 }

-utility_component_template = {
-	key = "RG_Mothership_ZERO_POINT_REACTOR"
-	size = small
-	icon = "GFX_ship_part_reactor_5"
-	icon_frame = 1
-	power = 50000
-	resources = {
-		category = ship_components
-		cost = {
-			alloys = 224
-		}
-		upkeep = {
-			energy = 2.29
-			alloys = 0.229
-		}
-	}
-	prerequisites = {
-		"tech_zero_point_power"
-	}
-	component_set = "power_core"
-	size_restriction = {
-		RG_graygoo_mothership
-		RG_gray_juggernaut
-		RG_graygoo_capitalship
-	}
-	upgrades_to = "RG_Mothership_DARK_MATTER_REACTOR"
-	ai_weight = {
-		weight = 5
-	}
-}
-
 utility_component_template = {
 	key = "RG_Interdictor_DARK_MATTER_REACTOR"
 	size = small
@@ -246,24 +215,148 @@ utility_component_template = {
 }

 utility_component_template = {
-	key = "RG_Mothership_DARK_MATTER_REACTOR"
+	key = "RG_Mothership_FISSION_REACTOR"
 	size = small
-	icon = "GFX_ship_part_dark_matter_power_core"
+	icon = "GFX_ship_part_reactor_1"
 	icon_frame = 1
-	power = 60000
+	power = 7700
 	resources = {
 		category = ship_components
 		cost = {
-			alloys = 296
-			sr_dark_matter = 8
+			alloys = 44.8
 		}
 		upkeep = {
-			energy = 2.98
-			alloys = 0.298
+			energy = 0.458
+			alloys = 0.045
+		}
+	}
+
+	prerequisites = { "tech_fission_power" }
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_FUSION_REACTOR"
+
+	ai_weight = {
+		weight = 1
+	}
+}
+
+utility_component_template = {
+	key = "RG_Mothership_FUSION_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_2"
+	icon_frame = 1
+	power = 15400
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 89.6
+		}
+		upkeep = {
+			energy = 0.92
+			alloys = 0.09
+		}
+	}
+
+	prerequisites = { "tech_fusion_power" }
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_COLD_FUSION_REACTOR"
+
+	ai_weight = {
+		weight = 2
+	}
+}
+
+utility_component_template = {
+	key = "RG_Mothership_COLD_FUSION_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_3"
+	icon_frame = 1
+	power = 23100
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 134
+		}
+		upkeep = {
+			energy = 1.37
+			alloys = 0.137
+		}
+	}
+
+	prerequisites = { "tech_cold_fusion_power" }
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_ANTIMATTER_REACTOR"
+
+	ai_weight = {
+		weight = 3
+	}
+}
+
+utility_component_template = {
+	key = "RG_Mothership_ANTIMATTER_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_4"
+	icon_frame = 1
+	power = 30800
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 179
+		}
+		upkeep = {
+			energy = 1.83
+			alloys = 0.183
+		}
+	}
+
+	prerequisites = { "tech_antimatter_power" }
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_ZERO_POINT_REACTOR"
+
+	ai_weight = {
+		weight = 4
+	}
+}
+
+
+utility_component_template = {
+	key = "RG_Mothership_ZERO_POINT_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_5"
+	icon_frame = 1
+	power = 38500
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 224
+		}
+		upkeep = {
+			energy = 2.29
+			alloys = 0.229
 		}
 	}
 	prerequisites = {
-		"tech_dark_matter_power_core"
+		"tech_zero_point_power"
 	}
 	component_set = "power_core"
 	size_restriction = {
@@ -271,17 +364,49 @@ utility_component_template = {
 		RG_gray_juggernaut
 		RG_graygoo_capitalship
 	}
+	upgrades_to = "RG_Mothership_DARK_MATTER_REACTOR"
 	ai_weight = {
-		weight = 6
-		modifier = {
-			factor = 0
-			no_resource_for_component = {
-				RESOURCE = sr_dark_matter
-			}
-		}
+		weight = 5
 	}
 }

+utility_component_template = {
+    key = "RG_Mothership_DARK_MATTER_REACTOR"
+    size = small
+    icon = "GFX_ship_part_dark_matter_power_core"
+    icon_frame = 1
+    power = 20
+    resources = {
+        category = ship_components
+        cost = {
+            alloys = 296
+            sr_dark_matter = 8
+        }
+        upkeep = {
+            energy = 2.98
+            alloys = 0.298
+        }
+    }
+    prerequisites = {
+        "tech_dark_matter_power_core"
+    }
+    component_set = "power_core"
+    size_restriction = {
+        RG_graygoo_mothership
+        RG_gray_juggernaut
+        RG_graygoo_capitalship
+    }
+    ai_weight = {
+        weight = 6
+        modifier = {
+            factor = 0
+            no_resource_for_component = {
+                RESOURCE = sr_dark_matter
+            }
+        }
+    }
+}
+
 utility_component_template = {
 	key = "RG_Arsenal_FISSION_REACTOR"
 	size = small
@@ -321,7 +446,7 @@ utility_component_template = {
 		category = ship_components
 		cost = {
 			alloys = 80
-			nanties = 2
+			nanites = 2
 		}
 		upkeep = {
 			energy = 0.8
@@ -348,7 +473,7 @@ utility_component_template = {
 	size = small
 	icon = "GFX_ship_part_thruster_1"
 	icon_frame = 1
-	power = @battleship_power_1
+	power = -80
 	resources = {
 		category = ship_components
 		cost = {
@@ -383,7 +508,7 @@ utility_component_template = {
 	size = small
 	icon = "GFX_ship_part_thruster_2"
 	icon_frame = 1
-	power = @battleship_power_2
+	power = -120
 	resources = {
 		category = ship_components
 		cost = {
@@ -420,7 +545,7 @@ utility_component_template = {
 	size = small
 	icon = "GFX_ship_part_thruster_3"
 	icon_frame = 1
-	power = @battleship_power_3
+	power = -160
 	resources = {
 		category = ship_components
 		cost = {
@@ -457,7 +582,7 @@ utility_component_template = {
 	size = small
 	icon = "GFX_ship_part_thruster_4"
 	icon_frame = 1
-	power = @battleship_power_4
+	power = -200
 	resources = {
 		category = ship_components
 		cost = {
@@ -494,7 +619,7 @@ utility_component_template = {
 	size = small
 	icon = "GFX_ship_part_thruster_5"
 	icon_frame = 1
-	power = @battleship_power_5
+	power = -240
 	resources = {
 		category = ship_components
 		cost = {
@@ -1058,7 +1183,7 @@ utility_component_template = {
 		"tech_cloaking_3"
 	}
 	component_set = "science_cloaking_components"
-	upgrades_to = "RG_CIENCE_CLOAKING_DARK_MATTER"
+	upgrades_to = "RG_SCIENCE_CLOAKING_DARK_MATTER"
 	ai_weight = {
 		weight = 15
 	}
--- a/common/component_templates/RG_ship_parts.txt
+++ b/common/component_templates/RG_ship_parts.txt
@@ -1,3 +1,5 @@
+@shipAuraRange = 80
+
 #混合装甲
 utility_component_template = {
 	key = "LARGE_GRAY_MIX_ARMOR"
@@ -12,8 +14,6 @@ utility_component_template = {
 		ship_armor_regen_add_perc = 0.2
 		ship_hull_add = 1960
 		ship_hull_regen_add_perc = 0.2
-		ship_shield_add = 980
-		ship_shield_regen_add_perc = 0.1
 	}
 	size_restriction = {
 		RG_graygoo_destroyer
@@ -23,6 +23,11 @@ utility_component_template = {
 		RG_graygoo_mothership
 		RG_gray_juggernaut
 		RG_graygoo_capitalship
+		RG_armed_science_ship
+		RG_armed_constructor_ship
+		RG_armed_transport_ship
+		RG_armed_colony_ship
+		RG_graygoo_icebreaker_interdictor
 	}
 	prerequisites = {
 		"tech_gray_matter_remix_2"
@@ -56,12 +61,10 @@ utility_component_template = {
 	power = 0
 	power = -180
 	modifier = {
-		ship_armor_add = 13840
+		ship_armor_add = 7680
 		ship_armor_regen_add_perc = 0.2
-		ship_hull_add = 11960
+		ship_hull_add = 3920
 		ship_hull_regen_add_perc = 0.2
-		ship_shield_add = 4560
-		ship_shield_regen_add_perc = 0.1
 	}
 	size_restriction = {
 		RG_graygoo_capitalship
@@ -902,13 +905,6 @@ strike_craft_component_template = {
 			alloys = 0.2
 		}
 	}
-	size_restriction = {
-		RG_graygoo_destroyer
-		RG_graygoo_interdictor
-		RG_graygoo_mothership
-		RG_gray_juggernaut
-		RG_graygoo_capitalship
-	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
@@ -969,13 +965,6 @@ strike_craft_component_template = {
 			alloys = 0.2
 		}
 	}
-	size_restriction = {
-		RG_graygoo_destroyer
-		RG_graygoo_interdictor
-		RG_graygoo_mothership
-		RG_gray_juggernaut
-		RG_graygoo_capitalship
-	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
@@ -1001,7 +990,7 @@ strike_craft_component_template = {
 	speed = 225
 	rotation_speed = 0.25
 	acceleration = 0.6
-	size_damage_factor = 1
+	# size_damage_factor = 1
 	shield_damage = 1.2
 	armor_penetration = 1
 	weapon_type = instant
@@ -1039,13 +1028,6 @@ strike_craft_component_template = {
 			alloys = 0.2
 		}
 	}
-	size_restriction = {
-		RG_graygoo_destroyer
-		RG_graygoo_interdictor
-		RG_graygoo_mothership
-		RG_gray_juggernaut
-		RG_graygoo_capitalship
-	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
@@ -1070,7 +1052,7 @@ strike_craft_component_template = {
 	speed = 225
 	rotation_speed = 0.25
 	acceleration = 0.6
-	size_damage_factor = 1
+	# size_damage_factor = 1
 	shield_damage = 1.2
 	armor_penetration = 1
 	weapon_type = instant
@@ -1110,13 +1092,6 @@ strike_craft_component_template = {
 			alloys = 0.2
 		}
 	}
-	size_restriction = {
-		RG_graygoo_destroyer
-		RG_graygoo_interdictor
-		RG_graygoo_mothership
-		RG_gray_juggernaut
-		RG_graygoo_capitalship
-	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
@@ -1181,6 +1156,10 @@ utility_component_template = {
 		RG_graygoo_icebreaker_interdictor
 		RG_gray_juggernaut
 		RG_graygoo_capitalship
+		RG_armed_science_ship
+		RG_armed_constructor_ship
+		RG_armed_transport_ship
+		RG_armed_colony_ship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1660,7 +1639,7 @@ utility_component_template = {
 	resources = {
 		category = ship_components
 		cost = {
-			alloys = @cost0
+			alloys = 0
 			nanites = 4
 		}
 	}
@@ -1684,11 +1663,11 @@ utility_component_template = {
 	icon = "GFX_ship_part_enigmatic_encoder"
 	icon_frame = 1
 	hidden = yes
-	power = @cost0
+	power = 0
 	resources = {
 		category = ship_components
 		cost = {
-			alloys = @cost0
+			alloys = 0
 			nanites = 4
 		}
 	}
@@ -1716,7 +1695,7 @@ utility_component_template = {
 	resources = {
 		category = ship_components
 		cost = {
-			alloys = @cost0
+			alloys = 0
 			nanites = 4
 		}
 	}
@@ -1744,11 +1723,11 @@ utility_component_template = {
 	icon = "GFX_ship_part_instrument_covenant_aux"
 	icon_frame = 1
 	hidden = yes
-	power = @cost0
+	power = 0
 	resources = {
 		category = ship_components
 		cost = {
-			alloys = @cost0
+			alloys = 0
 			nanites = 4
 		}
 	}
@@ -1986,15 +1965,15 @@ utility_component_template = {
 			id = friendly_BAKAHALO
 			priority = 233
 		}
-		damage_per_day = {
-			accuracy = 0.5
-			damage = {
-				min = 48
-				max = 96
-			}
-			shield_penetration = 1
-			armor_penetration = 1
-		}
+		# damage_per_day = {
+		# 	accuracy = 0.5
+		# 	damage = {
+		# 		min = 48
+		# 		max = 96
+		# 	}
+		# 	shield_penetration = 1
+		# 	armor_penetration = 1
+		# }
 		modifier = {
 			ship_shield_mult = -0.1
 			ship_speed_mult = -0.1
@@ -2059,43 +2038,43 @@ weapon_component_template = {
 	tags = {
 		weapon_type_rg_halo
 	}
-	friendly_aura = {
-		name = "RG_ANTIBAKAHALO"
-		radius = @shipAuraRange
-		apply_on = ships
-		stack_info = {
-			#A ship can only be affected by one aura of a certain id. If multiple auras have the same ID the one with the highest priority will be applied.
-			id = friendly_BAKAHALO
-			priority = 233
-		}
-		modifier = {
-			ship_shield_mult = -0.1
-			ship_speed_mult = -0.1
-			ship_armor_mult = -0.1
-			ship_hull_mult = -0.1
-			ship_shield_hardening_add = 1
-			ship_armor_hardening_add = 1
-			ship_shield_penetration_mult = 1
-			ship_armor_penetration_mult = 1
-			ship_weapon_range_mult = -0.1
-			ship_tracking_add = -10
-			ship_engagement_range_mult = -0.1
-			ship_disengage_chance_mult = -0.1
-			ship_ftl_jumpdrive_range_mult = -0.1
-			ship_windup_mult = 0.1
-			ship_jumpdrive_cooldown_mult = 0.1
-		}
-		graphics = {
-			area_effect = {
-				entity = "circle_area_entity"
-				dynamic_scale = yes
-			}
-			ship_effect = {
-				entity = "ship_aura_positive_entity"
-				dynamic_scale = no
-			}
-		}
-	}
+	# friendly_aura = {
+	# 	name = "RG_ANTIBAKAHALO"
+	# 	radius = @shipAuraRange
+	# 	apply_on = ships
+	# 	stack_info = {
+	# 		#A ship can only be affected by one aura of a certain id. If multiple auras have the same ID the one with the highest priority will be applied.
+	# 		id = friendly_BAKAHALO
+	# 		priority = 233
+	# 	}
+	# 	modifier = {
+	# 		ship_shield_mult = -0.1
+	# 		ship_speed_mult = -0.1
+	# 		ship_armor_mult = -0.1
+	# 		ship_hull_mult = -0.1
+	# 		ship_shield_hardening_add = 1
+	# 		ship_armor_hardening_add = 1
+	# 		ship_shield_penetration_mult = 1
+	# 		ship_armor_penetration_mult = 1
+	# 		ship_weapon_range_mult = -0.1
+	# 		ship_tracking_add = -10
+	# 		ship_engagement_range_mult = -0.1
+	# 		ship_disengage_chance_mult = -0.1
+	# 		ship_ftl_jumpdrive_range_mult = -0.1
+	# 		ship_windup_mult = 0.1
+	# 		ship_jumpdrive_cooldown_mult = 0.1
+	# 	}
+	# 	graphics = {
+	# 		area_effect = {
+	# 			entity = "circle_area_entity"
+	# 			dynamic_scale = yes
+	# 		}
+	# 		ship_effect = {
+	# 			entity = "ship_aura_positive_entity"
+	# 			dynamic_scale = no
+	# 		}
+	# 	}
+	# }
 	hull_damage = 0
 	shield_penetration = 0
 	shield_damage = 0
@@ -2145,51 +2124,51 @@ weapon_component_template = {
 	tags = {
 		weapon_type_rg_halo
 	}
-	hostile_aura = {
-		name = "RG_BAKAHALO"
-		radius = @shipAuraRange
-		apply_on = ships
-		stack_info = {
-			id = hostile_BAKAHALO
-			priority = 233
-		}
-		modifier = {
-			ship_shield_mult = -0.1
-			ship_speed_mult = -0.1
-			ship_armor_mult = -0.1
-			ship_hull_mult = -0.1
-			ship_shield_hardening_add = -1
-			ship_armor_hardening_add = -1
-			ship_shield_penetration_mult = -1
-			ship_armor_penetration_mult = -1
-			ship_weapon_range_mult = -0.1
-			ship_tracking_add = -10
-			ship_engagement_range_mult = -0.1
-			ship_disengage_chance_mult = -0.1
-			ship_ftl_jumpdrive_range_mult = -0.1
-			ship_windup_mult = 1
-			ship_jumpdrive_cooldown_mult = 1
-		}
-		damage_per_day = {
-			accuracy = 0.5
-			damage = {
-				min = 96
-				max = 192
-			}
-			shield_penetration = 1
-			armor_penetration = 1
-		}
-		graphics = {
-			area_effect = {
-				entity = "circle_area_entity"
-				dynamic_scale = yes
-			}
-			ship_effect = {
-				entity = "ship_aura_negative_entity"
-				dynamic_scale = no
-			}
-		}
-	}
+	# hostile_aura = {
+	# 	name = "RG_BAKAHALO"
+	# 	radius = @shipAuraRange
+	# 	apply_on = ships
+	# 	stack_info = {
+	# 		id = hostile_BAKAHALO
+	# 		priority = 233
+	# 	}
+	# 	modifier = {
+	# 		ship_shield_mult = -0.1
+	# 		ship_speed_mult = -0.1
+	# 		ship_armor_mult = -0.1
+	# 		ship_hull_mult = -0.1
+	# 		ship_shield_hardening_add = -1
+	# 		ship_armor_hardening_add = -1
+	# 		ship_shield_penetration_mult = -1
+	# 		ship_armor_penetration_mult = -1
+	# 		ship_weapon_range_mult = -0.1
+	# 		ship_tracking_add = -10
+	# 		ship_engagement_range_mult = -0.1
+	# 		ship_disengage_chance_mult = -0.1
+	# 		ship_ftl_jumpdrive_range_mult = -0.1
+	# 		ship_windup_mult = 1
+	# 		ship_jumpdrive_cooldown_mult = 1
+	# 	}
+	# 	damage_per_day = {
+	# 		accuracy = 0.5
+	# 		damage = {
+	# 			min = 96
+	# 			max = 192
+	# 		}
+	# 		shield_penetration = 1
+	# 		armor_penetration = 1
+	# 	}
+	# 	graphics = {
+	# 		area_effect = {
+	# 			entity = "circle_area_entity"
+	# 			dynamic_scale = yes
+	# 		}
+	# 		ship_effect = {
+	# 			entity = "ship_aura_negative_entity"
+	# 			dynamic_scale = no
+	# 		}
+	# 	}
+	# }
 	hull_damage = 0
 	shield_penetration = 0
 	shield_damage = 0
@@ -2221,6 +2200,7 @@ utility_component_template = {
 		category = ship_components
 		cost = {
 			alloys = 300
+			nanites = 10
 		}
 	}
 	prerequisites = { "tech_gray_nano_boost_3" }
@@ -2252,6 +2232,7 @@ utility_component_template = {
 		category = ship_components
 		cost = {
 			alloys = 100
+			nanites = 5
 		}
 	}
 	sensor_range = 15
@@ -2281,6 +2262,7 @@ utility_component_template = {
 		category = ship_components
 		cost = {
 			alloys = 200
+			nanites = 10
 		}
 	}
 	prerequisites = { "tech_gray_nano_boost_3" }
@@ -2307,7 +2289,7 @@ utility_component_template = {
 	resources = {
 		category = ship_components
 		cost = {
-			nanties = 12
+			nanites = 12
 			alloys = 120
 		}
 		upkeep = {
@@ -2320,6 +2302,13 @@ utility_component_template = {
 	tags = {
 		weapon_type_rg_reactor
 	}
+	size_restriction = {
+		RG_graygoo_destroyer
+		RG_armed_science_ship
+		RG_armed_constructor_ship
+		RG_armed_transport_ship
+		RG_armed_colony_ship
+	}
 	component_set = "power_core"
 	ai_weight = {
 		weight = 0
@@ -2335,7 +2324,7 @@ utility_component_template = {
 	resources = {
 		category = ship_components
 		cost = {
-			nanties = 24
+			nanites = 24
 			alloys = 120
 		}
 		upkeep = {
@@ -2352,7 +2341,6 @@ utility_component_template = {
 	size_restriction = {
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
-		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -2365,11 +2353,11 @@ utility_component_template = {
 	size = small
 	icon = "GFX_ship_part_gray_reactor"
 	icon_frame = 1
-	power = 280000
+	power = 92400
 	resources = {
 		category = ship_components
 		cost = {
-			nanties = 120
+			nanites = 120
 			alloys = 120
 		}
 		upkeep = {
@@ -2386,6 +2374,7 @@ utility_component_template = {
 	size_restriction = {
 		RG_gray_juggernaut
 		RG_graygoo_capitalship
+		RG_graygoo_mothership
 	}
 	ai_weight = {
 		weight = 0
@@ -2403,6 +2392,7 @@ utility_component_template = {
 		category = ship_components
 		cost = {
 			alloys = 200
+			nanites = 10
 		}
 	}
 	modifier = {
--- a/common/country_limits/ownership_limits/RG_ownership_limits.txt
+++ b/common/country_limits/ownership_limits/RG_ownership_limits.txt
@@ -0,0 +1,23 @@
+# Here you can specify the lists of limits for the number of ships of some types that country can own
+# and potentially the lists of limits for the number of building of some type (not implemented yet)
+
+# Note for overwriting: ownership_limits are extendable/additive. So if you make a second "default" and
+# add a single ship_of_size_limit inside it, it will apply both the limits described here, and the one
+# that you specified.
+# To do a full overwrite, you need to overwrite 00_ownership_limits.txt instead.
+
+# Example:
+# name_of_ownership_limit = {
+#	ship_of_size_limits = {
+#		# the list of keys to ship_of_size_limits database
+#	}
+# 	building_of_type_limit = {
+#		# not implemented yet
+#	}
+# }
+
+default = {
+	ship_of_size_limits = {
+		RG_gray_juggernaut_ships_limit
+	}
+}
--- a/common/country_limits/ship_of_size_limits/RG_ship_of_size_limits.txt
+++ b/common/country_limits/ship_of_size_limits/RG_ship_of_size_limits.txt
@@ -0,0 +1,10 @@
+RG_gray_juggernaut_ships_limit = {
+	ship_types = {
+		RG_gray_juggernaut
+	}
+	base = 2 # 1 * juggernaut's size_multiplier
+	show = {
+		is_scope_valid = yes
+		has_technology = tech_gray_juggernaut_8
+	}
+}
--- a/common/defines/rg_defines.txt
+++ b/common/defines/rg_defines.txt
@@ -0,0 +1,3 @@
+NGameplay = {
+	GOVERNMENT_CIVIC_POINTS_BASE		= 3		# Base amount of civic points (to "pay" for government civic costs)
+}
--- a/common/deposits/RG_storms_deposits.txt
+++ b/common/deposits/RG_storms_deposits.txt
@@ -0,0 +1,57 @@
+d_rg_tempest_storm_1 = {
+	is_for_colonizable = yes
+	icon = d_fractal_seed
+	category = deposit_cat_rare
+
+	resources = {
+		category = planet_deposits
+		produces = {
+			nanites = 5
+		}
+	}
+
+	planet_modifier = {
+		district_mining_max = -2
+	}
+
+	potential = { always = no }
+}
+
+d_rg_tempest_storm_2 = {
+	is_for_colonizable = yes
+	icon = d_fractal_seed
+	category = deposit_cat_rare
+
+	resources = {
+		category = planet_deposits
+		produces = {
+			nanites = 9
+		}
+	}
+
+	planet_modifier = {
+		district_mining_max = -3
+	}
+
+	potential = { always = no }
+}
+
+d_rg_tempest_storm_3 = {
+	is_for_colonizable = yes
+	icon = d_fractal_seed
+	category = deposit_cat_rare
+
+	resources = {
+		category = planet_deposits
+		produces = {
+			nanites = 15
+		}
+	}
+
+	planet_modifier = {
+		pop_happiness = -1
+		district_mining_max = -5
+	}
+
+	potential = { always = no }
+}
--- a/common/districts/rg_station_districts.txt
+++ b/common/districts/rg_station_districts.txt
@@ -0,0 +1,743 @@
+@rw_cost = 1000
+@rw_cost_sr = 50
+@rw_maintenance = 5
+@rw_maintenance_sr = 2
+
+district_rg_city = {
+	icon = district_rw_city
+	base_buildtime = 30
+	is_capped_by_modifier = no
+	exempt_from_ai_planet_specialization = yes
+
+	show_on_uncolonized = {
+		exists = from
+		from = { is_regular_empire = yes }
+		uses_district_set = rg_station
+	}
+
+	potential = {
+		exists = owner
+		owner = { is_regular_empire = yes }
+		uses_district_set = rg_station
+	}
+
+	conversion_ratio = 0.5
+	convert_to = {
+		district_rw_nexus
+		district_rw_hive
+	}
+
+	resources = {
+		category = planet_districts
+		cost = {
+			minerals = @rw_cost
+		}
+		upkeep = {
+			energy = @rw_maintenance
+		}
+	}
+
+	planet_modifier = {
+		planet_housing_add = 25
+		job_enforcer_add = 2
+		planet_max_buildings_add = 2
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_agrarian_idyll
+			}
+		}
+		modifier = {
+			planet_housing_add = -5
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_regular_empire = yes
+				is_fallen_empire = no
+			}
+		}
+		modifier = {
+			job_culture_worker_add = 3
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_regular_empire = yes
+				is_fallen_empire = no
+				has_active_tradition = tr_virtuality_4
+			}
+		}
+		modifier = {
+			job_culture_worker_add = 6
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_active_tradition = tr_prosperity_public_works }
+		}
+		modifier = {
+			planet_housing_add = 5
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_technology = tech_housing_1
+			}
+		}
+		modifier = {
+			planet_housing_add = 5
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_technology = tech_housing_2
+				NOT = { has_valid_civic = civic_agrarian_idyll }
+			}
+		}
+		modifier = {
+			planet_housing_add = 5
+		}
+	}
+
+	triggered_desc = {
+		trigger = {
+			planet = {
+				has_deposit = d_arcane_generator
+				NOT = { has_district = district_rw_city }
+			}
+		}
+		text = arcane_generator_upkeep_desc
+	}
+
+	triggered_desc = {
+		trigger = {
+			exists = owner
+			owner = { is_regular_empire = yes }
+		}
+		text = job_clerk_effect_desc
+	}
+}
+
+district_rg_hive = {
+	icon = district_rw_hive
+	base_buildtime = 30
+	is_capped_by_modifier = no
+	exempt_from_ai_planet_specialization = yes
+
+	show_on_uncolonized = {
+		exists = from
+		from = { is_hive_empire = yes }
+		uses_district_set = rg_station
+	}
+
+	potential = {
+		exists = owner
+		owner = { is_hive_empire = yes }
+		uses_district_set = rg_station
+	}
+
+	conversion_ratio = 0.5
+	convert_to = {
+		district_rw_nexus
+		district_rw_city
+	}
+
+	resources = {
+		category = planet_districts
+		cost = {
+			minerals = @rw_cost
+		}
+		upkeep = {
+			energy = @rw_maintenance
+		}
+	}
+
+	planet_modifier = {
+		planet_housing_add = 30
+		job_maintenance_drone_add = 15
+		job_synapse_drone_add = 2
+		planet_max_buildings_add = 2
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_technology = tech_housing_1 }
+		}
+		modifier = {
+			planet_housing_add = 5
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			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_prosperity_extended_hives }
+		}
+		modifier = {
+			planet_housing_add = 5
+		}
+	}
+
+	triggered_desc = {
+		trigger = {
+			planet = {
+				has_deposit = d_arcane_generator
+				NOT = { has_district = district_rw_hive }
+			}
+		}
+		text = arcane_generator_upkeep_desc
+	}
+}
+
+district_rg_nexus = {
+	icon = district_rw_nexus
+	base_buildtime = 30
+	is_capped_by_modifier = no
+	exempt_from_ai_planet_specialization = yes
+
+	show_on_uncolonized = {
+		exists = from
+		from = { is_machine_empire = yes }
+		uses_district_set = rg_station
+	}
+
+	potential = {
+		exists = owner
+		owner = { is_machine_empire = yes }
+		uses_district_set = rg_station
+	}
+
+	conversion_ratio = 0.5
+	convert_to = {
+		district_rw_hive
+		district_rw_city
+	}
+
+	resources = {
+		category = planet_districts
+		cost = {
+			minerals = @rw_cost
+		}
+		upkeep = {
+			energy = @rw_maintenance
+		}
+	}
+
+	planet_modifier = {
+		planet_housing_add = 25
+		job_maintenance_drone_add = 10
+		job_coordinator_add = 2
+		planet_max_buildings_add = 2
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_technology = tech_housing_1 }
+		}
+		modifier = {
+			planet_housing_add = 5
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			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
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_active_tradition = tr_prosperity_optimized_nexus }
+		}
+		modifier = {
+			planet_housing_add = 5
+		}
+	}
+
+	triggered_desc = {
+		trigger = {
+			planet = {
+				has_deposit = d_arcane_generator
+				NOT = { has_district = district_rw_nexus }
+			}
+		}
+		text = arcane_generator_upkeep_desc
+	}
+}
+
+district_rg_generator = {
+	icon = district_rw_generator
+	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 = {
+		# district_rw_commercial
+	}
+
+	resources = {
+		category = planet_districts
+		cost = {
+			minerals = @rw_cost
+		}
+		upkeep = {
+			energy = 50
+		}
+		produces = {
+			energy = 200
+		}
+	}
+
+	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 = 50
+		}
+		produces = {
+			minerals = 200
+		}
+	}
+
+	triggered_planet_modifier = {
+		planet_housing_add = 10
+	}
+}
+
+district_rg_farming = {
+	icon = district_rw_farming
+	base_buildtime = 30
+	is_capped_by_modifier = no
+
+	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 = 50
+		}
+		produces = {
+			food = 200
+		}
+	}
+
+	# triggered for tooltip formatting purposes
+	triggered_planet_modifier = {
+		modifier = {
+			planet_housing_add = 10
+		}
+	}
+}
+
+district_rg_science = {
+	icon = district_rw_science
+	base_buildtime = 30
+	is_capped_by_modifier = no
+
+	show_on_uncolonized = { uses_district_set = rg_station }
+
+	potential = { uses_district_set = rg_station }
+
+	prerequisites = {
+		tech_basic_science_lab_1
+	}
+
+	allow = {
+		hidden_trigger = {
+			OR = {
+				NOT = { exists = owner }
+				owner = {
+					has_technology = tech_basic_science_lab_1
+				}
+			}
+		}
+	}
+
+	resources = {
+		category = planet_districts
+		cost = {
+			minerals = @rw_cost
+		}
+		upkeep = {
+			energy = @rw_maintenance
+		}
+	}
+
+	triggered_planet_modifier = {
+		planet_housing_add = 10
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { is_regular_empire = yes }
+		}
+		modifier = {
+			job_researcher_add = 10
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { is_hive_empire = yes }
+		}
+		modifier = {
+			job_brain_drone_add = 10
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { is_machine_empire = yes }
+		}
+		modifier = {
+			job_calculator_add = 10
+		}
+	}
+
+	#Jobs from Virtuality ascension
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_regular_empire = yes
+				has_active_tradition = tr_virtuality_4
+			}
+		}
+		job_researcher_add = 5
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_machine_empire = yes
+				has_active_tradition = tr_virtuality_4
+			}
+		}
+		job_calculator_add = 5
+	}
+
+	triggered_desc = {
+		trigger = {
+			planet = {
+				has_deposit = d_arcane_generator
+				NOT = { has_district = district_rw_science }
+			}
+		}
+		text = arcane_generator_upkeep_desc
+	}
+
+	triggered_desc = {
+		trigger = {
+			exists = owner
+			owner = { is_regular_empire = yes }
+		}
+		text = job_researcher_effect_desc
+	}
+
+	triggered_desc = {
+		trigger = {
+			exists = owner
+			owner = { is_hive_empire = yes }
+		}
+		text = job_brain_drone_effect_desc
+	}
+
+	triggered_desc = {
+		trigger = {
+			exists = owner
+			owner = { is_machine_empire = yes }
+		}
+		text = job_calculator_effect_desc
+	}
+}
+
+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 = 5
+	}
+
+	inline_script = {
+		script = jobs/industrial_districts_foundry_add
+		AMOUNT = 5
+	}
+
+	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 = 50
+		}
+		produces = {
+			nanites = 30
+		}
+	}
+
+	triggered_planet_modifier = {
+		planet_housing_add = 10
+	}
+}
+
+# district_rg_commercial = {
+# 	icon = district_rw_commercial
+# 	base_buildtime = 30
+# 	is_capped_by_modifier = no
+# 
+# 	show_on_uncolonized = {
+# 		uses_district_set = rg_station
+# 		exists = from
+# 		from = {
+# 			is_gestalt = no
+# 			is_fallen_empire = no
+# 		}
+# 	}
+# 
+# 	potential = {
+# 		exists = owner
+# 		owner = {
+# 			is_gestalt = no
+# 			is_fallen_empire = no
+# 		}
+# 		uses_district_set = rg_station
+# 	}
+# 
+# 	convert_to = {
+# 		district_rw_generator
+# 	}
+# 
+# 	resources = {
+# 		category = planet_districts
+# 		cost = {
+# 			minerals = @rw_cost
+# 			rare_crystals = @rw_cost_sr
+# 		}
+# 		upkeep = {
+# 			energy = @rw_maintenance
+# 			rare_crystals = @rw_maintenance_sr
+# 		}
+# 	}
+# 
+# 	triggered_planet_modifier = {
+# 		planet_housing_add = 10
+# 		job_trader_add = 2
+# 		job_clerk_add = 6
+# 	}
+# 
+# 	triggered_planet_modifier = {
+# 		potential = {
+# 			exists = owner
+# 			owner = {
+# 				has_active_tradition = tr_mercantile_commercial_enterprise
+# 			}
+# 		}
+# 		modifier = {
+# 			job_trader_add = 2
+# 		}
+# 	}
+# 
+# 	triggered_planet_modifier = {
+# 		potential = {
+# 			exists = owner
+# 			owner = { has_active_tradition = tr_virtuality_4 }
+# 		}
+# 		modifier = {
+# 			job_clerk_add = 6
+# 		}
+# 	}
+# 
+# 	triggered_desc = {
+# 		trigger = {
+# 			planet = {
+# 				has_deposit = d_arcane_generator
+# 				NOT = { has_district = district_rw_commercial }
+# 			}
+# 		}
+# 		text = arcane_generator_upkeep_desc
+# 	}
+# 
+# 	triggered_desc = {
+# 		text = job_trader_effect_desc
+# 	}
+# 
+# 	triggered_desc = {
+# 		text = job_clerk_effect_desc
+# 	}
+# }
--- a/common/global_ship_designs/RG_fallen_empire_ship_designs.txt
+++ b/common/global_ship_designs/RG_fallen_empire_ship_designs.txt
@@ -249,6 +249,10 @@ ship_design = {
 			slot = "EXTRA_LARGE_01"
 			template = "GRAY_BEAM_STATIC_X"
 		}
+		component = {
+			slot = "EXTRA_LARGE_02"
+			template = "GRAY_BEAM_STATIC_X"
+		}
 		component = {
 			slot = "LARGE_GUN_01"
 			template = "LARGE_GRAY_WEAPON_LANCE"
@@ -313,6 +317,10 @@ ship_design = {
 			slot = "AUX_UTILITY_2"
 			template = "SHIELD_BOOSTER"
 		}
+		component = {
+			slot = "AUX_UTILITY_3"
+			template = "SHIELD_BOOSTER"
+		}
 	}
 	required_component="SENSOR_4"
 	required_component="JUMP_DRIVE_1"
@@ -337,6 +345,10 @@ ship_design = {
 			slot = "LARGE_GUN_01"
 			template = "LARGE_GRAY_WEAPON_LANCE"
 		}
+		component = {
+			slot = "LARGE_GUN_02"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
 		component = {
 			slot = "SMALL_GUN_01"
 			template = "SMALL_GRAY_WEAPON_LANCE"
@@ -397,6 +409,10 @@ ship_design = {
 			slot = "AUX_UTILITY_1"
 			template = "SHIELD_BOOSTER"
 		}
+		component = {
+			slot = "AUX_UTILITY_2"
+			template = "SHIELD_BOOSTER"
+		}
 	}
 	required_component="SENSOR_4"
 	required_component="JUMP_DRIVE_1"
--- a/common/global_ship_designs/RG_graygoo_ship_designs.txt
+++ b/common/global_ship_designs/RG_graygoo_ship_designs.txt
@@ -2333,7 +2333,7 @@ ship_design = {
 	ship_size = RG_graygoo_icebreaker_interdictor
 	is_event_design = yes
 	section = {
-		template = "RG_icebreaker_interdictor"
+		template = "RG_icebreaker_interdictor_key"
 		slot = "mid"
 		component = {
 			slot = "PD_01"
--- a/common/global_ship_designs/RG_ship_designs_starbase.txt
+++ b/common/global_ship_designs/RG_ship_designs_starbase.txt
@@ -1,6 +1,6 @@
 # 星环基地 1
 ship_design = {
-	name = "RG_RG_ORBITAL_RING_TIER_1_STARBASE"
+	name = "RG_ORBITAL_RING_TIER_1_STARBASE"
 	ship_size = RG_orbital_ring_tier_1
 	section = {
 		template = "RG_ORBITAL_RING_TIER_1_STARBASE_SECTION"
--- a/common/governments/civics/!_RG_origins.txt
+++ b/common/governments/civics/!_RG_origins.txt
@@ -15,6 +15,14 @@ origin_rg_gray = {
 	playable = {
 		host_has_dlc = "Distant Stars Story Pack"
 	}
+	possible = {
+		civics = {
+			OR = {
+				value = civic_rg_gray_cluster
+				value = civic_rg_gray_non_cluster
+			}
+		}
+	}
 }

 rg_origin_scion = {
--- a/common/governments/civics/RG_cvics.txt
+++ b/common/governments/civics/RG_cvics.txt
@@ -0,0 +1,37 @@
+civic_rg_gray_cluster = {
+	icon = gfx/interface/icons/governments/civics/civic_efficient_bureaucracy.dds
+	potential = {
+		origin = { value = origin_rg_gray }
+	}
+	possible = {
+		civics = { NOT = { value = civic_rg_gray_non_cluster } }
+		origin = { value = origin_rg_gray }
+	}
+	random_weight = {
+		base = 0
+	}
+	modification = no
+	description = "civic_tooltip_rg_gray_cluster"
+	modifier = {
+		country_government_civic_points_add = 1
+	}
+}
+
+civic_rg_gray_non_cluster = {
+	icon = gfx/interface/icons/governments/civics/civic_nationalistic_zeal.dds
+	potential = {
+		origin = { value = origin_rg_gray }
+	}
+	possible = {
+		civics = { NOT = { value = civic_rg_gray_cluster } }
+		origin = { value = origin_rg_gray }
+	}
+	random_weight = {
+		base = 0
+	}
+	modification = no
+	description = "civic_tooltip_rg_gray_non_cluster"
+	modifier = {
+		country_government_civic_points_add = 1
+	}
+}
--- a/common/leader_classes/RG_leader_classes.txt
+++ b/common/leader_classes/RG_leader_classes.txt
@@ -68,36 +68,36 @@
 # 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"
-}
+# 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
@@ -269,14 +269,23 @@ orbital_ring_restored = {
 					dismantle = yes
 				}
 			}
+			From = {
+				create_ship_design = {
+					design = "RG_ORBITAL_RING_TIER_1_STARBASE_SECTION"
+				}
+				add_ship_design = last_created_design
+			}
 			create_starbase = {
-				design = "RG_ORBITAL_RING_TIER_1_STARBASE_SECTION"
+				size = RG_orbital_ring_tier_1
 				owner = FROM
 				#module = <starbase_module>
 				#building = <starbase_building>
 				effect = {
 				}
 			}
+			From = {
+				remove_ship_design = last_created_design
+			}
 		}
 		every_system_ambient_object = {
 			limit = {
--- a/common/on_actions/RG_on_actions.txt
+++ b/common/on_actions/RG_on_actions.txt
@@ -52,19 +52,15 @@ on_monthly_pulse_country = {
 		# rg_event.22 #小灰复活检测
 		# rg_event.23 #月检移除L星门认知防止收容失效
 		# rg_skill.9
+		rg_planet.5025	# Virtual Machine pop creation
+		rg_planet.5030	# Virtual Machine pop destruction
 	}
 }

 on_yearly_pulse_country = {
 	events = {
 		rg_event.17
-		rg_event.18
 		rg_event.20
-	}
-}
-
-on_yearly_pulse = {
-	events = {
 		rg_story.20
 	}
 }
@@ -176,3 +172,83 @@ on_space_battle_lost = {
 		rg_skill.15
 	}
 }
+
+# A planet has been colonized.
+# Scope = Planet
+on_colonized = {
+	events = {
+		rg_planet.2026	# Virtual Machine pop creation
+		rg_planet.2031	# Virtual Machine pop destruction
+	}
+}
+
+#A building construction has been completed.
+# This = Planet
+on_building_complete = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A building construction has been completed, which is an upgrade of previous building.
+# This = Planet
+on_building_upgraded = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A building construction has demolished.
+# This = Planet
+on_building_demolished = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+# A building repair has finished
+# This = Planet
+on_building_repaired = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+#A district construction has been completed.
+# This = Planet
+on_district_complete = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A building construction has finished, replacing another building.
+# This = Planet
+on_building_replaced = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A building construction has been downgraded and replaced.
+# This = Planet
+on_building_downgraded = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A district construction has demolished.
+# This = Planet
+on_district_demolished = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
--- a/common/planet_classes/RG_gray_planet_classes.txt
+++ b/common/planet_classes/RG_gray_planet_classes.txt
@@ -0,0 +1,41 @@
+pc_rg_grayhabitat = {
+	habitat = yes
+	entity = "grey_tempesttw_orbital_habitat_entity"
+	entity_scale = @planet_standard_scale
+	icon = GFX_planet_type_habitat
+	enable_tilt = no
+	fixed_entity_scale = yes
+	place_entity_on_planet_plane = no
+	entity_face_object = no #disable rotation towards sun or planet we orbit around
+	atmosphere_color		= hsv { 0.0 0.0 1.0 }
+	atmosphere_intensity	= 1.0
+	atmosphere_width		= 0.5
+	show_city = no
+	city_color_lut = "gfx/portraits/misc/colorcorrection_continental.dds"
+	extra_orbit_size = 0
+	extra_planet_count = 0
+	chance_of_ring = 0.0
+	planet_size = 40
+	moon_size = 1
+	colonizable = yes
+	district_set = rg_station
+#	ideal = yes
+	starting_planet = no
+	orbit_lines = no
+	has_colonization_influence_cost = no			# applies when within own borders
+
+	is_artificial_planet = yes
+	default_planet_selection = yes
+
+	modifier = {
+		planet_colony_development_speed_mult = 2.0 # Habitats should be fast to colonize
+		pop_environment_tolerance = 1
+		planet_structures_cost_mult = -2
+		planet_buildings_cost_mult = -2
+		planet_building_build_speed_mult = 10
+		planet_crime_add = -1000
+		pop_resettlement_cost_mult = 10
+	}
+
+	carry_cap_per_free_district = @carry_cap_low
+}
--- a/common/relics/RG_relics.txt
+++ b/common/relics/RG_relics.txt
@@ -0,0 +1,86 @@
+rg_tempest_invocator = {
+	activation_duration = 3600
+	portrait = "GFX_relic_the_tempest_exsoulcillator"
+	sound = "relic_activation_vultaum_real_perforator"
+
+	resources = {
+		category = relics
+		# Activation cost
+		cost = {
+			energy = 0
+		}
+	}
+
+	triggered_country_modifier = {
+		potential = {
+			always = yes
+		}
+		country_unity_produces_mult = 0.1
+		ships_upkeep_mult = -0.15
+	}
+
+	active_effect = {
+		# custom_tooltip = r_the_tempest_invocator_active_effect_tt
+
+		set_country_flag = "started_placing_storm"
+
+		start_storm_area_placing = {
+			sacrifice_leader_with_ui = no
+			cosmic_storm = graytempest_storm
+			immediate = yes
+
+			reticle_radius = {
+				base = 100
+				modifier = {
+					mult = value:storm_area_placing_reticle_radius_multiplier
+				}
+			}
+
+			max_range = {
+				base = 1500
+				modifier = {
+					mult = value:storm_area_placing_max_range_multiplier
+				}
+			}
+
+			on_confirm = {
+				add_modifier = {
+					modifier = tempest_invocator_active_modifier
+					days = 3600
+				}
+				custom_tooltip = relic_triumph_cooldown
+
+				hidden_effect = {
+					add_modifier = {
+						modifier = "relic_activation_cooldown"
+						days = 3600
+					}
+					set_country_flag = used_tempest_invocator_relic_achievement
+				}
+
+				remove_country_flag = "started_placing_storm"
+			}
+
+			on_cancel = {
+				add_resource = {
+					energy = 0
+				}
+
+				remove_country_flag = "started_placing_storm"
+			}
+		}
+	}
+
+	# Possible check for activation
+	possible = {
+		inline_script = {
+			script = relics/activation_checks
+			RELIC = rg_tempest_invocator
+		}
+
+		custom_tooltip = {
+			fail_text = r_the_tempest_invocator_started_placing_fail_tt
+			NOT = { has_country_flag = "started_placing_storm" }
+		}
+	}
+}
--- a/common/script_values/rg_script_values.txt
+++ b/common/script_values/rg_script_values.txt
@@ -0,0 +1,14 @@
+rg_count_maid = {
+	base = 0
+	complex_trigger_modifier = {
+		trigger = num_traits
+		trigger_scope = pop
+		parameters = {
+			limit = {
+				has_trait = rg_machine_maid_trait
+			}
+		}
+		mode = add
+	}
+	# max = 20
+}
--- a/common/scripted_effects/!_RG_gray_goo_effects_overwrite.txt
+++ b/common/scripted_effects/!_RG_gray_goo_effects_overwrite.txt
@@ -22,7 +22,7 @@ start_lcluster_chain = {
 	if = {
 		limit = {
 			NOR = {
-				is_same_value = origin_rg_gray_country
+				is_same_value = event_target:origin_rg_gray_country
 				has_country_flag = origin_rg_gray_1st
 			}
 		}
--- a/common/scripted_effects/RG_event_effects.txt
+++ b/common/scripted_effects/RG_event_effects.txt
@@ -0,0 +1,180 @@
+rg_event_effect_event1_dragon = {
+	set_country_flag = origin_gray_dragon_country
+	set_global_flag = has_origin_gray_dragon
+	rg_create_fake_dragon = yes
+	random_owned_leader = {
+		limit = {
+			has_leader_flag = rg_fake_dragon
+		}
+		remove_trait = RG_leader_trait_admiral_timed_life
+		add_trait = RG_leader_trait_admiral_born_tobe_dragon
+		set_leader_flag = rg_fake_dragon_reborn
+		set_age = 0
+	}
+	set_country_flag = rg_fake_dragon_reborn_country
+	set_variable = {
+		which = rg_fake_dragon_timedlife_counter
+		value = 0
+	}
+	start_lcluster_chain = yes
+	add_event_chain_counter = {
+		event_chain = l_cluster_chain
+		counter = clues
+		amount = 7
+	}
+	# increment variable
+	change_variable = {
+		which = num_lcluster_clues
+		value = 7
+	}
+}
+
+
+
+rg_event_effect_event1_cluster = {
+	if = {
+		limit = {
+			NOT = {
+				has_global_flag = origin_rg_gray_1st_global
+			}
+		}
+		rg_event_effect_event1_gray_cluster = yes
+	}
+	else = {
+		rg_event_effect_event1_dragon = yes
+	}
+}
+
+rg_event_effect_event1_cluster_galaxy = {
+	if = {
+		limit = {
+			NOT = {
+				has_global_flag = origin_rg_gray_1st_global
+			}
+		}
+		rg_event_effect_event1_gray_galaxy = yes
+	}
+	else = {
+		rg_event_effect_event1_dragon = yes
+	}
+}
+
+
+rg_event_effect_event1_gray_cluster = {
+	set_global_flag = origin_rg_gray_1st_global
+	set_country_flag = origin_rg_gray_cluster
+	set_country_flag = origin_rg_gray_1st
+	set_country_flag = rg_gray_level_1
+	country_event = {
+		id = rg_event.2
+		days = 30
+	}
+	add_resource = {
+		energy = 1000
+		minerals = 1000
+		alloys = 1000
+		consumer_goods = 1000
+	}
+	add_modifier = {
+		modifier = rg_distant_stars_modifier
+	}
+	save_global_event_target_as = origin_rg_gray_country
+	rg_lcluster_spawn_effect = yes
+	country_event = {
+		id = rg_event.18
+		days = 3600
+		random = 12800
+	}
+}
+
+rg_event_effect_event1_gray_galaxy = {
+	set_global_flag = origin_rg_gray_1st_global
+	set_country_flag = origin_rg_gray_galaxy
+	set_country_flag = origin_rg_gray_1st
+	set_country_flag = rg_gray_level_1
+	country_event = {
+		id = rg_event.2
+		days = 30
+	}
+	save_global_event_target_as = origin_rg_gray_country
+	rg_lcluster_spawn_effect = yes
+}
+rg_event_effect_lcluster_spawn_selecter = {
+	if = {
+		limit = {
+			event_target:origin_rg_gray_country = {
+				OR = {
+					has_civic = civic_rg_gray_cluster
+				}
+			}
+		}
+		country_event = {
+			id = rg_cluster.9
+			days = -1
+		}
+	}
+	else_if = {
+		limit = {
+			event_target:origin_rg_gray_country = {
+				has_civic = civic_rg_gray_non_cluster
+			}
+		}
+		rg_event_effect_lcluster_open = yes
+	}
+	else = {
+		country_event = {
+			id = rg_cluster.9
+			days = -1
+		}
+	}
+}
+
+rg_event_effect_lcluster_open = {
+	if = {
+		limit = {
+			OR = {
+				has_global_flag = l_cluster_origin						# l-cluster plus
+				has_global_flag = rg_origin_l_cluster						# 遥远约定
+				has_global_flag = gray_origin_activate						# 远星之歌
+				has_global_flag = rg_origin_scion_l_cluster					# 未来追迹
+			}
+		}
+		country_event = {
+			id = rg_cluster.2
+		}
+	}
+	else = {
+		country_event = {
+			id = distar.10950
+		}
+	}
+}
+
+#Species
+rg_event_effect_planet2027_spawn_maid_species = {
+	modify_species = {
+		effect = {
+			create_species = {
+				is_mod = yes
+				name = "RG_MACHINE"
+				plural = this
+				class = RG_MACHINE
+				portrait = "rg_machine_maid"
+				can_be_modified = no
+				homeworld = this
+				namelist = this
+				gender = this
+				traits = {
+					trait = trait_machine_unit
+					trait = rg_machine_maid_trait
+					trait = trait_auto_mod_robotic
+					trait = trait_robot_streamlined_protocols
+					trait = trait_robot_luxurious
+				}
+				effect = {
+					save_global_event_target_as = rg_owner_main_maid_species
+				}
+			}
+		}
+	}
+}
--- a/common/scripted_effects/RG_fallen_empire_effects.txt
+++ b/common/scripted_effects/RG_fallen_empire_effects.txt
@@ -5,9 +5,11 @@ rg_create_fallen_empire_species_effect = {
 		portrait = "rg_machine_maid"
 		traits = {
 			trait = trait_machine_unit
+			trait = trait_robot_domestic_protocols
 			trait = rg_machine_maid_trait
-			trait = trait_robot_mass_produced
-			trait = ramdom_trait
+			trait = trait_auto_mod_robotic
+			trait = trait_robot_streamlined_protocols
+			trait = trait_robot_luxurious
 		}
 		extra_trait_points = 3
 		allow_negative_traits = no
@@ -75,10 +77,17 @@ rg_create_fallen_empire_country_effect = {
 			add_global_ship_design = "NAME_Gray_Tau"
 			add_global_ship_design = "NAME_Gray_Sigma"
 			add_global_ship_design = "NAME_Gray_FE_Starbase"
+			set_graphical_culture = fallen_machine_empire_01
+
+			add_modifier = {
+				modifier = fe_ship_cost_modifier
+				days = -1
+			}
+
 			if = {
 				limit = {
 					NOT = {
-						exist = event_target:rg_gray_country_leader
+						exists = event_target:rg_gray_country_leader
 					}
 				}
 				rg_gray_country_leader_init = yes
--- a/common/scripted_effects/RG_gray_goo_effects.txt
+++ b/common/scripted_effects/RG_gray_goo_effects.txt
@@ -126,6 +126,18 @@ rg_global_gray_location_check = {
 			}
 		}
 	}
+	else_if = {
+		limit = {
+			has_country_flag = rg_habitat_enabled
+		}
+		if = {
+			limit = {exists = event_target:rg_gray_habitat_target}
+			event_target:rg_gray_habitat_target = {
+				save_global_event_target_as = global_gray_location
+			}
+		}
+
+	}
 	else = {
 		capital_scope = {
 			save_global_event_target_as = global_gray_location
@@ -181,118 +193,7 @@ rg_create_gray_governor = {
 			}
 			remove_army = yes
 		}
-		#存储当前领袖等级
-		every_owned_leader = {
-			if = {
-				###等级检测
-				limit = {
-					has_leader_flag = rg_gray_leader
-					NOT = {
-						has_leader_flag = rg_gray_leader_temp
-					}
-				}
-				#导出等级到暂存
-				export_trigger_value_to_variable = {
-					trigger = has_skill
-					variable = rg_gray_level_temp
-				}
-				#导入变量
-				owner = {
-					set_variable = {
-						which = rg_gray_level
-						value = prev.rg_gray_level_temp
-					}
-				}
-				#清理暂存区
-				clear_variable = rg_gray_level_temp
-			}
-		}
-		#把所有种类的小灰领袖都送回娘家
-		every_owned_leader = {
-			limit = {
-				has_leader_flag = rg_gray_leader
-			}
-			set_owner = event_target:rg_gray_country
-			set_leader_flag = rg_gray_leader_temp
-			# kill_leader = { show_notification = no }
-		}
-		#把娘家的总督领袖接回来
-		if = {
-			limit = {
-				exists = event_target:gray_governor
-			}
-			event_target:gray_governor = {
-				set_owner = event_target:gray_owner
-				remove_leader_flag = rg_gray_leader_temp
-			}
-		}
-		#如果不存在总督备份，现场变一个
-		else = {
-			rg_gray_govener_init = yes
-		}
-		#设置总督已启用标识
-		set_country_flag = gray_official_active #新版flag
-		set_country_flag = gray_governor_active #旧版flag
-		#更新灰风形态
-		remove_country_flag = gray_warship_active
-		remove_country_flag = rg_kac_grayfleet_active
-		remove_country_flag = gray_constship_active
-		remove_country_flag = gray_army_active
-		#等级导入，把存储的领袖等级赋予到领袖身上
-		random_owned_leader = {
-			limit = {
-				has_leader_flag = gray_governor
-			}
-			set_skill = owner.rg_gray_level
-		}
-	}
-}

-#创造灰风总督
-rg_create_gray_governor_habitat = {
-	if = {
-		limit = {
-			has_country_flag = gray_habitat_active
-		}
-	}
-	else = {
-		#延迟执行
-		optimize_memory
-		#删除战舰
-		every_owned_fleet = {
-			limit = {
-				has_fleet_flag = gray_fleet
-			}
-			delete_fleet = {
-				target = this
-				kill_leader = no
-				destroy_template = yes
-			}
-		}
-		#删除科学舰
-		every_owned_fleet = {
-			limit = {
-				has_fleet_flag = gray_constship
-			}
-			delete_fleet = {
-				target = this
-				kill_leader = no
-				destroy_template = yes
-			}
-		}
-		#删除陆军
-		every_owned_army = {
-			limit = {
-				army_type = gray_army
-			}
-			if = {
-				limit = {
-					exists = leader
-				}
-				unassign_leader = leader
-			}
-			remove_army = yes
-		}
 		#存储当前领袖等级
 		every_owned_leader = {
 			if = {
@@ -342,16 +243,15 @@ rg_create_gray_governor_habitat = {
 		else = {
 			rg_gray_govener_init = yes
 		}
-		rg_juggernaut_habitat_init = yes
 		#设置总督已启用标识
 		set_country_flag = gray_official_active #新版flag
 		set_country_flag = gray_governor_active #旧版flag
-		set_country_flag = gray_habitat_active
 		#更新灰风形态
 		remove_country_flag = gray_warship_active
 		remove_country_flag = rg_kac_grayfleet_active
 		remove_country_flag = gray_constship_active
 		remove_country_flag = gray_army_active
+		
 		#等级导入，把存储的领袖等级赋予到领袖身上
 		random_owned_leader = {
 			limit = {
@@ -463,10 +363,12 @@ rg_create_gray_warship = {
 				destroy_template = yes
 			}
 		}
+
 		remove_country_flag = gray_constship_active
 		remove_country_flag = gray_governor_active #旧版flag
 		remove_country_flag = gray_official_active
 		remove_country_flag = gray_army_active
+		
 		random_owned_leader = {
 			limit = {
 				has_leader_flag = gray_admiral
@@ -575,11 +477,13 @@ rg_create_gray_army = {
 				destroy_template = yes
 			}
 		}
+
 		remove_country_flag = gray_warship_active
 		remove_country_flag = rg_kac_grayfleet_active
 		remove_country_flag = gray_governor_active #旧版flag
 		remove_country_flag = gray_official_active
 		remove_country_flag = gray_constship_active
+		
 		remove_ship_design = last_created_design
 		random_owned_leader = {
 			limit = {
@@ -696,11 +600,13 @@ rg_create_gray_const = {
 			}
 			remove_army = yes
 		}
+
 		remove_country_flag = gray_army_active
 		remove_country_flag = gray_warship_active
 		remove_country_flag = rg_kac_grayfleet_active
 		remove_country_flag = gray_governor_active #旧版flag
 		remove_country_flag = gray_official_active
+		
 		random_owned_leader = {
 			limit = {
 				has_leader_flag = gray_scientist
@@ -708,4 +614,99 @@ rg_create_gray_const = {
 			set_skill = owner.rg_gray_level
 		}
 	}
+}
+
+
+rg_juggernaut_habitat_init = {
+	if = {
+		limit = {
+			has_country_flag = rg_habitat_enabled
+		}
+	}
+	else = {
+		optimize_memory
+		rg_global_gray_location_check = yes
+		set_country_flag = rg_habitat_enabled
+		event_target:global_gray_location = {
+			solar_system = {
+				spawn_planet = {
+					class = pc_rg_grayhabitat
+					location = event_target:global_gray_location
+					orbit_location = yes
+					orbit_angle = 225
+					orbit_distance = 360
+					orbit_angle_offset = 45
+					orbit_distance_offset = 9.899
+					size = 40
+					has_ring = no
+			
+					init_effect = {
+						set_planet_entity = {
+							entity = "grey_tempesttw_orbital_habitat_entity"
+						}
+						set_surveyed = {
+							surveyed = yes
+							surveyor = FROM
+						}
+						set_all_comms_surveyed = yes
+						clear_blockers = yes
+		
+						set_owner = root
+						set_controller = root
+						create_colony = {
+							owner = root
+							species = owner_main_species
+							ethos = owner
+						}
+						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 = {
+								event_target:gray_owner = {
+									OR = {
+										has_country_flag = gray_official_active
+										has_country_flag = gray_governor_active #旧版flag
+									}
+								}
+							}
+							assign_leader = event_target:gray_governor
+						}
+						
+						generate_start_buildings_and_districts = yes
+			
+						while = {
+							count = 5
+							create_pop = {
+								species = owner_main_species
+							}
+						}
+			
+						set_planet_flag = megastructure
+						set_planet_flag = habitat
+						set_planet_flag = advanced_habitat
+						set_planet_flag = advanced_habitat_2
+						set_planet_flag = rg_gray_habitat
+						save_global_event_target_as = rg_gray_habitat_target
+					}
+				}
+			}
+		}
+	}
+}
+
+rg_clear_harbitat = {
+	remove_country_flag = rg_habitat_enabled
+	event_target:rg_gray_habitat_target = {
+		remove_planet = yes
+	}
 }
--- a/common/scripted_effects/RG_gray_leader_init_effects.txt
+++ b/common/scripted_effects/RG_gray_leader_init_effects.txt
@@ -33,12 +33,10 @@ rg_gray_govener_init = {
 				}
 				if = {
 					limit = {
-						owner = {
 							OR = {
 								has_global_flag = has_wsg_mod
 								has_global_flag = kdc_event_mod_active
 							}
-						}
 					}
 					set_leader_flag = "gray_leader"
 					set_leader_flag = gray_leader
@@ -152,12 +150,10 @@ rg_gray_commander_init = {
 				}
 				if = {
 					limit = {
-						owner = {
 							OR = {
 								has_global_flag = has_wsg_mod
 								has_global_flag = kdc_event_mod_active
 							}
-						}
 					}
 					set_leader_flag = "gray_leader"					# "gray_leader"==rg_gray_leader
 					set_leader_flag = gray_leader
@@ -497,11 +493,9 @@ rg_gray_scientist_init = {
 				}
 				if = {
 					limit = {
-						owner = {
-							OR = {
-								has_global_flag = has_wsg_mod
-								has_global_flag = kdc_event_mod_active
-							}
+						OR = {
+							has_global_flag = has_wsg_mod
+							has_global_flag = kdc_event_mod_active
 						}
 					}
 					set_leader_flag = "gray_leader"					# "gray_leader"==rg_gray_leader
@@ -522,11 +516,9 @@ rg_gray_scientist_init = {
 		}
 		if = {
 			limit = {
-				owner = {
-					OR = {
-						has_global_flag = has_wsg_mod
-						has_global_flag = kdc_event_mod_active
-					}
+				OR = {
+					has_global_flag = has_wsg_mod
+					has_global_flag = kdc_event_mod_active
 				}
 			}
 			if = {
@@ -590,11 +582,9 @@ rg_gray_country_leader_init = {
 			# set_leader_flag = rg_gray_leader
 			if = {
 				limit = {
-					owner = {
-						OR = {
-							has_global_flag = has_wsg_mod
-							has_global_flag = kdc_event_mod_active
-						}
+					OR = {
+						has_global_flag = has_wsg_mod
+						has_global_flag = kdc_event_mod_active
 					}
 				}
 				# 暂时和小灰网络断开连接
--- a/common/scripted_effects/RG_scripted_effects.txt
+++ b/common/scripted_effects/RG_scripted_effects.txt
@@ -1,8 +1,22 @@
@gray_portrait = Gray
 rg_set_gray_portrait = {
-	change_leader_portrait = @gray_portrait
-	event_target:rg_gray_country_leader = {
+	if = {
+		limit = {
+			has_global_flag = ms_species_enabled
+			event_target:gray_owner = {
+				has_country_flag = mss_enable_gray_maid
+			}
+		}
+		ms_update_gray_portrait = yes
+		event_target:rg_gray_country_leader = {
+			ms_update_gray_portrait = yes
+		}
+	}
+	else = {
 		change_leader_portrait = @gray_portrait
+		event_target:rg_gray_country_leader = {
+			change_leader_portrait = @gray_portrait
+		}
 	}
 }

@@ -1978,7 +1992,7 @@ RG_destroy_star_system = {
 				exists = event_target:gray_owner				#i.e. not final destruction of all matter
 				is_mobile = yes
 			}
-			set_mia = yes
+			set_mia = mia_emergency_ftl
 		}
 		else = {
 			destroy_fleet = this
@@ -2189,6 +2203,7 @@ rg_gray_country_init = {
 		# 下一阶段的事件再建立通讯
 		# establish_communications_no_message = root
 		save_global_event_target_as = rg_gray_country
+		save_global_event_target_as = gray_country
 		# 创建看板娘用于第一次接触
 		rg_gray_country_leader_init = yes
 		set_leader = last_created_leader
@@ -2245,6 +2260,7 @@ rg_gray_country_after_init = {
 	event_target:rg_gray_country = {
 		establish_communications_no_message = event_target:gray_owner
 	}
+	rg_juggernaut_habitat_init = yes
 }

 rg_timeline_attract_field_init = {
@@ -2538,10 +2554,7 @@ rg_lcluster_spawn_effect = {
 		}
 	}
 	set_spawn_system_batch = end
-	country_event = {
-		id = rg_cluster.9
-		days = -1
-	}
+	rg_event_effect_lcluster_spawn_selecter = yes
 }
 RG_gray_mod1_effect = {
 	custom_tooltip = rg_levelup_2.tooltip
--- a/common/scripted_effects/RG_special_effects.txt
+++ b/common/scripted_effects/RG_special_effects.txt
@@ -1,20 +1,14 @@
 rg_storyline_trigger = {
 	# 初始化故事事件触发
-	random_list = {
-		50 = {
-			country_event = {
-				id = rg_story.2
-				days = 3600
-				random = 12800
-			}
-		}
-		50 = {
-			country_event = {
-				id = rg_story.8
-				days = 3600
-				random = 12800
-			}
-		}
+	country_event = {
+		id = rg_story.2
+		days = 3600
+		random = 12800
+	}
+	country_event = {
+		id = rg_story.8
+		days = 3600
+		random = 12800
 	}
 	if = {
 		limit = {
--- a/common/scripted_effects/RG_storms_effects.txt
+++ b/common/scripted_effects/RG_storms_effects.txt
@@ -0,0 +1,129 @@
+rg_storm_relic_add = {
+	add_relic = rg_tempest_invocator
+}
+
+graytempest_storm_add = {
+	set_star_flag = storm_system
+	set_global_flag = cosmic_storm_has_occurred
+
+	inline_script = {
+		script = cosmic_storms/StormVisuals
+		STORM_NAME = "graytempest_storm"
+	}
+}
+
+graytempest_storm_remove = {
+	remove_storm_visuals_effect = yes
+	remove_star_flag = storm_system
+	graytempest_storm_apply_aftermath_modifier = yes
+	graytempest_storm_apply_deposits = yes
+}
+
+graytempest_storm_apply_aftermath_modifier = {
+	every_system_planet = {
+		limit = {
+			OR = {
+				is_colonizable = yes
+				is_colony = yes
+			}
+		}
+
+		storm_apply_aftermath_modifier = {
+			severity = {
+				modifier = "graytempest_storm_aftermath_modifier_severity_1"
+				days = 1080
+				chance = {
+					base = 33
+					modifier = {
+						factor = 0
+						OR = {
+							has_modifier = "graytempest_storm_aftermath_modifier_severity_2"
+							has_modifier = "graytempest_storm_aftermath_modifier_severity_3"
+						}
+					}
+					modifier = {
+						factor =  $FactorSev1|1$
+					}
+				}
+			}
+
+			severity = {
+				modifier = "graytempest_storm_aftermath_modifier_severity_2"
+				days = 1080
+				chance = {
+					base = 3
+					modifier = {
+						factor = 0
+						has_modifier = "graytempest_storm_aftermath_modifier_severity_3"
+					}
+					modifier = {
+						factor =  $FactorSev2|1$
+					}
+				}
+			}
+
+			severity = {
+				modifier = "graytempest_storm_aftermath_modifier_severity_3"
+				days = 1080
+				chance = {
+					base = 33
+					modifier = {
+						factor =  $FactorSev3|1$
+					}
+				}
+			}
+		}
+
+		if = {
+			limit = { is_colony = yes }
+			owner = {
+				create_message = {
+					type = TEMPEST_STORM_AFTERMATH
+					localization = MESSAGE_STORM_AFTERMATH_DESC
+					days = @toast_important_message_days
+					target = prev
+					variable = {
+						type = name
+						localization = PLANET
+						scope = prev
+					}
+					custom_toast_content_text = tempest_storm_aftermath_custom_desc
+				}
+			}
+		}
+	}
+}
+
+graytempests_storm_apply_deposits = {
+	every_system_planet = {
+		limit = {
+			OR = {
+				is_colonizable = yes
+				is_colony = yes
+			}
+			is_artificial = no
+			NOR = {
+				has_deposit = d_rg_tempest_storm_1
+				has_deposit = d_rg_tempest_storm_2
+				has_deposit = d_rg_tempest_storm_3
+			}
+		}
+
+		random_list = {
+			80 = {}
+			20 = {
+				random_list = {
+					30 = { add_deposit = d_rg_tempest_storm_1 }
+					30 = { add_deposit = d_rg_tempest_storm_2 }
+					30 = { add_deposit = d_rg_tempest_storm_3 }
+				}
+				if = {
+					limit = {
+						has_owner = yes
+					}
+					planet_event = { id = cstorms.8000 }
+				}
+			}
+		}
+	}
+}
--- a/common/scripted_effects/rg_gray_warship_init_effects.txt
+++ b/common/scripted_effects/rg_gray_warship_init_effects.txt
@@ -19,7 +19,9 @@ rg_warship_init_mod1 = {
 				prefix = no
 				upgradable = yes
 				effect = {
-					set_fleet_flag = gray_fleet_ship
+					PREV = {
+						set_fleet_flag = gray_fleet_ship
+					}
 					save_global_event_target_as = gray_warship_ship
 				}
 			}
@@ -63,7 +65,9 @@ rg_warship_init_mod2 = {
 				prefix = no
 				upgradable = yes
 				effect = {
-					set_fleet_flag = gray_fleet_ship
+					PREV = {
+						set_fleet_flag = gray_fleet_ship
+					}
 					save_global_event_target_as = gray_warship_ship
 				}
 			}
@@ -108,7 +112,9 @@ rg_warship_init_mod3 = {
 				prefix = no
 				upgradable = yes
 				effect = {
-					set_fleet_flag = gray_fleet_ship
+					PREV = {
+						set_fleet_flag = gray_fleet_ship
+					}
 					save_global_event_target_as = gray_warship_ship
 				}
 			}
@@ -151,7 +157,9 @@ rg_warship_init_mod0 = {
 				prefix = no
 				upgradable = yes
 				effect = {
-					set_fleet_flag = gray_fleet_ship
+					PREV = {
+						set_fleet_flag = gray_fleet_ship
+					}
 					save_global_event_target_as = gray_warship_ship
 				}
 			}
@@ -174,55 +182,4 @@ rg_warship_init_mod0 = {
 			}
 		}
 	}
-}
-
-rg_juggernaut_habitat_init = {
-	capital_scope = {
-		save_event_target_as = rg_capital_home_planet
-	}
-	spawn_planet = {
-		class = pc_habitat
-		location = root.home_planet
-		orbit_location = yes
-		orbit_angle_offset = 45
-		orbit_distance_offset = 9.899
-		size = 20
-		has_ring = no
-
-		init_effect = {
-			set_name = "NAME_rg_gray_habitat_base"
-			set_planet_entity = {
-				entity = "grey_tempesttw_juggernaut_entity"
-			}
-			set_surveyed = {
-				surveyed = yes
-				surveyor = FROM
-			}
-			set_all_comms_surveyed = yes
-			clear_blockers = yes
-
-			set_planet_flag = megastructure
-			set_planet_flag = habitat
-			set_planet_flag = advanced_habitat
-			set_planet_flag = advanced_habitat_2
-			set_planet_flag = rg_gray_habitat
-			save_global_event_target_as = rg_gray_habitat_target
-		}
-	}
-	event_target:spawn_planet = {
-		set_planet_flag = has_megastructure
-		# set_planet_flag = has_payback_habitat
-	}
-	event_target:rg_capital_home_planet = {
-		while = {
-			count = 1
-			random_owned_pop = {
-				resettle_pop = {
-					pop = this
-					planet = event_target:rg_gray_habitat_target
-				}
-				unemploy_pop = yes
-			}
-		}
-	}
-}
+}
--- a/common/scripted_triggers/!_rg_scripted_trigger_overwrite.txt
+++ b/common/scripted_triggers/!_rg_scripted_trigger_overwrite.txt
@@ -0,0 +1,8 @@
+has_budding_trait = {
+	OR = {
+		has_trait = trait_plantoid_budding
+		has_trait = trait_lithoid_budding
+		has_trait = trait_advanced_budding
+		has_trait = rg_machine_maid_trait
+	}
+}
--- a/common/scripted_triggers/RG_scripted_triggers_planet_killers.txt
+++ b/common/scripted_triggers/RG_scripted_triggers_planet_killers.txt
@@ -103,6 +103,127 @@ can_destroy_planet_with_RG_PLANET_KILLER_SP = {
 	}
 }

+can_destroy_planet_with_RG_PLANET_KILLER_CRACKER = {
+	custom_tooltip = {
+		fail_text = is_not_a_standard_planet_or_megastructure
+		is_a_planet_megastructure = yes
+	}
+	custom_tooltip = {
+		fail_text = is_shielded
+		NOR = {
+			is_planet_class = pc_shielded
+			is_planet_class = pc_ringworld_shielded
+			is_planet_class = pc_habitat_shielded
+		}
+	}
+	custom_tooltip = {
+		fail_text = fotd_cant_collossus
+		NOT = { has_planet_flag = fotd_seperatist_planet@from.owner }
+		exists = from.owner
+		from.owner = { 
+			NOT = { has_country_flag = fotd_seperatist_country@from.owner }
+		}
+	}
+	OR = {
+		custom_tooltip = {
+			text = is_not_hostile_cracker
+			OR = {
+				AND = {
+					exists = space_owner
+					space_owner = {
+						OR = {
+							is_at_war_with = from.owner
+							is_country_type = swarm
+							is_country_type = extradimensional
+							is_country_type = extradimensional_2
+							is_country_type = extradimensional_3
+							is_country_type = ai_empire
+						}
+					}
+				}
+				AND = { # colony
+					exists = owner
+					owner = {
+						OR = {
+							is_at_war_with = from.owner
+							is_country_type = swarm
+							is_country_type = extradimensional
+							is_country_type = extradimensional_2
+							is_country_type = extradimensional_3
+							is_country_type = ai_empire
+						}
+					}
+				}
+			}
+		}
+		AND = {
+			# primitive target
+			custom_tooltip = {
+				text = cannot_crack_pre_ftl_planet_ownership
+				exists = space_owner
+				exists = owner
+				owner = {
+					is_primitive = yes
+				}
+				space_owner = {
+					OR = {
+						is_same_value = from.owner
+						is_at_war_with = from.owner
+						is_country_type = swarm
+						is_country_type = extradimensional
+						is_country_type = extradimensional_2
+						is_country_type = extradimensional_3
+						is_country_type = ai_empire
+					}
+				}
+			}
+			custom_tooltip = {
+				text = cannot_crack_pre_ftl_planet_interference
+				# primitive
+				exists = owner
+				owner = {
+					is_primitive = yes
+				}
+				from.owner = {
+					has_policy_flag = interference_aggressive
+				}
+			}
+		}
+		custom_tooltip = {
+			text = not_barren_molten_frozen_toxic_test_fire
+			NOT = { exists = owner }
+			OR = {
+				NOT = { exists = space_owner }
+				AND = {
+					exists = space_owner
+					space_owner = { is_same_value = from.owner }
+				}
+			}
+			OR = {
+				is_planet_class = pc_barren
+				is_planet_class = pc_barren_cold
+				is_planet_class = pc_frozen
+				is_planet_class = pc_molten
+				is_planet_class = pc_toxic
+				is_planet_class = pc_desert
+				is_planet_class = pc_tropical
+				is_planet_class = pc_arid
+				is_planet_class = pc_continental
+				is_planet_class = pc_ocean
+				is_planet_class = pc_tundra
+				is_planet_class = pc_arctic
+				is_planet_class = pc_alpine
+				is_planet_class = pc_savannah
+				is_planet_class = pc_gaia
+				is_planet_class = pc_relic
+				is_planet_class = pc_nuked
+				is_planet_class = pc_ringworld_habitable
+				is_planet_class = pc_habitat
+			}
+		}
+	}
+}
+
 can_destroy_planet_with_RG_PLANET_KILLER_SHIELDER = {
 	custom_tooltip = {
 		fail_text = is_not_a_habitable_planet_or_megastructure
@@ -135,7 +256,7 @@ can_destroy_planet_with_RG_PLANET_KILLER_SHIELDER = {
 			from.owner = {
 				OR = {
 					has_policy_flag = interference_active
-					has_policy_flag = interference_full
+					has_policy_flag = interference_aggressive
 				}
 			}
 		}
@@ -256,7 +377,7 @@ can_destroy_planet_with_RG_PLANET_KILLER_GODRAY = {
 			from.owner = {
 				OR = {
 					has_policy_flag = interference_active
-					has_policy_flag = interference_full
+					has_policy_flag = interference_aggressive
 				}
 			}
 		}
@@ -330,7 +451,7 @@ can_destroy_planet_with_RG_PLANET_KILLER_NANOBOTS = {
 		custom_tooltip = {
 			fail_text = primitives_not_full_interference
 			from.owner = {
-				has_policy_flag = interference_full
+				has_policy_flag = interference_aggressive
 			}
 		}
 	}
@@ -429,7 +550,7 @@ can_destroy_planet_with_RG_PLANET_KILLER_DELUGE = {
 		custom_tooltip = {
 			fail_text = primitives_not_full_interference
 			from.owner = {
-				has_policy_flag = interference_full
+				has_policy_flag = interference_aggressive
 			}
 		}
 	}
--- a/common/section_templates/RG_gray_goo_section.txt
+++ b/common/section_templates/RG_gray_goo_section.txt
@@ -43,12 +43,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }

 #战列2
@@ -95,12 +89,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }

 #泰坦3
@@ -122,12 +110,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }

 #线列4
@@ -149,12 +131,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }

 #雷装5
@@ -201,12 +177,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }

 #近防6
@@ -237,53 +207,47 @@ ship_section_template = {
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_05"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_01"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_06"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_02"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_07"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_03"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_08"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_04"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_09"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_05"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_10"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_06"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_11"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_07"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_12"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_08"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	large_utility_slots = 6
-	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 120
-		}
-	}
+	aux_utility_slots = 3
 }

 #光环7
@@ -304,13 +268,7 @@ ship_section_template = {
 		locatorname = "turret_01"
 	}
 	large_utility_slots = 6
-	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 120
-		}
-	}
+	aux_utility_slots = 3
 }

 #巨像8
@@ -326,13 +284,7 @@ ship_section_template = {
 		locatorname = "boope"
 	}
 	large_utility_slots = 6
-	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 120
-		}
-	}
+	aux_utility_slots = 3
 }

 #武库舰9
@@ -669,12 +621,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }

 #航战10
@@ -716,12 +662,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }

 #雷巡11
@@ -768,12 +708,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }

 #撞击舰12
@@ -799,13 +733,7 @@ ship_section_template = {
 		locatorname = "xl_gun_01"
 	}
 	large_utility_slots = 12
-	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
+	aux_utility_slots = 3
 }

 ship_section_template = {
@@ -926,12 +854,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 12
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }

 ship_section_template = {
@@ -1082,12 +1004,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 10
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }

 ship_section_template = {
@@ -1153,12 +1069,6 @@ ship_section_template = {
 		locatorname = "root"
 	}
 	aux_utility_slots = 1
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }

 ship_section_template = {
@@ -1204,12 +1114,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 4
 	aux_utility_slots = 1
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }

 ship_section_template = {
@@ -1265,10 +1169,4 @@ ship_section_template = {
 	}
 	large_utility_slots = 12
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }
--- a/common/section_templates/RG_gray_ship_section.txt
+++ b/common/section_templates/RG_gray_ship_section.txt
@@ -160,12 +160,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 12
 	aux_utility_slots = 3
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 960
-		}
-	}
 }

 ship_section_template = {
@@ -627,12 +621,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 48
 	aux_utility_slots = 8
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }

 ship_section_template = {
@@ -1094,12 +1082,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 48
 	aux_utility_slots = 8
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }

 ship_section_template = {
@@ -1108,12 +1090,6 @@ ship_section_template = {
 	fits_on_slot = behind
 	entity = "grey_tempesttw_thinktank_phase_03_entity"
 	icon = "GFX_ship_part_core_mid"
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }

 ship_section_template = {
@@ -1122,10 +1098,4 @@ ship_section_template = {
 	fits_on_slot = behind
 	entity = "grey_tempesttw_thinktank_phase_03_entity"
 	icon = "GFX_ship_part_core_mid"
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }
--- a/common/section_templates/RG_special_ship_section.txt
+++ b/common/section_templates/RG_special_ship_section.txt
@@ -57,12 +57,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 90
-		}
-	}
 }

 ship_section_template = {
@@ -124,12 +118,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 90
-		}
-	}
 }

 ship_section_template = {
@@ -185,12 +173,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 90
-		}
-	}
 }

 ship_section_template = {
@@ -248,12 +230,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 90
-		}
-	}
 }

 # Baby Dragon
@@ -694,12 +670,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 48
 	aux_utility_slots = 8
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }

 ship_section_template = {
@@ -730,12 +700,6 @@ ship_section_template = {

 	large_utility_slots = 2
 	aux_utility_slots = 1
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 30
-		}
-	}
 }

 ship_section_template = {
@@ -769,10 +733,4 @@ ship_section_template = {

 	large_utility_slots = 2
 	aux_utility_slots = 1
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 30
-		}
-	}
 }
--- a/common/section_templates/RG_starbase_templates.txt
+++ b/common/section_templates/RG_starbase_templates.txt
@@ -164,7 +164,6 @@ ship_section_template = {
 	fits_on_slot = "core"
 	entity = "grey_tempesttw_starbase_starfortress_section_entity"
 	icon = "GFX_ship_part_core_mid"
-	hidden = yes
 	component_slot = {
 		name = "LARGE_GUN_01"
 		template = "invisible_large_turret"
--- a/common/ship_sizes/RG_ship_sizes.txt
+++ b/common/ship_sizes/RG_ship_sizes.txt
--- a/common/ship_sizes/z_RG_graygoo_ships.txt
+++ b/common/ship_sizes/z_RG_graygoo_ships.txt
@@ -15,7 +15,7 @@ graygoo_mothership = {
 	modifier = {
 		ship_evasion_add = 50
 		ship_armor_add = 25600
-		ship_shield_add = 25600
+		# ship_shield_add = 25600
 	}
 	ship_modifier = {
 		ship_disengage_chance_reduction = 8
@@ -46,8 +46,8 @@ graygoo_mothership = {
 	resources = {
 		category = ships
 		cost = {
-			nanites = @salvagecostlargerare
-		}
+			nanites = 30000
+	    }
 	}
 }

@@ -64,7 +64,7 @@ graygoo_interdictor = {
 		ships_upkeep_mult = -1
 		ship_piracy_suppression_add = 4
 		ship_armor_add = 2800
-		ship_shield_add = 2800
+		# ship_shield_add = 2800
 	}
 	max_hitpoints = 5000
 	size_multiplier = 8
@@ -88,8 +88,8 @@ graygoo_interdictor = {
 	resources = {
 		category = ships
 		cost = {
-			nanites = @salvagecostmediumrare
-		}
+			nanites = 3000
+	    }
 	}
 }

@@ -103,14 +103,14 @@ graygoo_factory = {
 	modifier = {
 		ship_cloaking_detection_add = 5
 		ship_evasion_add = 50
-		ship_armor_add = 1024000
-		ship_shield_add = 1024000
+		ship_armor_add = 2048000
+		# ship_shield_add = 1024000
 	}
 	ship_modifier = {
 		ship_shield_hardening_add = 5
 		ship_armor_hardening_add = 5
-		ship_armor_regen_add = 10240
-		ship_hull_regen_add = 5120
+		ship_armor_regen_add_static = 10240
+		ship_hull_regen_add_static = 5120
 	}
 	max_hitpoints = 2048000
 	size_multiplier = 32
@@ -132,8 +132,8 @@ graygoo_factory = {
 	resources = {
 		category = ships
 		cost = {
-			nanites = @salvagecostlargerare
-		}
+			nanites = 30000
+	    }
 	}
 }

@@ -180,8 +180,7 @@ nanite_space_dragon_baby = {
 	resources = {
 		category = ships
 		cost = {
-			alloys = @salvagecostmedium
-			nanites = @salvagecostmediumrare
-		}
+			nanites = 30000
+	    }
 	}
 }
--- a/common/situations/rg_gray_situations.txt
+++ b/common/situations/rg_gray_situations.txt
@@ -31,7 +31,7 @@ situation_rg_gray_mod1 = {
 		situation_rg_gray_mod1_stage_1 = {
 			icon = GFX_situation_stage_1
 			icon_background = GFX_situation_stage_frame_green
-			end = 16.5
+			end = 17
 			custom_tooltip = situation_rg_gray_mod1_stage_1_tooltip
 			on_first_enter = {
 				event_target:gray_warship = {
@@ -86,7 +86,7 @@ situation_rg_gray_mod1 = {
 		situation_rg_gray_mod1_stage_5 = {
 			icon = GFX_situation_stage_5
 			icon_background = GFX_situation_stage_frame_green
-			end = 82.5
+			end = 83
 			custom_tooltip = situation_rg_gray_mod1_stage_5_tooltip
 			on_first_enter = {
 				owner = {
@@ -177,7 +177,7 @@ situation_rg_gray_mod1 = {
 		}
 	}
 	monthly_progress = {
-		base = 0.1
+		base = 0.5
 		modifier = {
 			add = 0.1
 			desc = situation_rg_gray_mod1_stage_1_booster_tooltip
@@ -262,7 +262,7 @@ situation_rg_gray_mod2 = {
 		situation_rg_gray_mod2_stage_1 = {
 			icon = GFX_situation_stage_1
 			icon_background = GFX_situation_stage_frame_green
-			end = 8.4
+			end = 8
 			custom_tooltip = situation_rg_gray_mod2_stage_1_tooltip
 			on_first_enter = {
 				owner = {
@@ -275,7 +275,7 @@ situation_rg_gray_mod2 = {
 		situation_rg_gray_mod2_stage_2 = {
 			icon = GFX_situation_stage_2
 			icon_background = GFX_situation_stage_frame_green
-			end = 16.8
+			end = 17
 			custom_tooltip = situation_rg_gray_mod2_stage_2_tooltip
 			on_first_enter = {
 				owner = {
@@ -288,7 +288,7 @@ situation_rg_gray_mod2 = {
 		situation_rg_gray_mod2_stage_3 = {
 			icon = GFX_situation_stage_3
 			icon_background = GFX_situation_stage_frame_green
-			end = 25.2
+			end = 25
 			custom_tooltip = situation_rg_gray_mod2_stage_3_tooltip
 			on_first_enter = {
 				owner = {
@@ -301,7 +301,7 @@ situation_rg_gray_mod2 = {
 		situation_rg_gray_mod2_stage_4 = {
 			icon = GFX_situation_stage_4
 			icon_background = GFX_situation_stage_frame_green
-			end = 33.6
+			end = 34
 			custom_tooltip = situation_rg_gray_mod2_stage_4_tooltip
 			on_first_enter = {
 				owner = {
@@ -327,7 +327,7 @@ situation_rg_gray_mod2 = {
 		situation_rg_gray_mod2_stage_6 = {
 			icon = GFX_situation_stage_6
 			icon_background = GFX_situation_stage_frame_green
-			end = 50.4
+			end = 50
 			custom_tooltip = situation_rg_gray_mod2_stage_6_tooltip
 			on_first_enter = {
 				owner = {
@@ -340,7 +340,7 @@ situation_rg_gray_mod2 = {
 		situation_rg_gray_mod2_stage_7 = {
 			icon = GFX_situation_stage_1
 			icon_background = GFX_situation_stage_frame_green
-			end = 58.8
+			end = 59
 			custom_tooltip = situation_rg_gray_mod2_stage_7_tooltip
 			on_first_enter = {
 				owner = {
@@ -353,7 +353,7 @@ situation_rg_gray_mod2 = {
 		situation_rg_gray_mod2_stage_8 = {
 			icon = GFX_situation_stage_2
 			icon_background = GFX_situation_stage_frame_green
-			end = 67.2
+			end = 67
 			custom_tooltip = situation_rg_gray_mod2_stage_8_tooltip
 			on_first_enter = {
 				owner = {
@@ -366,7 +366,7 @@ situation_rg_gray_mod2 = {
 		situation_rg_gray_mod2_stage_9 = {
 			icon = GFX_situation_stage_3
 			icon_background = GFX_situation_stage_frame_green
-			end = 75.6
+			end = 76
 			custom_tooltip = situation_rg_gray_mod2_stage_9_tooltip
 			on_first_enter = {
 				owner = {
@@ -392,7 +392,7 @@ situation_rg_gray_mod2 = {
 		situation_rg_gray_mod2_stage_11 = {
 			icon = GFX_situation_stage_5
 			icon_background = GFX_situation_stage_frame_green
-			end = 92.4
+			end = 92
 			custom_tooltip = situation_rg_gray_mod2_stage_11_tooltip
 			on_first_enter = {
 				owner = {
@@ -483,54 +483,54 @@ situation_rg_gray_mod2 = {
 		}
 	}
 	monthly_progress = {
-		base = 0.1
+		base = 0.5
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_1_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_1_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_2_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_1_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_4_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_3_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_5_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_3_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_6_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_7_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_8_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_3_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_9_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_10_booster
 		}
 		modifier = {
-			add = 0.05
+			add = 0.1
 			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod2_stage_11_booster
 		}
--- a/common/special_projects/!_RG_projects_distant_stars.txt
+++ b/common/special_projects/!_RG_projects_distant_stars.txt
@@ -16,24 +16,7 @@ special_project = {
 	}
 	on_success = {
 		owner = {
-			if = {
-				limit = {
-					OR = {
-						has_global_flag = l_cluster_origin						# l-cluster plus
-						has_global_flag = rg_origin_l_cluster						# 遥远约定
-						has_global_flag = gray_origin_activate						# 远星之歌
-						has_global_flag = rg_origin_scion_l_cluster					# 未来追迹
-					}
-				}
-				country_event = {
-					id = rg_cluster.2
-				}
-			}
-			else = {
-				country_event = {
-					id = distar.10950
-				}
-			}
+			rg_event_effect_lcluster_open = yes
 		}
 	}
 	on_fail = {
@@ -102,7 +85,7 @@ special_project = {
 	event_scope = ship_event
 	requirements = {
 		shipclass_military = 1
-		leader = admiral
+		leader = commander
 		has_trait = RG_leader_trait_admiral_gray
 	}
 	on_start = {
--- a/common/special_projects/RG_story_special_projects.txt
+++ b/common/special_projects/RG_story_special_projects.txt
@@ -40,7 +40,7 @@ special_project = {
 	key = "rg_gray_mod2_stage1_project"
 	cost = 2000
 	#days_to_research = 300
-	tech_department = physics_research
+	tech_department = physics_technology
 	icon = "gfx/interface/icons/situation_log/situation_log_main_quest.dds"
 	picture = GFX_evt_l-gateway
 	event_scope = country_event
@@ -80,7 +80,7 @@ special_project = {
 	key = "rg_gray_mod2_stage4_project"
 	cost = 2000
 	#days_to_research = 300
-	tech_department = engineering_research
+	tech_department = engineering_technology
 	icon = "gfx/interface/icons/situation_log/situation_log_main_quest.dds"
 	picture = GFX_evt_l-gateway
 	event_scope = country_event
--- a/common/species_classes/rg_species_classes.txt
+++ b/common/species_classes/rg_species_classes.txt
@@ -20,7 +20,7 @@ GRAY_SPECIES = {
 	playable = { always = no }
 	randomized = no

-	gender = female
+	gender = no

 	portraits = {
 		"Gray"
@@ -32,7 +32,6 @@ GRAY_SPECIES = {
 RG_MACHINE = {
 	archetype = MACHINE

-	playable = no
 	randomized = no
 	# possible = { always = yes }
 	# possible_secondary = { always = no text = SECONDARY_SPECIES_CLASS_INVALID }
--- a/common/static_modifiers/RG_storm_static_modifiers.txt
+++ b/common/static_modifiers/RG_storm_static_modifiers.txt
@@ -0,0 +1,26 @@
+graytempest_storm_aftermath_modifier_severity_1 = {
+	planet_stability_add = -5
+	planet_building_build_speed_mult = -1
+
+	custom_tooltip = graytempest_storm_aftermath_1_tt
+	icon = "gfx/interface/icons/planet_modifiers/pm_particle_aftermath_modifier.dds"
+	icon_frame = 2
+}
+
+graytempest_storm_aftermath_modifier_severity_2 = {
+	planet_stability_add = -10
+	planet_building_build_speed_mult = -2
+
+	custom_tooltip = graytempest_storm_aftermath_2_tt
+	icon = "gfx/interface/icons/planet_modifiers/pm_particle_aftermath_modifier.dds"
+	icon_frame = 2
+}
+
+graytempest_storm_aftermath_modifier_severity_3 = {
+	planet_stability_add = -20
+	planet_building_build_speed_mult = -10
+
+	custom_tooltip = graytempest_storm_aftermath_3_tt
+	icon = "gfx/interface/icons/planet_modifiers/pm_particle_aftermath_modifier.dds"
+	icon_frame = 2
+}
--- a/common/storm_types/RG_storm_types.txt
+++ b/common/storm_types/RG_storm_types.txt
@@ -0,0 +1,111 @@
+# graytempest Storm Type
+
+graytempest_storm = {
+	inline_script = "cosmic_storms/BaseModifier"
+
+	inline_script = {
+		script = "cosmic_storms/StormConfig"
+		MIN_RADIUS = 40
+		MAX_RADIUS = 100
+		MIN_RANGE = value:storm_range_min
+		MAX_RANGE = value:storm_range_max
+		STORM_SPEED = 0.01
+		ACTIVATION_PERIOD_IN_MONTHS = 120
+		MONTHLY_ADDED_DEVASTATION = 0.2
+	}
+	affect_hp_regen = yes
+	affect_armor_regen = yes
+
+	spawn_weight = 0
+	description = graytempest_storm_lore_description
+
+	### positive effects ###
+
+	triggered_planet_modifier = {
+		potential = {
+			OR = {
+				is_colony = yes
+				is_colonizable = yes
+			}
+			system_has_negating_storm_building = no
+		}
+		modifier = {
+			planet_building_build_speed_mult = 2
+			planet_clear_blocker_speed_mult = 2
+			custom_tooltip = graytempest_storm_fleet_tt
+			show_only_custom_tooltip = no
+		}
+	}
+	triggered_system_modifier = {
+		potential = {
+			system_has_negating_storm_building = no
+		}
+		modifier = {
+			starbase_shipyard_build_speed_mult = 4
+		}
+	}
+
+	### negative effects ###
+
+	triggered_planet_modifier = {
+		potential = {
+			is_colony = no
+			system_has_negating_storm_building = no
+		}
+		modifier = {
+			stations_upkeep_mult = 2
+		}
+	}
+
+	triggered_fleet_modifier = {
+		potential = {
+			always = yes
+		}
+		modifier = {
+			ships_upkeep_mult = 2
+			custom_tooltip = graytempest_storm_fleet_tt
+			show_only_custom_tooltip = no
+		}
+	}
+
+	on_start = {
+		every_system_within_storm = {
+			added_to_storm_base_effect = yes
+			graytempest_storm_add = yes
+		}
+	}
+
+	on_finished = {
+		every_system_within_storm = {
+			removed_from_storm_base_effect = yes
+			graytempest_storm_remove = yes
+		}
+	}
+
+	on_moved = {
+		every_system_added_to_storm = {
+			added_to_storm_base_effect = yes
+			graytempest_storm_add = yes
+		}
+
+		every_system_removed_from_storm= {
+			removed_from_storm_base_effect = yes
+			graytempest_storm_remove = yes
+		}
+	}
+
+	cosmic_storm_texture_path = "gfx/map/storms/NebulaOpacity.dds"
+	cosmic_storm_texture_color_path = "gfx/map/storms/graytempest_storm_color.dds"
+	cosmic_storm_event_sprite = "GFX_particle_storm"
+	icon = GFX_planetview_storm_particle_modifier_frame
+
+	cosmic_storm_texture_lightning_paths = {
+		"gfx/map/storms/lightning/lightning_small_storm_01.dds"
+		"gfx/map/storms/lightning/lightning_small_storm_02.dds"
+		"gfx/map/storms/lightning/lightning_mid_storm_01.dds"
+		"gfx/map/storms/lightning/lightning_mid_storm_02.dds"
+	}
+
+	cosmic_storm_galaxy_lightning_time = 7.0
+	cosmic_storm_galaxy_max_opacity = 0.4
+}
--- a/common/traits/!_RG_gray_goo_traits.txt
+++ b/common/traits/!_RG_gray_goo_traits.txt
@@ -32,80 +32,78 @@
 # 	initial = no
 # 	randomized = no
 # }
-
-RG_leader_trait_offical_gray = {
-	#唯一特质
-	cost = 0
-	inline_script = {
-		script = trait/icon_psionic
-		CLASS = leader
-		ICON = "GFX_leader_trait_psionic_chosen_one"
-		RARITY = paragon
-		COUNCIL = no
-		TIER = none
-	}
-	immortal_leaders = yes
-		triggered_self_modifier = {
-		potential = {
-			always = yes
-		}
-		leader_skill_levels = 1
-		mult = trigger:has_skill
-	}
-	self_modifier = {
-		species_leader_exp_gain = 1
-	}
-	councilor_modifier = {
-		all_technology_research_speed = 0.5
-	}
-	planet_modifier = {
-		planet_buildings_cost_mult = -0.4
-		planet_building_build_speed_mult = 0.6
-		planet_jobs_alloys_produces_mult = 0.25
-		planet_jobs_engineering_research_produces_mult = 0.25
-		deposit_blockers_cost_mult = -0.4
-		planet_clear_blocker_time_mult = -0.6
-	}
-	sector_modifier = {
-		planet_buildings_cost_mult = -0.2
-		planet_building_build_speed_mult = 0.2
-		planet_jobs_alloys_produces_mult = 0.1
-		planet_jobs_engineering_research_produces_mult = 0.1
-		deposit_blockers_cost_mult = -0.2
-		planet_clear_blocker_time_mult = -0.2
-		starbase_shipyard_build_cost_mult = -0.25
-		starbase_shipyard_build_speed_mult = -0.3
-	}
-	fleet_modifier = {
-		ship_armor_mult = 3.5
-		ship_hull_mult = 3.5
-		ships_upkeep_mult = -0.4
-		ship_hull_regen_add_perc = 5
-		ship_armor_regen_add_perc = 5
-	}
-	army_modifier = {
-		army_collateral_damage_mult = 0.15
-		army_disengage_chance_mult = 0.5
-		army_health = 0.35
-	}
-	modifier = {
-		ship_archaeological_site_excavation_speed_mult = 0.5
-		science_ship_survey_speed = 1
-		# ship_windup_mult = -1
-		# ship_speed_mult = 0.5
-		ship_anomaly_generation_chance_mult = -1
-	}
-	triggered_modifier = {
-		potential = {
-			has_astral_planes_dlc = yes
-		}
-		country_astral_rift_speed_mult = 0.5
-	}
-	leader_class = { rg_nanite_leader }
-	initial = no
-	randomized = no
-}
-
+# RG_leader_trait_offical_gray = {
+# 	#唯一特质
+# 	cost = 0
+# 	inline_script = {
+# 		script = trait/icon_psionic
+# 		CLASS = leader
+# 		ICON = "GFX_leader_trait_psionic_chosen_one"
+# 		RARITY = paragon
+# 		COUNCIL = no
+# 		TIER = none
+# 	}
+# 	immortal_leaders = yes
+# 		triggered_self_modifier = {
+# 		potential = {
+# 			always = yes
+# 		}
+# 		leader_skill_levels = 1
+# 		mult = trigger:has_skill
+# 	}
+# 	self_modifier = {
+# 		species_leader_exp_gain = 1
+# 	}
+# 	councilor_modifier = {
+# 		all_technology_research_speed = 0.5
+# 	}
+# 	planet_modifier = {
+# 		planet_buildings_cost_mult = -0.4
+# 		planet_building_build_speed_mult = 0.6
+# 		planet_jobs_alloys_produces_mult = 0.25
+# 		planet_jobs_engineering_research_produces_mult = 0.25
+# 		deposit_blockers_cost_mult = -0.4
+# 		planet_clear_blocker_time_mult = -0.6
+# 	}
+# 	sector_modifier = {
+# 		planet_buildings_cost_mult = -0.2
+# 		planet_building_build_speed_mult = 0.2
+# 		planet_jobs_alloys_produces_mult = 0.1
+# 		planet_jobs_engineering_research_produces_mult = 0.1
+# 		deposit_blockers_cost_mult = -0.2
+# 		planet_clear_blocker_time_mult = -0.2
+# 		starbase_shipyard_build_cost_mult = -0.25
+# 		starbase_shipyard_build_speed_mult = -0.3
+# 	}
+# 	fleet_modifier = {
+# 		ship_armor_mult = 3.5
+# 		ship_hull_mult = 3.5
+# 		ships_upkeep_mult = -0.4
+# 		ship_hull_regen_add_perc = 5
+# 		ship_armor_regen_add_perc = 5
+# 	}
+# 	army_modifier = {
+# 		army_collateral_damage_mult = 0.15
+# 		army_disengage_chance_mult = 0.5
+# 		army_health = 0.35
+# 	}
+# 	modifier = {
+# 		ship_archaeological_site_excavation_speed_mult = 0.5
+# 		science_ship_survey_speed = 1
+# 		# ship_windup_mult = -1
+# 		# ship_speed_mult = 0.5
+# 		ship_anomaly_generation_chance_mult = -1
+# 	}
+# 	triggered_modifier = {
+# 		potential = {
+# 			has_astral_planes_dlc = yes
+# 		}
+# 		country_astral_rift_speed_mult = 0.5
+# 	}
+# 	leader_class = { rg_nanite_leader }
+# 	initial = no
+# 	randomized = no
+# }
 RG_leader_trait_governor_gray = {
 	#总督特质
 	cost = 0
@@ -146,7 +144,9 @@ RG_leader_trait_governor_gray = {
 		starbase_shipyard_build_cost_mult = -0.25
 		starbase_shipyard_build_speed_mult = -0.3
 	}
-	leader_class = { official }
+	leader_class = {
+		official
+	}
 	initial = no
 	randomized = no
 }
@@ -270,7 +270,9 @@ RG_leader_trait_ruler_gray = {
 		country_base_influence_produces_add = 1
 		mult = trigger:has_skill
 	}
-	leader_class = { official rg_nanite_leader }
+	leader_class = {
+		official
+	}
 	initial = no
 	randomized = no
 }
@@ -309,7 +311,9 @@ RG_leader_trait_admiral_gray_1 = {
 		army_disengage_chance_mult = 0.3
 		army_health = 0.15
 	}
-	leader_class = { commander }
+	leader_class = {
+		commander
+	}
 	initial = no
 	randomized = no
 }
@@ -348,7 +352,9 @@ RG_leader_trait_admiral_gray_2 = {
 		army_disengage_chance_mult = 0.4
 		army_health = 0.25
 	}
-	leader_class = { commander }
+	leader_class = {
+		commander
+	}
 	initial = no
 	randomized = no
 }
@@ -387,7 +393,9 @@ RG_leader_trait_admiral_gray = {
 		army_disengage_chance_mult = 0.5
 		army_health = 0.35
 	}
-	leader_class = { commander }
+	leader_class = {
+		commander
+	}
 	initial = no
 	randomized = no
 }
@@ -418,7 +426,9 @@ RG_leader_trait_admiral_nanorebuild_gray = {
 		army_health = 0.05
 		mult = owner.rg_general_skill_combat_daypassed_variable
 	}
-	leader_class = { commander rg_nanite_leader }
+	leader_class = {
+		commander
+	}
 	initial = no
 	randomized = no
 }
@@ -455,7 +465,9 @@ RG_leader_trait_scientist_gray = {
 		# ship_speed_mult = 0.5
 		ship_anomaly_generation_chance_mult = -1
 	}
-	leader_class = { scientist }
+	leader_class = {
+		scientist
+	}
 	initial = no
 	randomized = no
 }
@@ -486,7 +498,6 @@ RG_leader_trait_scientist_gray = {
 # 	initial = no
 # 	randomized = no
 # }
-
 # 与舰长技能合并，弃用
 # RG_leader_trait_general_gray_skill = {
 # 	destiny_trait = yes
@@ -512,7 +523,6 @@ RG_leader_trait_scientist_gray = {
 # 	randomized = no
 # 	destiny_background_icon = "GFX_leader_background_destiny_1"
 # }
-
 RG_leader_trait_admiral_fake_dragon = {
 	cost = 0
 	inline_script = {
@@ -532,7 +542,9 @@ RG_leader_trait_admiral_fake_dragon = {
 		ship_hull_mult = 0.2
 		ship_weapon_damage = 0.2
 	}
-	leader_class = { commander }
+	leader_class = {
+		commander
+	}
 	initial = no
 	randomized = no
 }
@@ -573,9 +585,23 @@ RG_leader_trait_admiral_timed_life = {
 		ship_armor_mult = 10
 		ship_hull_mult = 10
 		ship_weapon_damage = 10
-		custom_tooltip_with_modifiers = rg_timed_life_millennium
 	}
-	leader_class = { commander }
+	triggered_desc = {
+		# Show key if trigger/exclusive_trigger is true.
+		trigger = {
+			owner = {
+				check_variable = {
+					which = rg_fake_dragon_timedlife_counter
+					value > 1000
+				}
+			}
+		}
+		# Trigger appends additional localization key to existing text. THIS = Leader
+		text = rg_timed_life_millennium_reborn
+	}
+	leader_class = {
+		commander
+	}
 	initial = no
 	randomized = no
 }
@@ -617,9 +643,23 @@ RG_leader_trait_admiral_born_tobe_dragon = {
 		ship_armor_mult = 0.01
 		ship_hull_mult = 0.01
 		ship_weapon_damage = 0.01
-		custom_tooltip_with_modifiers = rg_timed_life_millennium_reborn
 	}
-	leader_class = { commander }
+	triggered_desc = {
+		# Show key if trigger/exclusive_trigger is true.
+		trigger = {
+			owner = {
+				check_variable = {
+					which = rg_fake_dragon_timedlife_counter
+					value > 1000
+				}
+			}
+		}
+		# Trigger appends additional localization key to existing text. THIS = Leader
+		text = rg_timed_life_millennium_reborn
+	}
+	leader_class = {
+		commander
+	}
 	initial = no
 	randomized = no
 }
--- a/common/traits/RG_machine_species_trait.txt
+++ b/common/traits/RG_machine_species_trait.txt
@@ -2,7 +2,7 @@ rg_machine_maid_trait = {
 	cost = {
 		base = 0
 	}
-	# custom_tooltip = rg_machine_maid_trait_effect
+	custom_tooltip = rg_machine_maid_trait_effect_tooltip
 	initial = no
 	species_potential_add = { always = no }
 	species_possible_remove = { always = no }
@@ -16,6 +16,11 @@ rg_machine_maid_trait = {
 	opposites = {
 	}

+	modifier = {
+		habitability_floor_add = 0.25
+		pop_housing_usage_mult = -0.9
+	}
+
 	assembling_modifier = {
 		planet_pop_assemblers_nanites_upkeep_add = 0.1
 	}
@@ -23,10 +28,13 @@ rg_machine_maid_trait = {
 	# 在灰风主人国家工作提供加成
 	triggered_pop_modifier = {
 		potential = {
-			exists = owner
-			owner = { is_same_value = event_target:gray_owner }
+			exists = planet
+			planet = {
+				exists = owner
+				owner = { is_same_value = event_target:gray_owner }
+			}
 		}
-		planet_jobs_produces_mult = 1.1
+		planet_jobs_produces_mult = 0.1
 	}

 	ai_weight = {
--- a/descriptor.mod
+++ b/descriptor.mod
@@ -8,5 +8,5 @@ tags={
 }
 name="Real Gray"
 picture="thumbnail.png"
-supported_version="3.11.*"
+supported_version="v3.13.*"
 remote_file_id="2136166095"
--- a/events/!_RG_gray_goo_event_overwrite.txt
+++ b/events/!_RG_gray_goo_event_overwrite.txt
@@ -56,6 +56,7 @@ country_event = {
 				limit = {
 					has_planet_flag = main_star
 				}
+				save_global_event_target_as = rg_main_star
 				save_event_target_as = main_star
 			}
 			create_country = {
@@ -79,6 +80,7 @@ country_event = {
 					}
 				}
 				effect = {
+					save_global_event_target_as = rg_graygoo_country
 					save_event_target_as = graygoo_country
 					create_ship_design = {
 						design = "NAME_RG_armed_transport_ship"
@@ -193,6 +195,14 @@ country_event = {
 					garrison = yes
 				}
 			}
+			every_system = {
+				limit = {
+					has_star_flag = lgate
+				}
+				system_event = {
+					id = rg_storms.1
+				}
+			}
 			every_system = {
 				limit = {
 					has_star_flag = lcluster
--- a/events/!_RG_gray_goo_events.txt
+++ b/events/!_RG_gray_goo_events.txt
@@ -314,6 +314,7 @@ country_event = {
 			rg_gray_country_init = yes			#创建国家
 		}
 		rg_gray_country_after_init = yes
+		set_country_flag = machine_age_nanites_studied 
 		create_message = {
 			type = MESSAGE_RECRUITED_LEADER
 			localization = "rg_event.2.desc"
@@ -621,12 +622,9 @@ event = {
 					}
 				}
 				AND = {
-					OR = {
-						has_country_flag = gray_official_active
-						has_country_flag = gray_governor_active #旧版flag
-					}
+					has_country_flag = gray_official_active
 					NOT = {
-						exists = event_target:gray_governor
+						exists = event_target:gray_official
 					}
 				}
 				AND = {
@@ -640,10 +638,8 @@ event = {
 	}
 	immediate = {
 		event_target:gray_owner = {
-			OR = {
-				has_country_flag = gray_official_active
-				has_country_flag = gray_governor_active #旧版flag
-			}			#总督
+			remove_country_flag = gray_official_active #新版flag
+			remove_country_flag = gray_governor_active #旧版flag	#总督
 			remove_country_flag = gray_warship_active			#旗舰
 			remove_country_flag = gray_army_active			#陆军
 			remove_country_flag = gray_constship_active			#科舰
@@ -652,12 +648,8 @@ event = {
 				modifier = "gray_scattered"
 				days = 3600
 			}
-			country_event = {
-				id = graygoo.511
-			}
-			country_event = {
-				id = rg_event.22
-			}
+			country_event = { id = graygoo.511 }
+			country_event = { id = graygoo.512 days = 3600 }
 		}
 	}
 }
@@ -682,11 +674,20 @@ country_event = {
 	desc = "graygoo.512.a.desc"
 	desc = "graygoo.512.b.desc"
 	desc = "graygoo.512.c.desc"
-	diplomatic = yes
+
+	event_window_type = leader_story
+	picture = GFX_evt_gray_gooed_planet
+	picture_event_data = {
+		portrait = event_target:rg_gray_country_leader
+		room = root
+	}
+
 	is_triggered_only = yes
+
 	immediate = {
 		remove_country_flag = gray_reforming
 	}
+
 	option = {
 		name = graygoo.512.a
 	}
--- a/events/RG_cluster_events.txt
+++ b/events/RG_cluster_events.txt
@@ -145,7 +145,7 @@ country_event = {
 				root = {
 					random_owned_leader = {
 						limit = {
-							leader_class = governor
+							leader_class = official
 						}
 						save_event_target_as = rg_cluster_sector_gov
 					}
@@ -186,6 +186,7 @@ country_event = {
 		# Planet setup
 		event_target:rg_cluster_home_planet = {
 			change_pc = pc_gaia
+			set_planet_size = 20
 			set_owner = root
 			set_controller = root
 			set_capital = yes
--- a/events/RG_combat_skill_events.txt
+++ b/events/RG_combat_skill_events.txt
@@ -1,5 +1,4 @@
 namespace = rg_skill
-
 # fleet_event = {
 #     id = rg_skill.1
 #     hide_window = yes
@@ -139,7 +138,7 @@ ship_event = {
 			limit = {
 				owner = {
 					NOT = {
-						is_same_value = origin_rg_gray_country
+						is_same_value = event_target:origin_rg_gray_country
 					}
 				}
 				solar_system = {
@@ -158,14 +157,14 @@ ship_event = {
 		else_if = {
 			limit = {
 				owner = {
-					is_same_value = origin_rg_gray_country
+					is_same_value = event_target:origin_rg_gray_country
 					NOT = {
 						has_global_flag = l_cluster_opened
 					}
 				}
 				solar_system = {
 					has_star_flag = lcluster
-					NOT = {	
+					NOT = {
 						any_fleet_in_system = {
 							exists = controller
 							controller = {
@@ -180,12 +179,12 @@ ship_event = {
 		else_if = {
 			limit = {
 				owner = {
-					is_same_value = origin_rg_gray_country					# 是小灰起源
+					is_same_value = event_target:origin_rg_gray_country					# 是小灰起源
 					has_global_flag = l_cluster_opened					# L星门已开启
 				}
 				solar_system = {
 					# has_star_flag = lcluster
-					NOT = {	
+					NOT = {
 						any_fleet_in_system = {
 							exists = controller
 							controller = {
@@ -382,23 +381,32 @@ planet_event = {
 			remove_planet_flag = checking_tempest_incoming
 		}
 		else = {
-			#planet
-			any_ground_combat_attacker = {
-				#army
-				exists = leader
-				leader = {
-					#leader
-					has_trait = RG_leader_trait_admiral_nanorebuild_gray
-					owner = {
-						#country
-						save_event_target_as = attacking_general_country
+			if = {
+				limit = {
+					#planet
+					any_ground_combat_attacker = {
+						#army
+						exists = leader
+						leader = {
+							#leader
+							has_trait = RG_leader_trait_admiral_nanorebuild_gray
+						}
+
 					}
+	
+				}
+				from = {
+					#country
+					save_event_target_as = attacking_general_country
 				}
 			}
-			# Do the same check again in X days
-			country_event = {
-				id = rg_skill.10
-			}			# NOTE: Update custom loc for effect when changing days
+			from = {
+				# Do the same check again in X days
+				country_event = {
+					id = rg_skill.10
+				}
+				# NOTE: Update custom loc for effect when changing days
+			}
 		}
 	}
 }
@@ -679,13 +687,11 @@ country_event = {
 # 		}
 # 	}
 # }
-
 # On destroying enemy ship.
 country_event = {
 	id = rg_skill.13
 	hide_window = yes
 	is_triggered_only = yes
-
 	trigger = {
 		FromFrom = {
 			is_in_combat = yes
@@ -695,11 +701,13 @@ country_event = {
 			has_trait = RG_leader_trait_admiral_nanorebuild_gray
 		}
 	}
-
 	immediate = {
-		FROMFROM = { # Winning ship.
+		FROMFROM = {
+			# Winning ship.
 			if = {
-				limit = { exists = fleet.leader }
+				limit = {
+					exists = fleet.leader
+				}
 				fleet.leader = {
 					if = {
 						limit = {
@@ -719,6 +727,7 @@ country_event = {
 		}
 	}
 }
+
 # This = owner of fleet 1 (winner)
 # From = owner of fleet 2 (loser)
 # FromFrom = fleet 1
@@ -751,6 +760,7 @@ country_event = {
 		}
 	}
 }
+
 # This = owner of fleet 1 (loser)
 # From = owner of fleet 2 (winner)
 # FromFrom = fleet 1
--- a/events/RG_events.txt
+++ b/events/RG_events.txt
@@ -14,52 +14,18 @@ country_event = {
 	immediate = {
 		if = {
 			limit = {
-				NOT = {
-					has_global_flag = origin_rg_gray_1st_global
-				}
+				has_civic = civic_rg_gray_cluster
 			}
-			set_global_flag = origin_rg_gray_1st_global
-			set_country_flag = origin_rg_gray_1st
-			set_country_flag = rg_gray_level_1
-			country_event = {
-				id = rg_event.2
-				days = 30
+			rg_event_effect_event1_cluster = yes
+		}
+		else_if = {
+			limit = {
+				has_civic = civic_rg_gray_non_cluster
 			}
-			add_modifier = {
-				modifier = rg_distant_stars_modifier
-			}
-			save_global_event_target_as = origin_rg_gray_country
-			rg_lcluster_spawn_effect = yes
+			rg_event_effect_event1_cluster_galaxy = yes
 		}
 		else = {
-			set_country_flag = origin_gray_dragon_country
-			set_global_flag = has_origin_gray_dragon
-			rg_create_fake_dragon = yes
-			random_owned_leader = {
-				limit = {
-					has_leader_flag = rg_fake_dragon
-				}
-				remove_trait = RG_leader_trait_admiral_timed_life
-				add_trait = RG_leader_trait_admiral_born_tobe_dragon
-				set_leader_flag = rg_fake_dragon_reborn
-				set_age = 0
-			}
-			set_country_flag = rg_fake_dragon_reborn_country
-			set_variable = {
-				which = rg_fake_dragon_timedlife_counter
-				value = 0
-			}
-			start_lcluster_chain = yes
-			add_event_chain_counter = {
-				event_chain = l_cluster_chain
-				counter = clues
-				amount = 7
-			}
-			# increment variable
-			change_variable = {
-				which = num_lcluster_clues
-				value = 7
-			}
+			rg_event_effect_event1_cluster = yes
 		}
 	}
 }
@@ -859,9 +825,7 @@ country_event = {
 	fire_only_once = yes
 	picture = GFX_evt_drifting_gateway
 	trigger = {
-		mid_game_years_passed >= 0
 		NOT = {
-			is_multiplayer = yes
 			has_global_flag = has_origin_gray_dragon
 		}
 		has_country_flag = origin_rg_gray
@@ -890,7 +854,7 @@ country_event = {
 						has_star_flag = lgate_originating_system
 					}
 					any_system_megastructure = {
-						is_megastructure_type = l_gate_base
+						is_megastructure_type = lgate_base
 					}
 				}
 			}
@@ -901,10 +865,10 @@ country_event = {
 						has_star_flag = lgate_originating_system
 					}
 					any_system_megastructure = {
-						is_megastructure_type = l_gate_base
+						is_megastructure_type = lgate_base
 					}
 				}
-				save_event_target_as = candidate_gateway
+				save_global_event_target_as = candidate_gateway
 			}
 			country_event = {
 				id = distar.10905
@@ -917,6 +881,9 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		name = OK
+	}
 }


@@ -1022,7 +989,7 @@ country_event = {
 				limit = {
 					is_megastructure_type = lgate_base
 				}
-				save_event_target_as = candidate_gateway
+				save_global_event_target_as = candidate_gateway
 			}
 			country_event = {
 				id = distar.10905
@@ -1039,35 +1006,35 @@ country_event = {
 	}
 }

-# looping check for grayreforming
-country_event = {
-	id = rg_event.22
-	hide_window = yes
-	is_triggered_only = yes
-	trigger = {
-		is_same_value = event_target:gray_owner
-		has_country_flag = gray_reforming
-	}
-	immediate = {
-		if = {
-			limit = {
-				NOT = {
-					has_modifier = "gray_scattered"
-				}
-			}
-			country_event = {
-				id = graygoo.512
-			}
-		}
-		else = {
-			country_event = {
-				id = rg_event.22
-				years = 1
-			}
-			# *THIS* looping check
-		}
-	}
-}
+# # looping check for grayreforming
+# country_event = {
+# 	id = rg_event.22
+# 	hide_window = yes
+# 	is_triggered_only = yes
+# 	trigger = {
+# 		is_same_value = event_target:gray_owner
+# 		has_country_flag = gray_reforming
+# 	}
+# 	immediate = {
+# 		if = {
+# 			limit = {
+# 				NOT = {
+# 					has_modifier = "gray_scattered"
+# 				}
+# 			}
+# 			country_event = {
+# 				id = graygoo.512
+# 			}
+# 		}
+# 		else = {
+# 			country_event = {
+# 				id = rg_event.22
+# 				years = 1
+# 			}
+# 			# *THIS* looping check
+# 		}
+# 	}
+# }

 # 拆毁工厂小灰通讯
 country_event = {
@@ -1107,14 +1074,14 @@ country_event = {
 		hidden_effect = {
 			create_fleet = {
 				effect = {
-					set_owner = event_target:graygoo_country
+					set_owner = event_target:rg_graygoo_country
 					create_ship = {
 						name = random
 						design = "NAME_Gray_Warship"
 						graphical_culture = "pirate_01"
 					}
 					set_location = {
-						target = event_target:main_star
+						target = event_target:rg_main_star
 						distance = 55
 						angle = 270
 					}
@@ -1160,14 +1127,14 @@ country_event = {
 		hidden_effect = {
 			create_fleet = {
 				effect = {
-					set_owner = event_target:graygoo_country
+					set_owner = event_target:rg_graygoo_country
 					create_ship = {
 						name = random
 						design = "NAME_Gray_Warship"
 						graphical_culture = "pirate_01"
 					}
 					set_location = {
-						target = event_target:main_star
+						target = event_target:rg_main_star
 						distance = 55
 						angle = 270
 					}
@@ -1284,14 +1251,14 @@ country_event = {
 		hidden_effect = {
 			create_fleet = {
 				effect = {
-					set_owner = event_target:graygoo_country
+					set_owner = event_target:rg_graygoo_country
 					create_ship = {
 						name = random
 						design = "NAME_Gray_Warship"
 						graphical_culture = "pirate_01"
 					}
 					set_location = {
-						target = event_target:main_star
+						target = event_target:rg_main_star
 						distance = 55
 						angle = 270
 					}
@@ -1455,7 +1422,7 @@ country_event = {
 	immediate = {
 		every_owned_fleet = {
 			limit = {
-				any_ship = {
+				any_owned_ship = {
 					is_ship_size = graygoo_mothership
 				}
 			}
@@ -1751,7 +1718,7 @@ country_event = {
 					any_fleet_in_system = {
 						owner = {
 							NOT = {
-								is_country = event_target:graygoo_country
+								is_country = event_target:rg_graygoo_country
 							}
 						}
 					}
@@ -1759,7 +1726,7 @@ country_event = {
 			}
 			random_country = {
 				limit = {
-					is_country = event_target:graygoo_country
+					is_country = event_target:rg_graygoo_country
 				}
 				country_event = {
 					id = rg_event.405
@@ -1770,7 +1737,7 @@ country_event = {
 		}
 		else_if = {
 			limit = {
-				event_target:graygoo_country = {
+				event_target:rg_graygoo_country = {
 					num_fleets < 30
 				}
 			}
@@ -1781,12 +1748,12 @@ country_event = {
 						has_star_flag = lgate_originating_system
 					}
 					any_system_megastructure = {
-						is_megastructure_type = l_gate_base
+						is_megastructure_type = lgate_base
 					}
 				}
 				random_system_megastructure = {
 					limit = {
-						is_megastructure_type = l_gate_base
+						is_megastructure_type = lgate_base
 					}
 					create_ambient_object = {
 						type = "horror_spawn_object"
@@ -1797,7 +1764,7 @@ country_event = {
 					create_fleet = {
 						name = "NAME_Tempest_Fleet"
 						effect = {
-							set_owner = event_target:graygoo_country
+							set_owner = event_target:rg_graygoo_country
 							rg_create_graygoo_fleet_random = yes
 							set_formation_scale = 2
 							set_fleet_stance = aggressive
@@ -1852,7 +1819,7 @@ country_event = {
 					any_fleet_in_system = {
 						owner = {
 							NOT = {
-								is_country = event_target:graygoo_country
+								is_country = event_target:rg_graygoo_country
 							}
 						}
 					}
@@ -1860,7 +1827,7 @@ country_event = {
 			}
 			random_country = {
 				limit = {
-					is_country = event_target:graygoo_country
+					is_country = event_target:rg_graygoo_country
 				}
 				country_event = {
 					id = rg_event.405
@@ -1871,7 +1838,7 @@ country_event = {
 		}
 		if = {
 			limit = {
-				event_target:graygoo_country = {
+				event_target:rg_graygoo_country = {
 					num_fleets < 60
 				}
 			}
@@ -1882,12 +1849,12 @@ country_event = {
 						has_star_flag = lgate_originating_system
 					}
 					any_system_megastructure = {
-						is_megastructure_type = l_gate_base
+						is_megastructure_type = lgate_base
 					}
 				}
 				random_system_megastructure = {
 					limit = {
-						is_megastructure_type = l_gate_base
+						is_megastructure_type = lgate_base
 					}
 					create_ambient_object = {
 						type = "horror_spawn_object"
@@ -1900,7 +1867,7 @@ country_event = {
 						create_fleet = {
 							name = "NAME_Tempest_Fleet"
 							effect = {
-								set_owner = event_target:graygoo_country
+								set_owner = event_target:rg_graygoo_country
 								rg_create_graygoo_fleet_random = yes
 								set_formation_scale = 2
 								set_fleet_stance = aggressive
--- a/events/RG_gray_leader_dialog_event.txt
+++ b/events/RG_gray_leader_dialog_event.txt
@@ -484,6 +484,126 @@ country_event = {
 	}
 }

+country_event = {
+	id = rg_grayleader_dialog.5026
+	title = "graygoo.500.title"
+	desc = "RG_graygoo.502.f.response"
+	event_window_type = leader_recruit
+	picture_event_data = {
+		portrait = event_target:rg_gray_country_leader
+		room = "ethic_spaceship_room"
+	}
+	is_triggered_only = yes
+	immediate = {
+		set_country_flag = gray_diplomacy_engaged
+	}
+	after = {
+		hidden_effect = {
+			remove_country_flag = gray_diplomacy_engaged
+		}
+	}
+	option = {
+		name = OK
+	}
+	option = {
+		name = graygoo.500.d
+		tag = hire_leader
+		default_hide_option = yes
+	}
+	option = {
+		name = graygoo.500.prepage
+		tag = dismiss_leader
+		hidden_effect = {
+			country_event = {
+				id = rg_grayleader.1
+			}
+		}
+	}
+}
+
+country_event = {
+	id = rg_grayleader_dialog.5027
+	title = "graygoo.500.title"
+	desc = "RG_graygoo.502.g.response"
+	event_window_type = leader_recruit
+	picture_event_data = {
+		portrait = event_target:rg_gray_country_leader
+		room = "ethic_spaceship_room"
+	}
+	is_triggered_only = yes
+	immediate = {
+		set_country_flag = gray_diplomacy_engaged
+	}
+	after = {
+		hidden_effect = {
+			remove_country_flag = gray_diplomacy_engaged
+		}
+	}
+	option = {
+		name = OK
+	}
+	option = {
+		name = graygoo.500.d
+		tag = hire_leader
+		default_hide_option = yes
+	}
+	option = {
+		name = graygoo.500.prepage
+		tag = dismiss_leader
+		hidden_effect = {
+			country_event = {
+				id = rg_grayleader.1
+			}
+		}
+	}
+}
+
+country_event = {
+	id = rg_grayleader_dialog.5028
+	title = "graygoo.500.title"
+	desc = "RG_graygoo.502.h.response"
+	event_window_type = leader_recruit
+	picture_event_data = {
+		portrait = event_target:rg_gray_country_leader
+		room = "ethic_spaceship_room"
+	}
+	is_triggered_only = yes
+	immediate = {
+		set_country_flag = gray_diplomacy_engaged
+	}
+	after = {
+		hidden_effect = {
+			remove_country_flag = gray_diplomacy_engaged
+		}
+	}
+	option = {
+		name = RG_graygoo.502.h.a
+	}
+	option = {
+		name = RG_graygoo.502.h.b
+		hidden_effect = {
+			rg_clear_harbitat = yes
+			country_event = {
+				id = rg_grayleader_dialog.5027
+			}
+		}
+	}
+	option = {
+		name = graygoo.500.d
+		tag = hire_leader
+		default_hide_option = yes
+	}
+	option = {
+		name = graygoo.500.prepage
+		tag = dismiss_leader
+		hidden_effect = {
+			country_event = {
+				id = rg_grayleader.1
+			}
+		}
+	}
+}
+
 country_event = {
 	id = rg_grayleader_dialog.5031
 	title = "graygoo.500.title"
--- a/events/RG_gray_leader_event.txt
+++ b/events/RG_gray_leader_event.txt
@@ -309,6 +309,49 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			country_event = {
+				id = rg_grayleader_dialog.5028
+			}
+		}
+	}
 	option = {
 		# help
 		name = rg_help
@@ -453,6 +496,41 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_juggernaut_habitat_init = yes
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			country_event = {
+				id = rg_grayleader_dialog.5028
+			}
+		}
+	}
 	option = {
 		# help
 		name = rg_help
@@ -707,6 +785,49 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			country_event = {
+				id = rg_grayleader_dialog.5028
+			}
+		}
+	}
 	option = {
 		#升级-2
 		name = rg_levelup_2
@@ -1070,6 +1191,51 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			country_event = {
+				id = rg_grayleader_dialog.5028
+			}
+		}
+	}
 	option = {
 		# 开启隐形
 		name = rg_event.4.e
@@ -1156,28 +1322,28 @@ country_event = {
 	option = {
 		name = OK
 	}
-	option = {
-		name = rg_graygoo.504.a
-		allow = {
-			has_country_flag = gray_reforming
-			resource_stockpile_compare = {
-				resource = nanites
-				value >= 1000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 50000
-			}
-		}
-		add_resource = {
-			nanites = -1000
-			alloys = -50000
-		}
-		remove_modifier = "gray_scattered"
-		country_event = {
-			id = graygoo.512
-		}
-	}
+	# option = {
+	# 	name = rg_graygoo.504.a
+	# 	allow = {
+	# 		has_country_flag = gray_reforming
+	# 		resource_stockpile_compare = {
+	# 			resource = nanites
+	# 			value >= 1000
+	# 		}
+	# 		resource_stockpile_compare = {
+	# 			resource = alloys
+	# 			value >= 50000
+	# 		}
+	# 	}
+	# 	add_resource = {
+	# 		nanites = -1000
+	# 		alloys = -50000
+	# 	}
+	# 	remove_modifier = "gray_scattered"
+	# 	country_event = {
+	# 		id = graygoo.512
+	# 	}
+	# }
 }

 # Main Menu (const)
@@ -1335,6 +1501,49 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			country_event = {
+				id = rg_grayleader_dialog.5028
+			}
+		}
+	}
 	#	option = { # 开启建造中继器
 	#		name = rg_event.5.e
 	#		trigger = {
@@ -1486,6 +1695,32 @@ country_event = {
 			rg_create_gray_colony_1 = yes
 		}
 	}
+	option = {
+		# 购买巨像
+		name = rg_event.4.h
+		trigger = {
+			NOT = {
+				has_country_flag = gray_reforming
+			}
+		}
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 8000
+			}
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 8000
+			}
+		}
+		add_resource = {
+			energy = -8000
+			alloys = -8000
+		}
+		hidden_effect = {
+			rg_create_gray_planetkiller_testship_1 = yes
+		}
+	}
 	option = {
 		# 没钱了，救救
 		name = rg_event.4.c
--- a/events/RG_machine_event.txt
+++ b/events/RG_machine_event.txt
@@ -7,7 +7,7 @@ country_event = {
 		if = {
 			limit = {
 				NOT = {
-					exist = event_target:rg_maid_species
+					exists = event_target:rg_maid_species
 				}
 			}
 			create_species = {
@@ -35,4 +35,60 @@ country_event = {
 			}
 		}
 	}
-}
+}
+
+# country_event = {
+# 	id = rg_maid.2
+# 	hide_window = yes
+# 	is_triggered_only = yes
+# 	immediate = {
+# 		every_playable_country = {
+# 			limit = {
+# 				any_owned_species = {
+# 					has_trait = rg_machine_maid_trait
+# 				}
+# 			}
+# 			triggered_planet_modifier = {
+# 				potential = {
+# 					can_assemble_budding_pop = yes
+# 				}
+# 				planet_pop_assembly_organic_add = @plantoid_budding_rate
+# 				mult = value:budding_multiplier
+# 			}
+# 		}
+# 		capital_scope = {
+# 			while = {
+# 				count = 5
+# 				create_pop = {
+# 					species = event_target:rg_maid_species
+# 				}
+# 			}
+# 		}
+# 	}
+# }
+
+# planet_event = { #Braiiiins
+# 	id = rg_maid.3
+# 	is_triggered_only = yes
+# 	hide_window = yes
+# 
+# 	trigger = {
+# 		fromfrom = { 
+# 			is_organic_species = yes
+# 			NOT = { has_trait = trait_zombie }
+# 		}
+# 		owner = { has_valid_civic = civic_permanent_employment }
+# 		has_building = building_posthumous_employment_center
+# 	}
+# 
+# 	immediate = {
+# 		fromfrom = {
+# 			make_pop_zombie = yes
+# 		}
+# 	}
+# 	after = {
+# 		fromfrom = {
+# 			clear_pop_category = yes #To make sure that the zombie pop does not spawn as a non worker strata
+# 		}
+# 	}
+# }
--- a/events/RG_origin_event.txt
+++ b/events/RG_origin_event.txt
@@ -37,7 +37,7 @@ country_event = {
 		if = {
 			limit = {
 				NOT = {
-					exist = event_target:rg_scion_fe
+					exists = event_target:rg_scion_fe
 				}
 			}
 			set_country_flag = rg_scion_needs_fe
@@ -100,7 +100,7 @@ country_event = {
 					overlord = {
 						add_opinion_modifier = {
 							modifier = opinion_scion
-							who = rg_scion_fe
+							who = event_target:rg_scion_fe
 						}
 					}
 					country_event = { id = rg_origin.10 days = 3 }
--- a/events/RG_planet_event.txt
+++ b/events/RG_planet_event.txt
@@ -0,0 +1,179 @@
+namespace = rg_planet
+
+##### Virtual Ascension Events
+
+### Create the Unemployed
+### Country scope gatekeeper
+### on_monthly_pulse_country
+country_event = {
+	id = rg_planet.5025
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+		has_country_flag = rg_habitat_enabled
+		exists = event_target:rg_gray_habitat_target
+		event_target:rg_gray_habitat_target = {
+			is_under_colonization = no
+			NOT = { is_planet_class = pc_cosmogenesis_world }
+			free_jobs > 0
+			NOR = {
+				free_jobs_of_type = {
+					job = mortal_initiate
+					value >= 1
+				}
+				free_jobs_of_type = {
+					category = bio_trophy
+					value >= 1
+				}
+				free_jobs_of_type = {
+					job = servant
+					value >= 1
+				}
+			}
+		}
+	}
+
+	immediate = {
+		event_target:rg_gray_habitat_target = {
+			planet_event = { id = rg_planet.2027 days = 1 }
+		}
+	}
+}
+
+### Create the Unemployed
+### Planet scope gatekeeper
+### on_building_complete, on_building_upgraded, on_building_demolished,
+### on_building_downgraded, on_building_replaced
+### on_district_complete, on_district_demolished
+planet_event = {
+	id = rg_planet.2026
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+		is_same_value = event_target:rg_gray_habitat_target
+		is_under_colonization = no
+		NOT = { is_planet_class = pc_cosmogenesis_world }
+		exists = owner
+		owner = {
+			has_country_flag = rg_habitat_enabled
+		}
+		free_jobs > 0
+	}
+
+	immediate = {
+		planet_event = { id = rg_planet.2027 days = 1 }
+	}
+}
+
+### Create the Unemployed
+### Fired by cybernetics.2025 and cybernetics.2026
+planet_event = {
+	id = rg_planet.2027
+	hide_window = yes
+
+	is_triggered_only = yes
+	trigger = {
+		is_same_value = event_target:rg_gray_habitat_target
+		is_under_colonization = no
+		NOT = { is_planet_class = pc_cosmogenesis_world }
+		exists = owner
+		owner = {
+			has_country_flag = rg_habitat_enabled
+		}
+		free_jobs > 0
+	}
+
+	immediate = {
+		set_variable = {
+			which = num_pops
+			value = value:num_free_virtual_jobs
+		}
+		# Create pops for every free job
+		while = {
+			count = num_pops
+			create_pop = {
+				species = event_target:rg_owner_main_maid_species
+			}
+		}
+
+		# Kill pops generated in excess (e.g. from forbidden jobs)
+		if = {
+			limit = {
+				any_owned_pop = {
+					is_unemployed = yes
+				}
+			}
+			every_owned_pop = {
+				limit = {
+					is_unemployed = yes
+				}
+				kill_pop = yes
+			}
+		}
+	}
+}
+
+### Kill the unemployed
+### Country scope
+### on_monthly_pulse_country
+country_event = {
+	id = rg_planet.5030
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+		has_country_flag = rg_habitat_enabled
+		event_target:rg_gray_habitat_target = {
+			any_owned_pop = {
+				is_unemployed = yes
+			}
+		}
+	}
+
+	immediate = {
+		event_target:rg_gray_habitat_target = {
+			every_owned_pop = {
+				limit = {
+					is_unemployed = yes
+				}
+				kill_pop = yes
+			}
+		}
+	}
+}
+
+### Kill the unemployed
+### Planet scope
+### on_building_complete, on_building_upgraded, on_building_demolished,
+### on_building_downgraded, on_building_replaced
+### on_district_complete, on_district_demolished
+planet_event = {
+	id = rg_planet.2031
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+		exists = owner
+		owner = {
+			has_country_flag = rg_habitat_enabled
+		}
+		any_owned_pop = {
+			is_unemployed = yes
+		}
+	}
+
+	immediate = {
+		every_owned_pop = {
+			limit = {
+				is_unemployed = yes
+			}
+			kill_pop = yes
+		}
+	}
+}
--- a/events/RG_storms_event.txt
+++ b/events/RG_storms_event.txt
@@ -0,0 +1,20 @@
+namespace = rg_storms
+system_event = {
+	id = rg_storms.1
+	hide_window = yes
+	is_triggered_only = yes
+
+	trigger = {
+		NOT = {
+			has_star_flag = storm_system
+		}
+	}
+
+	immediate = {
+		create_cosmic_storm = {
+			type = graytempest_storm
+			immediate = yes
+			cosmic_storm_start_position = this
+		}
+	}
+}
--- a/events/RG_story_event.txt
+++ b/events/RG_story_event.txt
@@ -162,9 +162,11 @@ planet_event = {
 	id = rg_story.6
 	title = "rg_story.6.title"
 	is_triggered_only = yes
-	fire_only_once = yes
 	trigger = {
 		NOT = {
+			any_country = {
+				has_country_flag = rg_story6_fired
+			}
 			# has_global_flag = has_wsg_mod
 		}
 	}
@@ -178,6 +180,10 @@ planet_event = {
 						has_ship_flag = rg_test_ship
 					}
 				}
+				prev = {
+					save_event_target_as = event_target_country
+					set_country_flag = rg_story6_fired
+				}
 				delete_fleet = this
 			}
 		}
@@ -188,8 +194,10 @@ planet_event = {
 	option = {
 		name = rg_story.6.a
 		hidden_effect = {
-			country_event = {
-				id = rg_story.7
+			event_target:event_target_country = {
+				country_event = {
+					id = rg_story.7
+				}
 			}
 		}
 		default_hide_option = yes
@@ -635,7 +643,6 @@ country_event = {
 	id = rg_story.20
 	hide_window = yes
 	is_triggered_only = yes
-	fire_only_once = yes
 	trigger = {
 		exists = event_target:rg_fake_dragon_owner
 		OR = {
@@ -648,9 +655,12 @@ country_event = {
 			event_target:rg_fake_dragon_fleet = {
 				leader = {
 					OR = {
-						exists = NO
 						NOT = {
+							exists = leader
+						}
+						NOR = {
 							has_leader_flag = rg_fake_dragon
+							has_leader_flag = rg_fake_dragon_reborn
 						}
 					}
 				}
@@ -701,7 +711,7 @@ country_event = {
 # 龙噶了把所有卡住的的模拟龙扫描事件中止
 country_event = {
 	id = rg_story.22
-	hidden_window = yes
+	hide_window = yes
 	is_triggered_only = yes
 	trigger = {
 		from = {
@@ -1026,8 +1036,7 @@ country_event = {
 			}
 		}
 		add_resource = {
-			resource = nanites
-			value = -150
+			nanites = -150
 		}
 		random_situation = {
 			limit = {
@@ -1120,12 +1129,10 @@ country_event = {
 			}
 		}
 		add_resource = {
-			resource = alloys
-			value = -1500
+			alloys = -1500
 		}
 		add_resource = {
-			resource = energy
-			value = -1500
+			energy = -1500
 		}
 		rg_create_gray_mod1_testship_2 = yes
 		random_situation = {
@@ -1169,12 +1176,10 @@ country_event = {
 			}
 		}
 		add_resource = {
-			resource = alloys
-			value = -1500
+			alloys = -1500
 		}
 		add_resource = {
-			resource = energy
-			value = -1500
+			energy = -1500
 		}
 		rg_create_gray_mod1_testship_2 = yes
 		random_situation = {
@@ -1218,12 +1223,10 @@ country_event = {
 			}
 		}
 		add_resource = {
-			resource = energy
-			value = -4000
+			alloys = -1500
 		}
 		add_resource = {
-			resource = minerals
-			value = -1500
+			energy = -1500
 		}
 		random_situation = {
 			limit = {
@@ -1262,8 +1265,7 @@ country_event = {
 			}
 		}
 		add_resource = {
-			resource = consumer_goods
-			value = -3000
+			consumer_goods = -3000
 		}
 		random_situation = {
 			limit = {
@@ -1306,12 +1308,10 @@ country_event = {
 			}
 		}
 		add_resource = {
-			resource = alloys
-			value = -1500
+			alloys = -1500
 		}
 		add_resource = {
-			resource = energy
-			value = -1500
+			energy = -1500
 		}
 		rg_create_gray_mod1_testship_2 = yes
 		random_situation = {
@@ -1351,8 +1351,7 @@ country_event = {
 			}
 		}
 		add_resource = {
-			resource = alloys
-			value = -3000
+			alloys = -3000
 		}
 		random_situation = {
 			limit = {
@@ -1391,8 +1390,7 @@ country_event = {
 			}
 		}
 		add_resource = {
-			resource = alloys
-			value = -500
+			alloys = -500
 		}
 		random_situation = {
 			limit = {
--- a/events/RG_wsg_graygoo_event.txt
+++ b/events/RG_wsg_graygoo_event.txt
@@ -138,6 +138,44 @@ country_event = {
 			rg_create_gray_const = yes
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+		}
+	}
 	option = {
 		# help
 		name = rg_help
@@ -348,6 +386,44 @@ country_event = {
 			rg_create_gray_army = yes
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+		}
+	}
 	option = {
 		# help
 		name = rg_help
@@ -669,6 +745,44 @@ country_event = {
 			remove_country_flag = gray_warship_is_juggernaut
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+		}
+	}
 	option = {
 		#升级-2
 		name = rg_levelup_2
@@ -1064,6 +1178,44 @@ country_event = {
 			rg_create_gray_const = yes
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+		}
+	}
 	option = {
 		# 开启隐形
 		name = rg_graygoo.4.e
@@ -1225,28 +1377,28 @@ country_event = {
 			}
 		}
 	}
-	option = {
-		name = rg_graygoo.504.a
-		allow = {
-			has_country_flag = gray_reforming
-			resource_stockpile_compare = {
-				resource = nanites
-				value >= 1000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 50000
-			}
-		}
-		add_resource = {
-			nanites = -1000
-			alloys = -50000
-		}
-		remove_modifier = "gray_scattered"
-		country_event = {
-			id = graygoo.512
-		}
-	}
+	# option = {
+	# 	name = rg_graygoo.504.a
+	# 	allow = {
+	# 		has_country_flag = gray_reforming
+	# 		resource_stockpile_compare = {
+	# 			resource = nanites
+	# 			value >= 1000
+	# 		}
+	# 		resource_stockpile_compare = {
+	# 			resource = alloys
+	# 			value >= 50000
+	# 		}
+	# 	}
+	# 	add_resource = {
+	# 		nanites = -1000
+	# 		alloys = -50000
+	# 	}
+	# 	remove_modifier = "gray_scattered"
+	# 	country_event = {
+	# 		id = graygoo.512
+	# 	}
+	# }
 }

 # Main Menu (const)
@@ -1416,6 +1568,44 @@ country_event = {
 			rg_create_gray_army = yes
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+		}
+	}
 	option = {
 		name = marry_gray
 		trigger = {
@@ -1582,6 +1772,32 @@ country_event = {
 			rg_create_gray_colony_1 = yes
 		}
 	}
+	option = {
+		# 购买巨像
+		name = rg_event.4.h
+		trigger = {
+			NOT = {
+				has_country_flag = gray_reforming
+			}
+		}
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 8000
+			}
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 8000
+			}
+		}
+		add_resource = {
+			energy = -8000
+			alloys = -8000
+		}
+		hidden_effect = {
+			rg_create_gray_planetkiller_testship_1 = yes
+		}
+	}
 	option = {
 		# 没钱了，救救
 		name = rg_event.4.c
--- a/gfx/interface/icons/districts/district_rg_nanites.dds
+++ b/gfx/interface/icons/districts/district_rg_nanites.dds
--- a/gfx/interface/icons/planet_backgrounds/pc_rg_grayhabitat.dds
+++ b/gfx/interface/icons/planet_backgrounds/pc_rg_grayhabitat.dds
--- a/gfx/map/storms/graytempest_storm_color.dds
+++ b/gfx/map/storms/graytempest_storm_color.dds
--- a/gfx/portraits/environments/pc_rg_grayhabitat_sky.dds
+++ b/gfx/portraits/environments/pc_rg_grayhabitat_sky.dds
--- a/localisation/simp_chinese/RG_event_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_event_l_simp_chinese.yml
@@ -109,6 +109,7 @@
 rg_event.4.b:0 "§H建造武装工程舰§!" 
 rg_event.4.d:0 "§R建造纳米主宰舰§!"
 rg_event.4.g:0 "§H建造模拟殖民舰§!" 
+ rg_event.4.h:0 "§H建造实验级巨像§!" 
 rg_event.4.e:0 "§B开启隐形力场§!" 
 rg_event.4.f:0 "§B关闭隐形力场§!" 
 rg_event.4.c:0 "又没钱了，老婆救救"
@@ -175,6 +176,14 @@
 RG_graygoo.500.e:0 "§Y启动旗舰核心§!"
 RG_graygoo.502.e.response:0 "我能做到。"

+ RG_graygoo.500.f:0 "§Y启动空间站核心§!"
+ RG_graygoo.502.f.response:0 "舰体宜居性评估中，全舰核心自检完成。"
+ RG_graygoo.500.g:0 "§Y关闭空间站核心§!"
+ RG_graygoo.502.g.response:0 "启动紧急疏散程序，请稍安勿躁。"
+ RG_graygoo.502.h.response:0 "§R关闭空间站核心将摧毁所有建筑和人口，你确定吗？§!\n\n§R关闭空间站核心将摧毁所有建筑和人口，你确定吗？§!\n\n§R关闭空间站核心将摧毁所有建筑和人口，你确定吗？§!"
+ RG_graygoo.502.h.a:0 "我点错了"
+ RG_graygoo.502.h.b:0 "§R关闭空间站§!"
+
 # 2.1 奇怪的巨像
 rg_story.2.desc:0 "哈喽？有空吗？可以来...咳咳、我有一个有趣的东西想给你看......如果没有空也没有关系。不过我保证这个一定很好玩。"
 rg_story.2.a:0 "§G有哦§!"
--- a/localisation/simp_chinese/RG_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_l_simp_chinese.yml
@@ -31,6 +31,72 @@
 preset_rg_scion: "§Y誓约计划国§!"
 preset_rg_scion_desc: "出于某种不可告人的目的，远古堕落帝国将其视若己出。他们的远古宗主不会允许其誓约国受到任何外部干扰。"

+ civic_rg_gray_cluster: "§Y遥远约定-星团开局§!"
+ civic_rg_gray_non_cluster: "§Y遥远约定-银河开局§!"
+ civic_tooltip_rg_gray_cluster: "选择在§YL-星团§!中开启你的冒险。本mod标准的开局选项。"
+ civic_tooltip_rg_gray_non_cluster: "选择在§Y银河系§!中开启你的冒险。适合不希望在L-星团中开局的玩家。"
+
+ rg_tempest_invocator: "灰蛊核心"
+ 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_mining: "采矿区段"
+ district_rg_mining_plural: "采矿区段"
+ district_rg_mining_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_desc: "这个区段充满了城市中心，这些城市中心提供大量的住房和职员的办公场所。"
+ district_rg_hive: "蜂巢区段"
+ district_rg_hive_plural: "蜂巢区段"
+ district_rg_hive_desc: "高耸的尖塔布满这个区段，当子个体不在工作时，就会集结于此摄取营养素。"
+ district_rg_nexus: "中枢区段"
+ district_rg_nexus_plural: "中枢区段"
+ district_rg_nexus_desc: "高效的区划填满了这个区段，无人机部署作业前，在这些集中区划中接受整修服务。"
+ district_rg_industrial: "工业区段"
+ district_rg_industrial_plural: "工业区段"
+ district_rg_industrial_desc: "这个区段中遍布着叮当作响的工厂与强劲的机械，为帝国提供了有力的工业基础。"
+
+ rg_machine_maid_trait_effect_tooltip: "每个在线的人口产生0.1£nanites£$nanites$§Y维护费§!。\n在灰风国家工作时:$TABBED_NEW_LINE$$mod_planet_jobs_produces_mult$：§G+10%§!"
+
+ graytempest_storm: "灰蛊风暴"
+ graytempest_storm_desc: "一群从L-星团中喷涌而出纳米机器对于整个星系的生命体都是威胁。它们数量巨大但尚未完全成型，形成严重的风暴席卷星系。由于纳米机器的自复制特性这种风暴能持续数十年之久。"
+ graytempest_storm_color_tooltip: "§Y$graytempest_storm$§!"
+ graytempest_storm_lore_description: "§L一场极强的$graytempest_storm$将威胁该星系，对行星造成破坏。为了生命安全务必寻找庇护！§!"
+ graytempest_storm_fleet_tt: "—$MOD_SHIP_HULL_REGEN_ADD_PERC$、$MOD_SHIP_ARMOR_REGEN_ADD_PERC$对舰船和空间站§R禁用§!。\n—拥有$@storm_hp_perc_limit|0Y%$$HITPOINTS$的舰船和空间站每月遭受§R$@storm_monthly_dmg_low|0$§!伤害。\n—$@storm_hp_perc_limit|0Y%$$HITPOINTS$以下的舰船产出§G+$@particle_storm_unity_per_ship|0$§!£unity£$unity$。"
+ graytempest_storm_aftermath_modifier: "灰色浪潮"
+ graytempest_storm_aftermath_modifier_tooltip: "$STORM_AFTERMATH_DESC$\n$t$—§H$graytempest_storm_aftermath_modifier$§!:\n$tt$—§R-100%§!~§R-?%§!$MOD_PLANET_BUILDING_BUILD_SPEED_MULT$\n$tt$—§R-5§!~§R-?§!$PLANET_STABILITY_TITLE$\n"
+ graytempest_storm_aftermath_modifier_severity_desc: "$graytempest_storm$席卷一切挡路之物，祂们喜怒无常随意破坏，这会造成严重的损伤。然而，当尘埃落定后我们可以回收一部分纳米机器。"
+ graytempest_storm_aftermath_modifier_severity_1: "余波：$graytempest_storm_aftermath_modifier$"
+ graytempest_storm_aftermath_modifier_severity_1_desc: "$graytempest_storm_aftermath_modifier_severity_desc$"
+ graytempest_storm_aftermath_modifier_severity_2: "余波：§H严重§!$graytempest_storm_aftermath_modifier$"
+ graytempest_storm_aftermath_modifier_severity_2_desc: "$graytempest_storm_aftermath_modifier_severity_desc$"
+ graytempest_storm_aftermath_modifier_severity_3: "余波：§R严重§!$graytempest_storm_aftermath_modifier$"
+ graytempest_storm_aftermath_modifier_severity_3_desc: "$graytempest_storm_aftermath_modifier_severity_desc$"
+
+ MESSAGE_TEMPEST_STORM_AFTERMATH_TITLE: "$graytempest_storm$余波"
+ tempest_storm_aftermath_custom_desc: "§Y$graytempest_storm$§!在整颗星球上留下了遍地的纳米机器，它们暂时进入了休眠状态。"
+
+ d_rg_tempest_storm_1: "纳米沙丘"
+ d_rg_tempest_storm_1_desc: "一场毁灭性的纳米机器风暴席卷了这个世界。在它的余威中留下了一个孤独的灰色沙丘。"
+
+ d_rg_tempest_storm_2: "纳米沙海"
+ d_rg_tempest_storm_2_desc: "一场毁灭性的纳米机器风暴席卷了这个世界。在它的余威中留下了一片涌动的灰色沙海。"
+
+ d_rg_tempest_storm_3: "纳米浪潮"
+ d_rg_tempest_storm_3_desc: "一场毁灭性的纳米机器风暴席卷了这个世界。这个世界仍然在纳米机器的席卷中沸腾哀号。"
+
 rg_nanite_leader:0"§Y纳米机器个体§!"
 rg_nanite_leader_plural:0"§Y纳米机器个体§!"
 rg_nanite_leader_description:0"§Y本质上是由千千万万纳米机械所组成的个体。因为能做到，所以将无所不能。§!"
@@ -121,6 +187,15 @@
 RG_Interdictor_ANTIMATTER_REACTOR_DESC:0 "$ANTIMATTER_REACTOR_DESC$"
 RG_Interdictor_ZERO_POINT_REACTOR:0 "$ZERO_POINT_REACTOR$"
 RG_Interdictor_ZERO_POINT_REACTOR_DESC:0 "$ZERO_POINT_REACTOR_DESC$"
+
+ RG_Mothership_FISSION_REACTOR:0 "$FISSION_REACTOR$"
+ RG_Mothership_FISSION_REACTOR_DESC:0 "$FISSION_REACTOR_DESC$"
+ RG_Mothership_FUSION_REACTOR:0 "$FUSION_REACTOR$"
+ RG_Mothership_FUSION_REACTOR_DESC:0 "$FUSION_REACTOR_DESC$"
+ RG_Mothership_COLD_FUSION_REACTOR:0 "$COLD_FUSION_REACTOR$"
+ RG_Mothership_COLD_FUSION_DESC:0 "$COLD_FUSION_DESC$"
+ RG_Mothership_ANTIMATTER_REACTOR:0 "$ANTIMATTER_REACTOR$"
+ RG_Mothership_ANTIMATTER_REACTOR_DESC:0 "$ANTIMATTER_REACTOR_DESC$"
 RG_Mothership_ZERO_POINT_REACTOR:0 "$ZERO_POINT_REACTOR$"
 RG_Mothership_ZERO_POINT_REACTOR_DESC:0 "$ZERO_POINT_REACTOR_DESC$"

@@ -172,6 +247,83 @@
 RG_SCIENCE_CLOAKING_1_DESC:0 "$CLOAKING_1_DESC$"
 RG_SCIENCE_CLOAKING_EMPTY:0 "空槽"

+ RG_COMBAT_COMPUTER_SWARM_DEFAULT:0 "$COMBAT_COMPUTER_SWARM_DEFAULT$"
+ RG_COMBAT_COMPUTER_SWARM_DEFAULT_DESC:0 "$COMBAT_COMPUTER_SWARM_DEFAULT_DESC$"
+ RG_COMBAT_COMPUTER_PICKET_DEFAULT:0 "$COMBAT_COMPUTER_PICKET_DEFAULT$"
+ RG_COMBAT_COMPUTER_PICKET_DEFAULT_DESC:0 "$COMBAT_COMPUTER_PICKET_DEFAULT_DESC$"
+ RG_COMBAT_COMPUTER_LINE_DEFAULT:0 "$COMBAT_COMPUTER_LINE_DEFAULT$"
+ RG_COMBAT_COMPUTER_LINE_DEFAULT_DESC:0 "$COMBAT_COMPUTER_LINE_DEFAULT_DESC$"
+ RG_COMBAT_COMPUTER_ARTILLERY_DEFAULT:0 "$COMBAT_COMPUTER_ARTILLERY_DEFAULT$"
+ RG_COMBAT_COMPUTER_ARTILLERY_DEFAULT_DESC:0 "$COMBAT_COMPUTER_ARTILLERY_DEFAULT_DESC$"
+ RG_COMBAT_COMPUTER_TORPEDO_DEFAULT:0 "$COMBAT_COMPUTER_TORPEDO_DEFAULT$"
+ RG_COMBAT_COMPUTER_TORPEDO_DEFAULT_DESC:0 "$COMBAT_COMPUTER_TORPEDO_DEFAULT_DESC$"
+
+ RG_COMBAT_COMPUTER_SWARM_BASIC:0 "$COMBAT_COMPUTER_SWARM_BASIC$"
+ RG_COMBAT_COMPUTER_SWARM_BASIC_DESC:0 "$COMBAT_COMPUTER_SWARM_BASIC_DESC$"
+ RG_COMBAT_COMPUTER_SWARM_ADVANCED:0 "$COMBAT_COMPUTER_SWARM_ADVANCED$"
+ RG_COMBAT_COMPUTER_SWARM_ADVANCED_DESC:0 "$COMBAT_COMPUTER_SWARM_ADVANCED_DESC$"
+ RG_COMBAT_COMPUTER_SWARM_SAPIENT:0 "$COMBAT_COMPUTER_SWARM_SAPIENT$"
+ RG_COMBAT_COMPUTER_SWARM_SAPIENT_DESC:0 "$COMBAT_COMPUTER_SWARM_SAPIENT_DESC$"
+ RG_COMBAT_COMPUTER_SWARM_AUTONOMOUS:0 "$COMBAT_COMPUTER_SWARM_AUTONOMOUS$"
+ RG_COMBAT_COMPUTER_SWARM_AUTONOMOUS_DESC:0 "$COMBAT_COMPUTER_SWARM_AUTONOMOUS_DESC$"
+ RG_COMBAT_COMPUTER_SWARM_PRECOG:0 "$COMBAT_COMPUTER_SWARM_PRECOG$"
+ RG_COMBAT_COMPUTER_SWARM_PRECOG_DESC:0 "$COMBAT_COMPUTER_SWARM_PRECOG_DESC$"
+
+ RG_COMBAT_COMPUTER_TORPEDO_BASIC:0 "$COMBAT_COMPUTER_TORPEDO_BASIC$"
+ RG_COMBAT_COMPUTER_TORPEDO_BASIC_DESC:0 "$COMBAT_COMPUTER_TORPEDO_BASIC_DESC$"
+ RG_COMBAT_COMPUTER_TORPEDO_ADVANCED:0 "$COMBAT_COMPUTER_TORPEDO_ADVANCED$"
+ RG_COMBAT_COMPUTER_TORPEDO_ADVANCED_DESC:0 "$COMBAT_COMPUTER_TORPEDO_ADVANCED_DESC$"
+ RG_COMBAT_COMPUTER_TORPEDO_SAPIENT:0 "$COMBAT_COMPUTER_TORPEDO_SAPIENT$"
+ RG_COMBAT_COMPUTER_TORPEDO_SAPIENT_DESC:0 "$COMBAT_COMPUTER_TORPEDO_SAPIENT_DESC$"
+ RG_COMBAT_COMPUTER_TORPEDO_AUTONOMOUS:0 "$COMBAT_COMPUTER_TORPEDO_AUTONOMOUS$"
+ RG_COMBAT_COMPUTER_TORPEDO_AUTONOMOUS_DESC:0 "$COMBAT_COMPUTER_TORPEDO_AUTONOMOUS_DESC$"
+ RG_COMBAT_COMPUTER_TORPEDO_PRECOG:0 "$COMBAT_COMPUTER_TORPEDO_PRECOG$"
+ RG_COMBAT_COMPUTER_TORPEDO_PRECOG_DESC:0 "$COMBAT_COMPUTER_TORPEDO_PRECOG_DESC$"
+
+ RG_COMBAT_COMPUTER_PICKET_BASIC:0 "$COMBAT_COMPUTER_PICKET_BASIC$"
+ RG_COMBAT_COMPUTER_PICKET_BASIC_DESC:0 "$COMBAT_COMPUTER_PICKET_BASIC_DESC$"
+ RG_COMBAT_COMPUTER_PICKET_ADVANCED:0 "$COMBAT_COMPUTER_PICKET_ADVANCED$"
+ RG_COMBAT_COMPUTER_PICKET_ADVANCED_DESC:0 "$COMBAT_COMPUTER_PICKET_ADVANCED_DESC$"
+ RG_COMBAT_COMPUTER_PICKET_SAPIENT:0 "$COMBAT_COMPUTER_PICKET_SAPIENT$"
+ RG_COMBAT_COMPUTER_PICKET_SAPIENT_DESC:0 "$COMBAT_COMPUTER_PICKET_SAPIENT_DESC$"
+ RG_COMBAT_COMPUTER_PICKET_AUTONOMOUS:0 "$COMBAT_COMPUTER_PICKET_AUTONOMOUS$"
+ RG_COMBAT_COMPUTER_PICKET_AUTONOMOUS_DESC:0 "$COMBAT_COMPUTER_PICKET_AUTONOMOUS_DESC$"
+ RG_COMBAT_COMPUTER_PICKET_PRECOG:0 "$COMBAT_COMPUTER_PICKET_PRECOG$"
+ RG_COMBAT_COMPUTER_PICKET_PRECOG_DESC:0 "$COMBAT_COMPUTER_PICKET_PRECOG_DESC$"
+
+ RG_COMBAT_COMPUTER_ARTILLERY_BASIC:0 "$COMBAT_COMPUTER_ARTILLERY_BASIC$"
+ RG_COMBAT_COMPUTER_ARTILLERY_BASIC_DESC:0 "$COMBAT_COMPUTER_ARTILLERY_BASIC_DESC$"
+ RG_COMBAT_COMPUTER_ARTILLERY_ADVANCED:0 "$COMBAT_COMPUTER_ARTILLERY_ADVANCED$"
+ RG_COMBAT_COMPUTER_ARTILLERY_ADVANCED_DESC:0 "$COMBAT_COMPUTER_ARTILLERY_ADVANCED_DESC$"
+ RG_COMBAT_COMPUTER_ARTILLERY_SAPIENT:0 "$COMBAT_COMPUTER_ARTILLERY_SAPIENT$"
+ RG_COMBAT_COMPUTER_ARTILLERY_SAPIENT_DESC:0 "$COMBAT_COMPUTER_ARTILLERY_SAPIENT_DESC$"
+ RG_COMBAT_COMPUTER_ARTILLERY_AUTONOMOUS:0 "$COMBAT_COMPUTER_ARTILLERY_AUTONOMOUS$"
+ RG_COMBAT_COMPUTER_ARTILLERY_AUTONOMOUS_DESC:0 "$COMBAT_COMPUTER_ARTILLERY_AUTONOMOUS_DESC$"
+ RG_COMBAT_COMPUTER_ARTILLERY_PRECOG:0 "$COMBAT_COMPUTER_ARTILLERY_PRECOG$"
+ RG_COMBAT_COMPUTER_ARTILLERY_PRECOG_DESC:0 "$COMBAT_COMPUTER_ARTILLERY_PRECOG_DESC$"
+
+ RG_COMBAT_COMPUTER_LINE_BASIC:0 "$COMBAT_COMPUTER_LINE_BASIC$"
+ RG_COMBAT_COMPUTER_LINE_BASIC_DESC:0 "$COMBAT_COMPUTER_LINE_BASIC_DESC$"
+ RG_COMBAT_COMPUTER_LINE_ADVANCED:0 "$COMBAT_COMPUTER_LINE_ADVANCED$"
+ RG_COMBAT_COMPUTER_LINE_ADVANCED_DESC:0 "$COMBAT_COMPUTER_LINE_ADVANCED_DESC$"
+ RG_COMBAT_COMPUTER_LINE_SAPIENT:0 "$COMBAT_COMPUTER_LINE_SAPIENT$"
+ RG_COMBAT_COMPUTER_LINE_SAPIENT_DESC:0 "$COMBAT_COMPUTER_LINE_SAPIENT_DESC$"
+ RG_COMBAT_COMPUTER_LINE_AUTONOMOUS:0 "$COMBAT_COMPUTER_LINE_AUTONOMOUS$"
+ RG_COMBAT_COMPUTER_LINE_AUTONOMOUS_DESC:0 "$COMBAT_COMPUTER_LINE_AUTONOMOUS_DESC$"
+ RG_COMBAT_COMPUTER_LINE_PRECOG:0 "$COMBAT_COMPUTER_LINE_PRECOG$"
+ RG_COMBAT_COMPUTER_LINE_PRECOG_DESC:0 "$COMBAT_COMPUTER_LINE_PRECOG_DESC$"
+
+ RG_COMBAT_COMPUTER_CARRIER_BASIC:0 "$COMBAT_COMPUTER_CARRIER_BASIC$"
+ RG_COMBAT_COMPUTER_CARRIER_BASIC_DESC:0 "$COMBAT_COMPUTER_CARRIER_BASIC_DESC$"
+ RG_COMBAT_COMPUTER_CARRIER_ADVANCED:0 "$COMBAT_COMPUTER_CARRIER_ADVANCED$"
+ RG_COMBAT_COMPUTER_CARRIER_ADVANCED_DESC:0 "$COMBAT_COMPUTER_CARRIER_ADVANCED_DESC$"
+ RG_COMBAT_COMPUTER_CARRIER_SAPIENT:0 "$COMBAT_COMPUTER_CARRIER_SAPIENT$"
+ RG_COMBAT_COMPUTER_CARRIER_SAPIENT_DESC:0 "$COMBAT_COMPUTER_CARRIER_SAPIENT_DESC$"
+ RG_COMBAT_COMPUTER_CARRIER_AUTONOMOUS:0 "$COMBAT_COMPUTER_CARRIER_AUTONOMOUS$"
+ RG_COMBAT_COMPUTER_CARRIER_AUTONOMOUS_DESC:0 "$COMBAT_COMPUTER_CARRIER_AUTONOMOUS_DESC$"
+ RG_COMBAT_COMPUTER_CARRIER_PRECOG:0 "$COMBAT_COMPUTER_CARRIER_PRECOG$"
+ RG_COMBAT_COMPUTER_CARRIER_PRECOG_DESC:0 "$COMBAT_COMPUTER_CARRIER_PRECOG_DESC$"
+
 RG_ID_wsg_alpha_REACTOR:0 "§Y阿尔法结晶反应堆§!"
 RG_ID_SHIP_THRUSTER_WSG:0 "§Y暗物质α推进器§!"
 RG_ID_SHIP_THRUSTER_WSG_DESC:0 "利用暗物质与阿尔法融合后产生的巨大能量来推动我们的飞船。"
@@ -314,6 +466,9 @@
 rg_nothing:0 ""
 rg_nothing_desc:0 ""

+ pc_rg_grayhabitat: "纳米空间站点"
+ pc_rg_grayhabitat_desc: "一座由纳米机械组成的深空居所，能提供仿佛行星一般的居住体验，具体而言是指行星上的城市区域。完全由纳米机器人组成使得建筑如梦幻般瞬间出现，由纳米机器组成的实体承担着空间站点的一切生产工作。"
+
 rg_ap_nantiematter:0 "§Y纳米物质构成工程§!"
 rg_ap_nantiematter_desc:0 "如果能够对L星门建造者的物质与科技进行一次彻底的构成研究，这些强力的纳米机器将极大的提升我们的军备水平。这需要我们获得足够的L星门认知。"
 rg_ap_nantiematter_tooltip:0 "§Y这表明了一切。§!"
--- a/localisation/simp_chinese/RG_ships_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_ships_l_simp_chinese.yml
@@ -30,6 +30,9 @@
 RG_gray_warship_base_key:0 "§Y$NAME_Gray$船体§!"
 RG_gray_capitalship_key:0 "§Y$NAME_Gray$旗舰船体§!"

+ RG_graygoo_juggernaut_behind_key:0 "§Y$NAME_Gray$主宰尾翼§!"
+ RG_graygoo_capitalship_behind_key:0 "§Y$NAME_Gray$旗舰尾翼§!"
+

 # Fleet names
 NAME_RG_GRAY_scienceship:0 "纳米机器科研单元"
@@ -55,7 +58,7 @@
 RG_icebreaker_interdictor:0 "纳米机器破冰单元"
 NAME_Nanite_Mothership_Carrier:0 "风暴中心"
 NAME_Nanite_Mothership_titan:0 "风暴缔造者"
- RG_RG_ORBITAL_RING_TIER_1_STARBASE:0 "风暴之眼"
+ RG_ORBITAL_RING_TIER_1_STARBASE:0 "风暴之眼"
 NAME_RG_Nanite_Starbase:0 "灰色浪潮"
 NAME_RG_armed_transport_ship:0 "纳米机器压制单元"
 NAME_RG_armed_colony_ship:0 "纳米机器模拟单元"
--- a/realgray-stellaris-mod.code-workspace
+++ b/realgray-stellaris-mod.code-workspace
@@ -0,0 +1,28 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "D:/SteamLibrary/steamapps/common/Stellaris/common"
+		},
+		{
+			"path": "D:/SteamLibrary/steamapps/common/Stellaris/events"
+		},
+		{
+			"path": "D:/SteamLibrary/steamapps/common/Stellaris/gfx"
+		},
+		{
+			"path": "D:/SteamLibrary/steamapps/common/Stellaris/localisation"
+		},
+		{
+			"path": "D:/SteamLibrary/steamapps/workshop/content/281990/3330088804"
+		},
+		{
+			"path": "D:/SteamLibrary/steamapps/workshop/content/281990/1747099270"
+		},
+		{
+			"path": "D:/SteamLibrary/steamapps/workshop/content/281990/2293827000"
+		}
+	]
+}
--- a/thumbnail.png
+++ b/thumbnail.png
Author	SHA1	Message	Date
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	5a5c46ef7f	Update RG_event_effects.txt: Modify maid species properties and add free servant jobs in RG_planet_event	2024-09-17 13:48:36 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	c34c0b8eb9	Fix event effect save target for planet2027 maid species and gray goo habitat init	2024-09-17 13:37:01 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	a60bfff413	Update rg_station_districts.txt: Remove unused 'mult' attribute in district_rg_generator	2024-09-17 13:34:23 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	7aa701f86d	筛查修语法bug	2024-09-17 13:32:31 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	638a314145	修复机器女仆特性效果提示中的符号错误	2024-09-17 05:25:06 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	f951701097	空间站区划	2024-09-17 05:18:40 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	b8551fa85b	星球格子固定，关闭空间站二次确认	2024-09-17 02:52:42 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	4c8423b870	空间站女仆	2024-09-17 02:27:18 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	7541c9fce5	起源分化	2024-09-17 01:04:53 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	a2a825ac26	zc	2024-09-16 21:47:30 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	2c478b0e20	graytempest_storm	2024-09-15 13:38:32 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	9be9269503	空间站核心	2024-08-31 10:31:22 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	e22bd6253d	zc	2024-08-30 06:34:50 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	de18864e35	zc	2024-08-30 06:13:54 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	c181968b85	暂存模拟龙	2024-06-15 12:29:48 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	405410bfa7	situation boost	2024-05-16 09:51:49 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	8da3a91c7d	Merge branch 'master' of https://cloud.armorrush.com/Kalospacer/realgray-stellaris-mod	2024-05-16 09:49:06 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	e155057c74	zc	2024-05-16 09:49:05 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	9329faccc7	urefotm crash fix	2024-05-15 22:50:36 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	e156eba77f	chougou tastymaid comp	2024-05-15 20:28:38 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	5054a1164d	Merge branch 'master' of https://cloud.armorrush.com/Kalospacer/realgray-stellaris-mod	2024-05-15 12:29:07 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	91ffbc05ae	暂存	2024-05-15 12:28:15 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	05294fc641	zc	2024-05-14 15:53:33 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	2a868c0d71	zc	2024-05-14 15:49:46 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	c847bfedf2	zc	2024-05-14 15:48:54 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	8ab394b076	trait	2024-05-14 15:28:37 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	5a530f44fc	暂存	2024-05-14 15:21:54 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	4c3bd989aa	暂存	2024-05-14 09:50:13 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	99a8e70400	暂存	2024-05-12 18:44:57 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	64e90acfe9	抹除领袖	2024-05-12 17:25:53 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	59cd78cab6	很好伙伴们，非常目力	2024-05-12 13:41:57 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	38cd11b647	暂存	2024-05-12 13:21:00 +08:00
Kalospacer	b07be16425	revert `574eea5143` revert 暂存	2024-05-12 13:13:35 +08:00
Kalospacer	53edea7228	revert `f4f50b3eee` revert 注释掉	2024-05-12 13:10:48 +08:00
Kalospacer	72c48e2b7d	revert `f0596b14b7` revert 科技分化没图标版	2024-05-12 13:08:36 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	574eea5143	暂存	2024-05-12 13:07:03 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	ce7f0add2b	暂存	2024-05-12 12:55:52 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	f4f50b3eee	注释掉	2024-05-12 05:29:45 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	f0596b14b7	科技分化没图标版	2024-05-12 05:22:42 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	3e3a395f1f	舰船花费update	2024-05-12 04:20:49 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	ca3ec70d50	3.12	2024-05-09 23:17:33 +08:00