暂存

2023-06-27 22:45:33 +08:00 · 2023-06-24 15:07:12 +08:00 · 2023-06-21 13:08:31 +08:00 · 2023-06-21 12:58:32 +08:00 · 2023-06-21 12:40:53 +08:00 · 2023-06-21 12:39:36 +08:00
40 changed files with 3250 additions and 2293 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
--- a/.idea/Real
+++ b/.idea/Real
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Real Gray.iml" filepath="$PROJECT_DIR$/.idea/Real Gray.iml" />
-    </modules>
-  </component>
-</project>
--- a/Gray.iml
+++ b/Gray.iml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/common/component_templates/RG_interdictor_parts.txt
+++ b/common/component_templates/RG_interdictor_parts.txt
@@ -23,6 +23,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_FUSION_REACTOR"
 	ai_weight = {
@@ -55,6 +57,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_COLD_FUSION_REACTOR"
 	ai_weight = {
@@ -87,6 +91,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_ANTIMATTER_REACTOR"
 	ai_weight = {
@@ -119,6 +125,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_ZERO_POINT_REACTOR"
 	ai_weight = {
@@ -162,7 +170,7 @@ utility_component_template = {
 	size = small
 	icon = "GFX_ship_part_reactor_5"
 	icon_frame = 1
-	power = 5000
+	power = 50000
 	resources = {
 		category = ship_components
 		cost = {
@@ -179,8 +187,10 @@ utility_component_template = {
 	component_set = "power_core"
 	size_restriction = {
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
-	upgrades_to = "RG_Interdictor_DARK_MATTER_REACTOR"
+	upgrades_to = "RG_Mothership_DARK_MATTER_REACTOR"
 	ai_weight = {
 		weight = 5
 	}
@@ -228,7 +238,7 @@ utility_component_template = {
 	size = small
 	icon = "GFX_ship_part_dark_matter_power_core"
 	icon_frame = 1
-	power = 6000
+	power = 60000
 	resources = {
 		category = ship_components
 		cost = {
@@ -246,6 +256,8 @@ utility_component_template = {
 	component_set = "power_core"
 	size_restriction = {
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	ai_weight = {
 		weight = 6
@@ -306,6 +318,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	upgrades_to = "BATTLESHIP_SHIP_THRUSTER_2"
@@ -339,6 +353,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	upgrades_to = "BATTLESHIP_SHIP_THRUSTER_3"
@@ -372,6 +388,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	upgrades_to = "BATTLESHIP_SHIP_THRUSTER_4"
@@ -405,6 +423,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	upgrades_to = "BATTLESHIP_SHIP_THRUSTER_5"
@@ -439,6 +459,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -469,6 +491,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "PLANET_KILLER_CRACKER"
 	planet_destruction_gfx = "shatter_planet_gfx"
@@ -488,6 +512,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "PLANET_KILLER_SHIELDER"
 	planet_destruction_gfx = "global_pacifier_gfx"
@@ -507,6 +533,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "PLANET_KILLER_NEUTRON"
 	planet_destruction_gfx = "neutron_planet_gfx"
@@ -526,6 +554,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "PLANET_KILLER_GODRAY"
 	planet_destruction_gfx = "god_ray_gfx"
@@ -545,6 +575,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "PLANET_KILLER_NANOBOTS"
 	planet_destruction_gfx = "assimilation_nanobots_gfx"
@@ -564,6 +596,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "PLANET_KILLER_DELUGE"
 	planet_destruction_gfx = "planet_deluge_gfx"
@@ -617,6 +651,8 @@ utility_component_template = {
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -651,6 +687,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -689,6 +727,8 @@ utility_component_template = {
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -722,6 +762,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -761,6 +803,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -794,6 +838,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
--- a/common/component_templates/RG_ship_parts.txt
+++ b/common/component_templates/RG_ship_parts.txt
@@ -20,6 +20,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_matter_remix_2"
@@ -59,6 +61,7 @@ utility_component_template = {
 	}
 	size_restriction = {
 		RG_graygoo_capitalship
+		RG_gray_juggernaut
 	}
 	prerequisites = {
 		"tech_gray_matter_remix_2"
@@ -320,10 +323,11 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_capitalship
 		RG_graygoo_mothership
+		RG_gray_juggernaut
 	}
 	component_set = "RG_PLANET_KILLER"
 	prerequisites = {
-		"tech_object_gray_6"
+		"tech_gray_juggernaut_8"
 	}
 	hidden = yes
 	ship_limit = 1
@@ -378,10 +382,11 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_capitalship
 		RG_graygoo_mothership
+		RG_gray_juggernaut
 	}
 	component_set = "RG_PLANET_KILLER"
 	prerequisites = {
-		"tech_object_gray_6"
+		"tech_gray_juggernaut_8"
 	}
 	hidden = yes
 	ship_limit = 1
@@ -528,6 +533,7 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
 	}
 	prerequisites = {
 		"tech_gray_buffnut_6"
@@ -580,6 +586,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	tags = {
 		weapon_type_rg_secondary
@@ -630,6 +638,9 @@ weapon_component_template = {
 		"tech_gray_matter_spray_5"
 	}
 	size_restriction = {
+		RG_graygoo_Arsenal
+		RG_graygoo_mothership
+		RG_gray_juggernaut
 		RG_graygoo_capitalship
 	}
 	tags = {
@@ -828,6 +839,8 @@ strike_craft_component_template = {
 	size_restriction = {
 		RG_graygoo_interdictor
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
@@ -894,6 +907,8 @@ strike_craft_component_template = {
 	size_restriction = {
 		RG_graygoo_interdictor
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
@@ -963,6 +978,8 @@ strike_craft_component_template = {
 	size_restriction = {
 		RG_graygoo_interdictor
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
@@ -1033,6 +1050,8 @@ strike_craft_component_template = {
 	size_restriction = {
 		RG_graygoo_interdictor
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
@@ -1097,6 +1116,8 @@ utility_component_template = {
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1133,6 +1154,8 @@ utility_component_template = {
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1169,6 +1192,8 @@ utility_component_template = {
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1205,6 +1230,8 @@ utility_component_template = {
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1242,6 +1269,8 @@ utility_component_template = {
 	}
 	size_restriction = {
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	tags = {
 		weapon_type_rg_computer
@@ -1276,6 +1305,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1312,6 +1343,8 @@ utility_component_template = {
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1348,6 +1381,8 @@ utility_component_template = {
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1384,6 +1419,8 @@ utility_component_template = {
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1421,6 +1458,8 @@ utility_component_template = {
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1450,6 +1489,8 @@ utility_component_template = {
 		titan
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "ship_aura_components"
 	prerequisites = {
@@ -1800,6 +1841,8 @@ utility_component_template = {
 	hidden = yes
 	size_restriction = {
 		RG_graygoo_Buff
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "ship_aura_components"
 	tags = {
@@ -1856,6 +1899,8 @@ utility_component_template = {
 	hidden = yes
 	size_restriction = {
 		RG_graygoo_Buff
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "ship_aura_components"
 	tags = {
@@ -1934,6 +1979,8 @@ weapon_component_template = {
 	tracking = 0
 	size_restriction = {
 		RG_graygoo_Buff
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_buffnut_6"
@@ -2018,6 +2065,8 @@ weapon_component_template = {
 	tracking = 0
 	size_restriction = {
 		RG_graygoo_Buff
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_buffnut_6"
@@ -2096,14 +2145,14 @@ utility_component_template = {
 	icon = "GFX_ship_part_warp_drive_3"
 	icon_frame = 1
 	power = -50
-	hidden = yes
+	# hidden = yes
 	resources = {
 		category = ship_components
 		cost = {
 			alloys = 300
 		}
 	}
-	#prerequisites = { "tech_gray_interdictor_4" }
+	prerequisites = { "tech_gray_interdictor_4" }
 	ftl = yes
 	jumpdrive = yes
 	ship_modifier = {
@@ -2130,7 +2179,7 @@ utility_component_template = {
 	icon = "GFX_ship_part_sensor_4"
 	icon_frame = 1
 	power = -20
-	hidden = yes
+	# hidden = yes
 	resources = {
 		category = ship_components
 		cost = {
@@ -2139,7 +2188,7 @@ utility_component_template = {
 	}
 	sensor_range = 15
 	hyperlane_range = 20
-	#prerequisites = { "tech_gray_interdictor_4" }
+	prerequisites = { "tech_gray_interdictor_4" }
 	ship_modifier = {
 		ship_tracking_add = 20
 	}
@@ -2159,14 +2208,14 @@ utility_component_template = {
 	icon = "GFX_ship_part_thruster_4"
 	icon_frame = 1
 	power = -50
-	hidden = yes
+	# hidden = yes
 	resources = {
 		category = ship_components
 		cost = {
 			alloys = 200
 		}
 	}
-	#prerequisites = { "tech_gray_interdictor_4" }
+	prerequisites = { "tech_gray_interdictor_4" }
 	modifier = {
 		ship_speed_mult = 1.25
 		ship_evasion_add = 10
--- a/common/component_templates/RG_special_ship_parts.txt
+++ b/common/component_templates/RG_special_ship_parts.txt
@@ -39,6 +39,7 @@ weapon_component_template = {
 		weapon_type_energy
 	}
 	size_restriction = {
+		RG_gray_juggernaut
 		RG_graygoo_capitalship
 		RG_graygoo_mothership
 	}
--- a/common/country_types/!_RG_country_types.txt
+++ b/common/country_types/!_RG_country_types.txt
@@ -1,29 +0,0 @@
-RG_gray_friendly = {
-	show_in_contacts_list = no
-	minimalist_contacts_list_profile = yes
-	share_communications = yes
-	default_ships = no
-	government = no
-	uses_origins = no
-	share_survey_data = yes
-	needs_survey = no
-	observable = yes
-	ai = {
-		enabled = no
-	}
-	faction = {
-		hostile = no
-		needs_border_access = no
-		generate_borders = no
-		needs_colony = no
-		auto_delete = no
-	}
-	custom_diplomacy = yes
-	modules = {
-		basic_technology_module = {
-		}
-		exclusive_diplomacy_module = {
-			contact_rule = on_action_only
-		}
-	}
-}
--- a/common/global_ship_designs/!_RG_event_ship_designs_distant_stars_overwrite.txt
+++ b/common/global_ship_designs/!_RG_event_ship_designs_distant_stars_overwrite.txt
@@ -336,292 +336,60 @@ ship_design = {
 	ship_size = nanite_space_dragon_baby
 	is_event_design = yes
 	section = {
-		template = "RG_nanite_space_dragon_baby_key"
+		template = "nanite_space_dragon_baby_key"
 		slot = "mid"
 		component = {
-			slot = "PLANET_KILLER_GUN_01"
-			template = "RG_PLANET_KILLER"
-		}
-		component = {
-			slot = "TITAN_01"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_02"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_03"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_04"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_05"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_06"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "EXTRA_LARGE_01"
+			slot = "PRIMARY_GUN_01"
 			template = "GRAY_BEAM_STATIC_X"
 		}
 		component = {
-			slot = "EXTRA_LARGE_02"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_01"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_03"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_02"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_04"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_03"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_05"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_04"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_06"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_05"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_07"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_06"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_08"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_07"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "TORPEDO_01"
-			template = "RG_ENERGY_MISSILE"
+			slot = "SECONDARY_GUN_08"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "TORPEDO_02"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_03"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_04"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_05"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_06"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_07"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_08"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "LARGE_GUN_01"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_02"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_03"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_04"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_05"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_06"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_07"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_08"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_09"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_10"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_11"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_12"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_13"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_14"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_15"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_16"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_17"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_18"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_19"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_20"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_21"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_22"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_23"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_24"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_25"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_26"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_27"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_28"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_29"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_30"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_31"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_32"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_33"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_34"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_35"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_36"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "PD_01"
+			slot = "TERTIARY_GUN_01"
 			template = "RG_FLAK_BATTERY"
 		}
 		component = {
-			slot = "PD_02"
+			slot = "TERTIARY_GUN_02"
 			template = "RG_FLAK_BATTERY"
 		}
 		component = {
-			slot = "PD_03"
+			slot = "TERTIARY_GUN_03"
 			template = "RG_FLAK_BATTERY"
 		}
 		component = {
-			slot = "PD_04"
+			slot = "TERTIARY_GUN_04"
 			template = "RG_FLAK_BATTERY"
 		}
-		component = {
-			slot = "PD_05"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_06"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_07"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_08"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_09"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_10"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_11"
-			template = "RG_FLAK_PHOENIX"
-		}
-		component = {
-			slot = "PD_12"
-			template = "RG_FLAK_PHOENIX"
-		}
 		component = {
 			slot = "LARGE_UTILITY_1"
 			template = "HUGE_GRAY_MIX_ARMOR"
@@ -638,217 +406,17 @@ ship_design = {
 			slot = "LARGE_UTILITY_4"
 			template = "HUGE_GRAY_MIX_ARMOR"
 		}
-		component = {
-			slot = "LARGE_UTILITY_5"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_6"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_7"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_8"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_9"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_10"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_11"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_12"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_13"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_14"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_15"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_16"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_17"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_18"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_19"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_20"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_21"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_22"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_23"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_24"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_25"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_26"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_27"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_28"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_29"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_30"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_31"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_32"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_33"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_34"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_35"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_36"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_37"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_38"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_39"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_40"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_41"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_42"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_43"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_44"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_45"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_46"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_47"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_48"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
 		component = {
 			slot = "AUX_UTILITY_1"
 			template = "RG_AUTO_REPAIR"
 		}
 		component = {
 			slot = "AUX_UTILITY_2"
-			template = "RG_AUTO_REPAIR"
-		}
-		component = {
-			slot = "AUX_UTILITY_3"
 			template = "RG_ARMOR_BOOSTER"
 		}
-		component = {
-			slot = "AUX_UTILITY_4"
-			template = "RG_ARMOR_BOOSTER"
-		}
-		component = {
-			slot = "AUX_UTILITY_5"
-			template = "RG_ENIGMATIC_SCHEDULER"
-		}
-		component = {
-			slot = "AUX_UTILITY_6"
-			template = "RG_ENIGMATIC_SCHEDULER"
-		}
-		component = {
-			slot = "AUX_UTILITY_7"
-			template = "RG_ENGINE_BOOSTER"
-		}
-		component = {
-			slot = "AUX_UTILITY_8"
-			template = "RG_ENGINE_BOOSTER"
-		}
 	}
 	required_component = "GUARDIAN_DRIVE"
-	required_component = "COMBAT_COMPUTER_ARTILLERY_DEFAULT"
+	required_component = "RG_COMBAT_COMPUTER_battle"
 	required_component = "GUARDIAN_PROPULSION"
 	required_component = "GUARDIAN_SENSORS"
 }
--- a/common/governments/civics/!_RG_origins.txt
+++ b/common/governments/civics/!_RG_origins.txt
@@ -11,4 +11,7 @@ origin_rg_gray = {
 	random_weight = {
 		base = 0
 	}
+	playable = {
+		host_has_dlc = "Distant Stars Story Pack"
+	}
 }
--- a/common/on_actions/RG_on_actions.txt
+++ b/common/on_actions/RG_on_actions.txt
@@ -117,7 +117,6 @@ on_destroy_planet_with_RG_PLANET_KILLER = {
 	events = {
 		RG_planet_killer.1
 		RG_planet_killer.2
-		origin.3245
 	}
 }

@@ -130,7 +129,6 @@ on_destroy_planet_with_RG_PLANET_KILLER_unqueued = {
 on_destroy_planet_with_RG_PLANET_KILLER_SMALL = {
 	events = {
 		RG_planet_killer.2
-		origin.3245
 	}
 }

@@ -190,5 +188,27 @@ on_ship_destroyed_perp = {
 		rg_skill.11
 		rg_story.10
 		rg_story.22
+		rg_skill.12
+		rg_skill.13
+	}
+}
+
+# This = owner of fleet 1 (winner)
+# From = owner of fleet 2 (loser)
+# FromFrom = fleet 1
+# FromFromFrom = fleet 2
+on_space_battle_won = {
+	events = {
+		rg_skill.14
+	}
+}
+
+# This = owner of fleet 1 (loser)
+# From = owner of fleet 2 (winner)
+# FromFrom = fleet 1
+# FromFromFrom = fleet 2
+on_space_battle_lost = {
+	events = {
+		rg_skill.15
 	}
 }
--- a/common/scripted_effects/RG_combat_skill_effects.txt
+++ b/common/scripted_effects/RG_combat_skill_effects.txt
@@ -279,3 +279,10 @@ RG_leader_trait_tempest_incoming_random_kill_effect = {
 		}
 	}
 }
+
+RG_leader_trait_admiral_nanorebuild_gray_counter_init_effect = {
+	set_variable = {
+		which = rg_nanorebuild_counter
+		value = 0
+	}
+}
--- a/common/scripted_effects/RG_gray_goo_effects.txt
+++ b/common/scripted_effects/RG_gray_goo_effects.txt
@@ -241,6 +241,119 @@ rg_create_gray_governor = {
 	}
 }

+#创造灰风总督
+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 = {
+				###等级检测
+				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
+		}
+		rg_juggernaut_habitat_init = yes
+		#设置总督已启用标识
+		set_country_flag = gray_governor_active
+		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 = {
+				has_leader_flag = gray_governor
+			}
+			set_skill = owner.rg_gray_level
+		}
+	}
+}
+
 #创造灰风战舰
 rg_create_gray_warship = {
 	if = {
--- a/common/scripted_effects/RG_gray_leader_init_effects.txt
+++ b/common/scripted_effects/RG_gray_leader_init_effects.txt
@@ -137,7 +137,7 @@ rg_gray_govener_init = {
 			rg_set_gray_portrait = yes
 		}
 	}
-	set_global_flag = rg_kac_leader
+	
 }

 rg_gray_admiral_init = {
@@ -196,6 +196,7 @@ rg_gray_admiral_init = {
 				}
 				set_leader_flag = rg_gray_leader
 				add_trait_no_notify = RG_leader_trait_admiral_gray
+				add_trait_no_notify = RG_leader_trait_admiral_nanorebuild_gray
 				# 缺少特质RG_leader_trait_admiral_gray将导致小灰改造项目无法完成
 				add_trait_no_notify = subclass_admiral_aggressor
 				add_trait_no_notify = leader_trait_carrier_specialization
@@ -243,7 +244,7 @@ rg_gray_admiral_init = {
 			rg_set_gray_portrait = yes
 		}
 	}
-	set_global_flag = rg_kac_leader
+	RG_leader_trait_admiral_nanorebuild_gray_counter_init_effect = yes
 }

 rg_gray_general_init = {
@@ -343,7 +344,7 @@ rg_gray_general_init = {
 		which = rg_general_skill_combat_killed_variable
 		value = 0
 	}
-	set_global_flag = rg_kac_leader
+	
 }

 rg_gray_scientist_init = {
@@ -434,14 +435,14 @@ rg_gray_scientist_init = {
 			rg_set_gray_portrait = yes
 		}
 	}
-	set_global_flag = rg_kac_leader
+	
 }

 rg_gray_country_leader_init = {
 	create_leader = {
 		# 只用作看板娘
 		class = governor
-		species = root
+		species = event_target:gray_species
 		name = "NAME_Gray"
 		gender = female
 		immortal = yes
--- a/common/scripted_effects/RG_scripted_effects.txt
+++ b/common/scripted_effects/RG_scripted_effects.txt
@@ -2545,9 +2545,25 @@ rg_lcluster_spawn_effect = {
 }
 RG_gray_mod1_effect = {
 	custom_tooltip = rg_levelup_2.tooltip
-	start_situation = {
-		type = situation_rg_gray_mod1
-		target = this
+	if = {
+		limit = {
+			has_global_flag = rg_skip_gray_mod_situation
+		}
+		enable_special_project = {
+			name = RG_GRAY_MOD1
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	else = {
+		start_situation = {
+			type = situation_rg_gray_mod1
+			target = this
+		}
+	}
+	add_resource = {
+		energy = -15000
+		alloys = -15000
 	}
 }
 RG_gray_mod1_effect_project = {
@@ -2555,19 +2571,26 @@ RG_gray_mod1_effect_project = {
 	enable_special_project = {
 		name = RG_GRAY_MOD1
 		location = event_target:gray_owner_capital_starbase
-		owner = root
-	}
-	add_resource = {
-		energy = -15000
-		alloys = -15000
+		owner = event_target:gray_owner
 	}
 }
 RG_gray_mod2_effect = {
 	custom_tooltip = rg_levelup_2.tooltip
-	enable_special_project = {
-		name = RG_GRAY_MOD2
-		location = event_target:gray_owner_capital_starbase
-		owner = root
+	if = {
+		limit = {
+			has_global_flag = rg_skip_gray_mod_situation
+		}
+		enable_special_project = {
+			name = RG_GRAY_MOD2
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	else = {
+		start_situation = {
+			type = situation_rg_gray_mod2
+			target = this
+		}
 	}
 	add_resource = {
 		energy = -150000
@@ -2579,10 +2602,24 @@ RG_gray_mod3_effect = {
 	enable_special_project = {
 		name = RG_GRAY_MOD3
 		location = event_target:gray_owner_capital_starbase
-		owner = root
+		owner = event_target:gray_owner
 	}
 	add_resource = {
 		energy = -40000
 		alloys = -40000
 	}
 }
+rg_gray_ship_design_reset_init = {
+	create_ship_design = {
+		design = "NAME_Gray_Warship_rg"
+	}
+	add_ship_design = last_created_design
+	create_ship_design = {
+		design = "NAME_gray_capitalship"
+	}
+	add_ship_design = last_created_design
+	create_ship_design = {
+		design = "NAME_gray_juggernautship"
+	}
+	add_ship_design = last_created_design
+}
--- a/common/scripted_effects/RG_special_effects.txt
+++ b/common/scripted_effects/RG_special_effects.txt
@@ -121,6 +121,35 @@ rg_create_gray_mod1_testship_1 = {
 	}
 }

+rg_create_gray_mod1_testship_2 = {
+	create_fleet = {
+		name = "NAME_RG_TESTSHIP"
+		settings = {
+			can_disband = yes
+			can_upgrade = no
+			can_change_composition = no
+			can_change_leader = no
+			uses_naval_capacity = no
+			spawn_debris = no
+		}
+		effect = {
+			set_owner = root
+			create_ship = {
+				name = "NAME_RG_TESTSHIP"
+				design = "RG_Buff_interdictor"
+				prefix = no
+				upgradable = no
+			}
+			set_location = {
+				target = root.capital_scope
+				distance = 0
+				angle = random
+			}
+			set_fleet_flag = rg_test_ship_fleet
+		}
+	}
+}
+
 rg_create_fake_dragon_species = {
 	create_species = {
 		name = RG_SIMULATION_DRAGON_SPECIES
@@ -156,15 +185,6 @@ rg_create_fake_dragon = {
 				trait = RG_leader_trait_admiral_timed_life
 			}
 			effect = {
-				if = {
-					limit = {
-						has_global_flag = has_wsg_mod
-					}
-					change_leader_portrait = wg_dragon
-				}
-				else = {
-					change_leader_portrait = species
-				}
 				set_leader_flag = has_gained_level_trait
 				set_leader_flag = has_gained_trait
 				set_leader_flag = legendary_leader
--- a/common/scripted_effects/rg_gray_warship_init_effects.txt
+++ b/common/scripted_effects/rg_gray_warship_init_effects.txt
@@ -14,9 +14,14 @@ rg_warship_init_mod1 = {
 			set_owner = prev
 			create_ship = {
 				name = "NAME_Gray"
-				design = "NAME_Gray_Warship_rg"
+				# design = "NAME_Gray_Warship_rg"
+				random_existing_design = RG_graygoo_mothership
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -57,6 +62,10 @@ rg_warship_init_mod2 = {
 				random_existing_design = RG_graygoo_capitalship
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -94,10 +103,14 @@ rg_warship_init_mod3 = {
 			set_owner = prev
 			create_ship = {
 				name = "NAME_Gray"
-				design = "NAME_gray_juggernautship"
-				# random_existing_design = RG_gray_juggernaut
+				# design = "NAME_gray_juggernautship"
+				random_existing_design = RG_gray_juggernaut
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -137,6 +150,10 @@ rg_warship_init_mod0 = {
 				design = "NAME_Gray_Warship_base"
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -158,3 +175,54 @@ 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_triggers.txt
+++ b/common/scripted_triggers/RG_scripted_triggers.txt
@@ -1,5 +1,3 @@
-#星球无法自动建造
-#scope (planet)
 RG_planet_can_auto_build = {
 	OR = {
 		AND = {
--- a/common/scripted_triggers/rg_leader_scripted_triggers.txt
+++ b/common/scripted_triggers/rg_leader_scripted_triggers.txt
@@ -38,6 +38,14 @@ RG_gray_mod1_allow_trigger = {
 			has_skill >= 10
 		}
 	}
+	resource_stockpile_compare = {
+		resource = energy
+		value >= 15000
+	}
+	resource_stockpile_compare = {
+		resource = alloys
+		value >= 15000
+	}
 }

 RG_gray_mod2_trigger = {
@@ -50,6 +58,9 @@ RG_gray_mod2_trigger = {
 	NOR = {
 		has_country_flag = rg_gray_level_3
 		has_special_project = RG_GRAY_MOD2
+		any_situation = {
+			is_situation_type = situation_rg_gray_mod2
+		}
 	}
 }
 RG_gray_mod2_allow_trigger = {
--- a/common/ship_sizes/RG_ship_sizes.txt
+++ b/common/ship_sizes/RG_ship_sizes.txt
@@ -123,9 +123,12 @@ RG_graygoo_capitalship = {
 	combat_disengage_chance = 1.25
 	class = shipclass_military
 	construction_type = starbase_shipyard
+	possible_construction = {
+		always = no
+	}
 	combat_size_multiplier = 4
 	prerequisites = {
-		"tech_object_gray_6"
+		"tech_gray_juggernaut_8"
 	}
 	required_component_set = "power_core"
 	required_component_set = "ftl_components"
@@ -500,10 +503,13 @@ RG_gray_juggernaut = {
 	default_behavior = colossus
 	is_designable = yes
 	prerequisites = {
-		"tech_object_gray_6"
+		"tech_gray_juggernaut_8"
 	}
 	class = shipclass_starbase
 	construction_type = starbase_shipyard
+	possible_construction = {
+		always = no
+	}
 	required_component_set = "power_core"
 	required_component_set = "sensor_components"
 	required_component_set = "combat_computers"
--- a/common/situations/rg_gray_situations.txt
+++ b/common/situations/rg_gray_situations.txt
@@ -1,7 +1,7 @@
 situation_rg_gray_mod1 = {
 	picture = GFX_evt_planet_beam
-	complete_icon_frame = GFX_situation_outcome_frame_red
-	complete_icon = GFX_situation_exploding_planet
+	complete_icon_frame = GFX_situation_outcome_frame_green
+	complete_icon = GFX_situation_outcome_positive
 	on_progress_complete = {
 		custom_tooltip = situation_rg_gray_mod1_finish_tooltip
 		hidden_effect = {
@@ -56,14 +56,6 @@ situation_rg_gray_mod1 = {
 					}
 				}
 			}
-			triggered_modifier = {
-				potential = {
-					has_situation_flag = situation_rg_gray_mod1_stage_2_booster
-				}
-				modifier = {
-					country_engineering_research_produces_mult = -1
-				}
-			}
 		}
 		situation_rg_gray_mod1_stage_3 = {
 			icon = GFX_situation_stage_3
@@ -103,18 +95,10 @@ situation_rg_gray_mod1 = {
 					}
 				}
 			}
-			triggered_modifier = {
-				potential = {
-					has_situation_flag = situation_rg_gray_mod1_stage_5_booster
-				}
-				modifier = {
-					country_physics_research_produces_mult = -1
-				}
-			}
 		}
 		situation_rg_gray_mod1_stage_6 = {
 			icon = GFX_situation_stage_6
-			icon_background = GFX_situation_stage_frame_green
+			icon_background = GFX_situation_stage_frame_red
 			end = 100
 			custom_tooltip = situation_rg_gray_mod1_stage_6_tooltip
 			on_first_enter = {
@@ -122,7 +106,9 @@ situation_rg_gray_mod1 = {
 					country_event = {
 						id = rg_story.28
 					}
-					RG_gray_mod1_effect_project = yes
+				}
+				event_target:gray_warship = {
+					set_event_locked = no
 				}
 			}
 		}
@@ -134,12 +120,36 @@ situation_rg_gray_mod1 = {
 		default = yes
 		on_select = {
 			if = {
-				limit = { has_situation_flag = locked }
+				limit = {
+					NOT = {
+						has_situation_flag = rg_stage6_locked
+					}
+					has_situation_flag = locked
+				}
 				set_situation_locked = no
 				remove_situation_flag = locked
 			}
+			event_target:gray_warship = {
+				set_event_locked = yes
+			}
 			custom_tooltip = situation_rg_gray_mod1_approach_1_tooltip
 		}
+		triggered_modifier = {
+			potential = {
+				has_situation_flag = situation_rg_gray_mod1_stage_5_booster
+			}
+			modifier = {
+				country_physics_research_produces_mult = -1
+			}
+		}
+		triggered_modifier = {
+			potential = {
+				has_situation_flag = situation_rg_gray_mod1_stage_2_booster
+			}
+			modifier = {
+				country_engineering_research_produces_mult = -1
+			}
+		}
 	}
 	approach = {
 		name = situation_rg_gray_mod1_approach_2
@@ -149,17 +159,32 @@ situation_rg_gray_mod1 = {
 			custom_tooltip = situation_rg_gray_mod1_approach_2_tooltip
 			set_situation_locked = yes
 			set_situation_flag = locked
+			event_target:gray_warship = {
+				set_event_locked = no
+			}
+		}
+	}
+	approach = {
+		name = situation_rg_gray_mod1_approach_3
+		icon = GFX_situation_approach_research
+		icon_background = GFX_situation_approach_bg_red
+		on_select = {
+			custom_tooltip = situation_rg_gray_mod1_approach_3_tooltip
+			abort_situation = this
+			event_target:gray_warship = {
+				set_event_locked = no
+			}
 		}
 	}
 	monthly_progress = {
 		base = 0.1
 		modifier = {
-			subtract = 1.5
+			add = 0.1
 			desc = situation_rg_gray_mod1_stage_1_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod1_stage_1_booster
 		}
 		modifier = {
-			subtract = 1.5
+			add = 0.1
 			desc = situation_rg_gray_mod1_stage_2_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod1_stage_2_booster
 		}
@@ -174,17 +199,12 @@ situation_rg_gray_mod1 = {
 			has_situation_flag = situation_rg_gray_mod1_stage_4_booster
 		}
 		modifier = {
-			subtract = 1.5
+			add = 0.1
 			desc = situation_rg_gray_mod1_stage_5_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod1_stage_5_booster
 		}
 		modifier = {
-			subtract = 1.5
-			desc = situation_rg_gray_mod1_stage_5_booster_tooltip
-			has_situation_flag = situation_rg_gray_mod1_stage_5_booster
-		}
-		modifier = {
-			subtract = 0
+			add = 0.1
 			desc = situation_rg_gray_mod1_stage_6_booster_tooltip
 			has_situation_flag = situation_rg_gray_mod1_stage_6_booster
 		}
@@ -205,5 +225,325 @@ situation_rg_gray_mod1 = {
 				id = rg_event.10
 			}
 		}
+		destroy_situation = this 
+	}	
+}
+
+situation_rg_gray_mod2 = {
+	picture = GFX_evt_planet_beam
+	complete_icon_frame = GFX_situation_outcome_frame_green
+	complete_icon = GFX_situation_outcome_positive
+	on_progress_complete = {
+		custom_tooltip = situation_rg_gray_mod1_finish_tooltip
+		hidden_effect = {
+			owner = {
+				country_event = {
+					id = rg_story.29
+				}
+			}
+		}
+		destroy_situation = this 
+	}
+
+	on_start = {
+		owner = {
+			country_event = {
+				id = rg_event.9
+			}
+		}
+	}
+
+	on_monthly = {
+		events = {
+		}
+	}
+
+	stages = {
+		situation_rg_gray_mod2_stage_1 = {
+			icon = GFX_situation_stage_1
+			icon_background = GFX_situation_stage_frame_green
+			end = 8.4
+			custom_tooltip = situation_rg_gray_mod2_stage_1_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.30
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_2 = {
+			icon = GFX_situation_stage_2
+			icon_background = GFX_situation_stage_frame_green
+			end = 16.8
+			custom_tooltip = situation_rg_gray_mod2_stage_2_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.31
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_3 = {
+			icon = GFX_situation_stage_3
+			icon_background = GFX_situation_stage_frame_green
+			end = 25.2
+			custom_tooltip = situation_rg_gray_mod2_stage_3_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.32
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_4 = {
+			icon = GFX_situation_stage_4
+			icon_background = GFX_situation_stage_frame_green
+			end = 33.6
+			custom_tooltip = situation_rg_gray_mod2_stage_4_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.33
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_5 = {
+			icon = GFX_situation_stage_5
+			icon_background = GFX_situation_stage_frame_green
+			end = 42
+			custom_tooltip = situation_rg_gray_mod2_stage_5_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.34
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_6 = {
+			icon = GFX_situation_stage_6
+			icon_background = GFX_situation_stage_frame_green
+			end = 50.4
+			custom_tooltip = situation_rg_gray_mod2_stage_6_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.35
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_7 = {
+			icon = GFX_situation_stage_1
+			icon_background = GFX_situation_stage_frame_green
+			end = 58.8
+			custom_tooltip = situation_rg_gray_mod2_stage_7_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.36
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_8 = {
+			icon = GFX_situation_stage_2
+			icon_background = GFX_situation_stage_frame_green
+			end = 67.2
+			custom_tooltip = situation_rg_gray_mod2_stage_8_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.37
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_9 = {
+			icon = GFX_situation_stage_3
+			icon_background = GFX_situation_stage_frame_green
+			end = 75.6
+			custom_tooltip = situation_rg_gray_mod2_stage_9_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.38
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_10 = {
+			icon = GFX_situation_stage_4
+			icon_background = GFX_situation_stage_frame_green
+			end = 84
+			custom_tooltip = situation_rg_gray_mod2_stage_10_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.39
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_11 = {
+			icon = GFX_situation_stage_5
+			icon_background = GFX_situation_stage_frame_green
+			end = 92.4
+			custom_tooltip = situation_rg_gray_mod2_stage_11_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.40
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_12 = {
+			icon = GFX_situation_stage_6
+			icon_background = GFX_situation_stage_frame_red
+			end = 100
+			custom_tooltip = situation_rg_gray_mod2_stage_12_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.41
+					}
+				}
+				event_target:gray_warship = {
+					set_event_locked = no
+				}
+			}
+		}
+	}
+	approach = {
+		name = situation_rg_gray_mod1_approach_1
+		icon = GFX_situation_approach_research
+		icon_background = GFX_situation_approach_bg_green
+		default = yes
+		on_select = {
+			if = {
+				limit = {
+					NOT = {
+						has_situation_flag = rg_stage6_locked
+					}
+					has_situation_flag = locked
+				}
+				set_situation_locked = no
+				remove_situation_flag = locked
+			}
+			event_target:gray_warship = {
+				set_event_locked = yes
+			}
+			custom_tooltip = situation_rg_gray_mod1_approach_1_tooltip
+		}
+		triggered_modifier = {
+			potential = {
+				has_situation_flag = situation_rg_gray_mod1_stage_5_booster
+			}
+			modifier = {
+				country_physics_research_produces_mult = -1
+			}
+		}
+		triggered_modifier = {
+			potential = {
+				has_situation_flag = situation_rg_gray_mod1_stage_2_booster
+			}
+			modifier = {
+				country_engineering_research_produces_mult = -1
+			}
+		}
+	}
+	approach = {
+		name = situation_rg_gray_mod1_approach_2
+		icon = GFX_situation_approach_research
+		icon_background = GFX_situation_approach_bg_yellow
+		on_select = {
+			custom_tooltip = situation_rg_gray_mod1_approach_2_tooltip
+			set_situation_locked = yes
+			set_situation_flag = locked
+			event_target:gray_warship = {
+				set_event_locked = no
+			}
+		}
+	}
+	approach = {
+		name = situation_rg_gray_mod1_approach_3
+		icon = GFX_situation_approach_research
+		icon_background = GFX_situation_approach_bg_red
+		on_select = {
+			custom_tooltip = situation_rg_gray_mod1_approach_3_tooltip
+			abort_situation = this
+			event_target:gray_warship = {
+				set_event_locked = no
+			}
+		}
+	}
+	monthly_progress = {
+		base = 0.1
+		modifier = {
+			add = 0.05
+			desc = situation_rg_gray_mod2_stage_1_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_1_booster
+		}
+		modifier = {
+			add = 0.05
+			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_2_booster
+		}
+		modifier = {
+			add = 0.05
+			desc = situation_rg_gray_mod2_stage_1_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_4_booster
+		}
+		modifier = {
+			add = 0.05
+			desc = situation_rg_gray_mod2_stage_3_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_5_booster
+		}
+		modifier = {
+			add = 0.05
+			desc = situation_rg_gray_mod2_stage_3_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_6_booster
+		}
+		modifier = {
+			add = 0.05
+			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_7_booster
+		}
+		modifier = {
+			add = 0.05
+			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_8_booster
+		}
+		modifier = {
+			add = 0.05
+			desc = situation_rg_gray_mod2_stage_3_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_9_booster
+		}
+		modifier = {
+			add = 0.05
+			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_10_booster
+		}
+		modifier = {
+			add = 0.05
+			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_11_booster
+		}
+	}
+	abort_trigger = {
+
+	}
+	on_abort = {
+		owner = {
+			country_event = {
+				id = rg_event.10
+			}
+		}
+		destroy_situation = this 
 	}	
 }
--- a/common/special_projects/!_RG_projects_distant_stars.txt
+++ b/common/special_projects/!_RG_projects_distant_stars.txt
@@ -87,12 +87,6 @@ special_project = {
 			country_event = {
 				id = rg_event.11
 			}
-			random_situation = {
-				limit = {
-					is_situation_type = situation_rg_gray_mod1
-				}
-				remove_situation_flag = situation_rg_gray_mod1_stage_6_booster
-			}
 		}
 	}
 }
@@ -123,7 +117,7 @@ special_project = {
 		}
 	}
 	on_success = {
-		fleet = {
+		event_target:gray_warship = {
 			set_event_locked = no
 		}
 		owner = {
--- a/common/special_projects/RG_story_special_projects.txt
+++ b/common/special_projects/RG_story_special_projects.txt
@@ -35,3 +35,84 @@ special_project = {
 		}
 	}
 }
+
+special_project = {
+	key = "rg_gray_mod2_stage1_project"
+	cost = 2000
+	#days_to_research = 300
+	tech_department = physics_research
+	icon = "gfx/interface/icons/situation_log/situation_log_main_quest.dds"
+	picture = GFX_evt_l-gateway
+	event_scope = country_event
+	requirements = {
+	}
+	on_start = {
+		owner = {
+			random_situation = {
+				limit = {
+					is_situation_type = situation_rg_gray_mod2
+				}
+				set_situation_locked = yes
+				set_situation_flag = locked
+				set_situation_flag = rg_stage6_locked
+			}
+		}
+	}
+	on_cancel = {
+		owner = {
+		}
+	}
+	on_success = {
+		owner = {
+			random_situation = {
+				limit = {
+					is_situation_type = situation_rg_gray_mod2
+				}
+				set_situation_flag = situation_rg_gray_mod2_stage_1_booster
+				remove_situation_flag = rg_stage6_locked
+				set_situation_locked = no
+				remove_situation_flag = locked
+			}
+		}
+	}
+}
+special_project = {
+	key = "rg_gray_mod2_stage4_project"
+	cost = 2000
+	#days_to_research = 300
+	tech_department = engineering_research
+	icon = "gfx/interface/icons/situation_log/situation_log_main_quest.dds"
+	picture = GFX_evt_l-gateway
+	event_scope = country_event
+	requirements = {
+	}
+	on_start = {
+		owner = {
+			random_situation = {
+				limit = {
+					is_situation_type = situation_rg_gray_mod2
+				}
+				set_situation_locked = yes
+				set_situation_flag = locked
+				set_situation_flag = rg_stage6_locked
+			}
+		}
+	}
+	on_cancel = {
+		owner = {
+		}
+	}
+	on_success = {
+		owner = {
+			random_situation = {
+				limit = {
+					is_situation_type = situation_rg_gray_mod2
+				}
+				set_situation_flag = situation_rg_gray_mod2_stage_4_booster
+				remove_situation_flag = rg_stage6_locked
+				set_situation_locked = no
+				remove_situation_flag = locked
+			}
+		}
+	}
+}
--- a/common/technology/rg_tech.txt
+++ b/common/technology/rg_tech.txt
@@ -188,6 +188,34 @@ tech_gray_army_7 = {
 	}
 }

+tech_gray_juggernaut_8 = {
+	area = engineering
+	cost = 5000
+	tier = 5
+	is_rare = yes
+	category = {
+		voidcraft
+	}
+	ai_update_type = military
+	weight = @tier2weight3
+	prerequisites = {
+		"tech_gray_matter_remix_2"
+		"tech_juggernaut"
+		"tech_mega_engineering"
+	}
+	ai_weight = {
+		factor = 0		#weapons are good
+		modifier = {
+			factor = 1.25
+			has_ethic = ethic_militarist
+		}
+		modifier = {
+			factor = 1.5
+			has_ethic = ethic_fanatic_militarist
+		}
+	}
+}
+
 tech_gray_repair_system_1 = {
 	area = engineering
 	cost = 5000
--- a/common/traits/!_RG_gray_goo_traits.txt
+++ b/common/traits/!_RG_gray_goo_traits.txt
@@ -56,7 +56,7 @@ RG_leader_trait_ruler_gray = {
 			}
 		}
 		leader_skill_levels = 1
-		leaders_upkeep_mult = 2
+		leaders_upkeep_mult = 0.1
 		mult = owner.rg_gray_level
 	}
 	triggered_self_modifier = {
@@ -74,7 +74,7 @@ RG_leader_trait_ruler_gray = {
 			}
 		}
 		leader_skill_levels = 1
-		leaders_upkeep_mult = 3
+		leaders_upkeep_mult = 0.15
 		mult = owner.rg_gray_level
 	}
 	triggered_self_modifier = {
@@ -88,7 +88,7 @@ RG_leader_trait_ruler_gray = {
 			}
 		}
 		leader_skill_levels = 1
-		leaders_upkeep_mult = 4
+		leaders_upkeep_mult = 0.2
 		mult = owner.rg_gray_level
 	}
 	triggered_modifier = {
@@ -101,8 +101,8 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		country_energy_produces_mult = -0.02
-		planet_stability_add = -2
+		# country_energy_produces_mult = -0.02
+		planet_stability_add = -1
 		mult = owner.rg_gray_level
 	}
 	triggered_modifier = {
@@ -119,8 +119,8 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		country_energy_produces_mult = -0.03
-		planet_stability_add = -3.5
+		# country_energy_produces_mult = -0.03
+		planet_stability_add = -1.5
 		mult = owner.rg_gray_level
 	}
 	triggered_modifier = {
@@ -133,8 +133,8 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		country_energy_produces_mult = -0.04
-		planet_stability_add = -5
+		# country_energy_produces_mult = -0.04
+		planet_stability_add = -2
 		mult = owner.rg_gray_level
 	}
 	triggered_modifier = {
@@ -246,6 +246,32 @@ RG_leader_trait_admiral_gray = {
 	randomized = no
 }

+RG_leader_trait_admiral_nanorebuild_gray = {
+	#3级舰长（默认
+	cost = 0
+	inline_script = {
+		script = trait/icon_psionic
+		CLASS = admiral
+		ICON = "GFX_leader_trait_nanorebuild"
+		RARITY = paragon
+		COUNCIL = no
+		TIER = none
+	}
+	custom_tooltip_with_modifiers = RG_leader_trait_admiral_nanorebuild_effect
+	modifier = {
+		ship_armor_mult = 0.5
+		ship_hull_mult = 0.5
+		ships_upkeep_mult = -0.1
+		ship_hull_regen_add_perc = 0.5
+		ship_armor_regen_add_perc = 0.5
+	}
+	leader_class = {
+		admiral
+	}
+	initial = no
+	randomized = no
+}
+
 RG_leader_trait_scientist_gray = {
 	#科学家特质
 	cost = 0
--- a/events/RG_combat_skill_events.txt
+++ b/events/RG_combat_skill_events.txt
@@ -1,96 +1,98 @@
 namespace = rg_skill
-#fleet_event = {
-#    id = rg_skill.1
-#    hide_window = yes
-#    is_triggered_only = yes
-#
-#    trigger = {
-#        NOT = { has_global_flag = rg_grayskill_cooldown }
-#        any_owned_fleet = {
-#					exists = leader
-#					leader = { has_leader_flag = gray_leader_admiral }
-#					is_in_combat = yes
-#				}
-#    }
-#
-#    immediate = {
-#		if = {
-#			limit = {
-#				any_owned_fleet = {
-#					exists = leader
-#					leader = { has_leader_flag = gray_leader_admiral }
-#					is_in_combat = yes
-#				}
-#			}
-#			random_owned_fleet = {
-#				if = {
-#					limit = { leader = { has_leader_flag = gray_leader_admiral }}
-#					save_event_target_as = gray_warship_location
-#				}
-#			}
-#			create_fleet = {
-#				name = "NAME_RG_carrier"
-#				settings = { 
-#					can_disband = yes
-#					can_upgrade = no 
-#					can_change_composition = yes 
-#					can_change_leader = no 
-#					uses_naval_capacity = no
-#					spawn_debris = no
-#				}				
-#				effect = {
-#					set_owner = event_target:gray_owner
-#					while = {
-#						count = 4
-#						create_ship = {
-#							name = random
-#							design = "RG_carrier_Interdictor"
-#							graphical_culture = "pirate_01"
-#							prefix = no
-#							upgradable = no
-#						}
-#					}
-#					set_location = {
-#						target = event_target:gray_warship_location
-#						distance = 55
-#						angle = 270
-#					}
-#					set_fleet_flag = RG_carrier_fleet
-#					save_global_event_target_as = RG_carrier_fleet
-#				}
-#			}
-#			
-#			set_timed_global_flag = { 
-#				flag = rg_grayskill_cooldown days = 120
-#			}
-#		}	
-#	}	
-#}
-#fleet_event = {
-#    id = rg_skill.2
-#    hide_window = yes
-#    is_triggered_only = yes
-#
-#    trigger = {
-#        any_owned_fleet = {
-#					has_fleet_flag = RG_carrier_fleet
-#					is_in_combat = no
-#				}
-#    }
-#
-#    immediate = {
-#		if = {
-#			limit = {
-#				any_owned_fleet = {
-#					has_fleet_flag = RG_carrier_fleet
-#					is_in_combat = no
-#				}
-#			}	
-#			event_target:RG_carrier_fleet = { delete_ship = this }	
-#		}
-#	}
-#}
-#自动星系建设
+
+# fleet_event = {
+#     id = rg_skill.1
+#     hide_window = yes
+#     is_triggered_only = yes
+# 
+#     trigger = {
+#         NOT = { has_global_flag = rg_grayskill_cooldown }
+#         any_owned_fleet = {
+# 					exists = leader
+# 					leader = { has_leader_flag = gray_leader_admiral }
+# 					is_in_combat = yes
+# 				}
+#     }
+# 
+#     immediate = {
+# 		if = {
+# 			limit = {
+# 				any_owned_fleet = {
+# 					exists = leader
+# 					leader = { has_leader_flag = gray_leader_admiral }
+# 					is_in_combat = yes
+# 				}
+# 			}
+# 			random_owned_fleet = {
+# 				if = {
+# 					limit = { leader = { has_leader_flag = gray_leader_admiral }}
+# 					save_event_target_as = gray_warship_location
+# 				}
+# 			}
+# 			create_fleet = {
+# 				name = "NAME_RG_carrier"
+# 				settings = { 
+# 					can_disband = yes
+# 					can_upgrade = no 
+# 					can_change_composition = yes 
+# 					can_change_leader = no 
+# 					uses_naval_capacity = no
+# 					spawn_debris = no
+# 				}				
+# 				effect = {
+# 					set_owner = event_target:gray_owner
+# 					while = {
+# 						count = 4
+# 						create_ship = {
+# 							name = random
+# 							design = "RG_carrier_Interdictor"
+# 							graphical_culture = "pirate_01"
+# 							prefix = no
+# 							upgradable = no
+# 						}
+# 					}
+# 					set_location = {
+# 						target = event_target:gray_warship_location
+# 						distance = 55
+# 						angle = 270
+# 					}
+# 					set_fleet_flag = RG_carrier_fleet
+# 					save_global_event_target_as = RG_carrier_fleet
+# 				}
+# 			}
+# 			
+# 			set_timed_global_flag = { 
+# 				flag = rg_grayskill_cooldown days = 120
+# 			}
+# 		}	
+# 	}	
+# }
+
+# fleet_event = {
+#     id = rg_skill.2
+#     hide_window = yes
+#     is_triggered_only = yes
+# 
+#     trigger = {
+#         any_owned_fleet = {
+# 					has_fleet_flag = RG_carrier_fleet
+# 					is_in_combat = no
+# 				}
+#     }
+# 
+#     immediate = {
+# 		if = {
+# 			limit = {
+# 				any_owned_fleet = {
+# 					has_fleet_flag = RG_carrier_fleet
+# 					is_in_combat = no
+# 				}
+# 			}	
+# 			event_target:RG_carrier_fleet = { delete_ship = this }	
+# 		}
+# 	}
+# }
+
 ship_event = {
 	id = rg_skill.3
 	hide_window = yes
@@ -106,11 +108,9 @@ ship_event = {
 		}
 		solar_system = {
 			OR = {
-				#星系无主
 				NOT = {
 					exists = space_owner
 				}
-				#星系为我方但有空间站未建造
 				AND = {
 					space_owner = {
 						is_same_empire = root.controller
@@ -120,7 +120,6 @@ ship_event = {
 					}
 				}
 			}
-			#邻国不能是军孤
 			NOT = {
 				any_neighbor_system = {
 					has_owner = yes
@@ -145,7 +144,6 @@ ship_event = {
 				}
 				solar_system = {
 					NOT = {
-						#星系内不能有敌舰
 						any_fleet_in_system = {
 							exists = controller
 							controller = {
@@ -155,7 +153,6 @@ ship_event = {
 					}
 				}
 			}
-			#创建自动工程船暂存国家
 			RG_const_auto_build_effect_event = yes
 		}
 		else_if = {
@@ -168,8 +165,7 @@ ship_event = {
 				}
 				solar_system = {
 					has_star_flag = lcluster
-					NOT = {
-						#星系内不能有敌舰		
+					NOT = {	
 						any_fleet_in_system = {
 							exists = controller
 							controller = {
@@ -179,7 +175,6 @@ ship_event = {
 					}
 				}
 			}
-			#创建自动工程船暂存国家
 			RG_const_auto_build_effect_event = yes
 		}
 		else_if = {
@@ -190,8 +185,7 @@ ship_event = {
 				}
 				solar_system = {
 					# has_star_flag = lcluster
-					NOT = {
-						#星系内不能有敌舰		
+					NOT = {	
 						any_fleet_in_system = {
 							exists = controller
 							controller = {
@@ -201,10 +195,8 @@ ship_event = {
 					}
 				}
 			}
-			#创建自动工程船暂存国家
 			RG_const_auto_build_effect_event = yes
 		}
-		#循环检查
 		ship_event = {
 			id = rg_skill.3
 			days = 10
@@ -605,3 +597,189 @@ country_event = {
 		}
 	}
 }
+
+# 纳米重塑
+# This = owner of ship 1 (combatant)
+# From = owner of ship 2 (destroyed)
+# FromFrom = ship 1
+# FromFromFrom = ship 2
+country_event = {
+	id = rg_skill.12
+	hide_window = yes
+	is_triggered_only = yes
+	trigger = {
+		FromFromFrom = {
+			is_in_combat = yes
+			NOT = {
+				is_same_value = event_target:gray_warship_ship
+			}
+			exists = fleet.leader
+		}
+		FromFromFrom.fleet.leader = {
+			has_trait = RG_leader_trait_admiral_nanorebuild_gray
+		}
+	}
+	immediate = {
+		if = {
+			limit = {
+				From = {
+					check_variable = {
+						which = rg_nanorebuild_counter
+						value >= 1
+					}
+				}
+			}
+			FromFromFrom = {
+				save_event_target_as = event_ship
+			}
+			FromFromFrom.fleet = {
+				create_ship = {
+					name = event_target:event_ship
+					design = event_target:event_ship
+				}
+			}
+			From = {
+				change_variable = {
+					which = rg_nanorebuild_counter
+					value = -1
+				}
+			}
+		}
+	}
+}
+
+# country_event = {
+# 	id = rg_skill.13
+# 	hide_window = yes
+# 	is_triggered_only = yes
+# 	trigger = {
+# 		FromFromFrom = {
+# 			is_in_combat = yes
+# 		}
+# 		FromFrom.solar_system = {
+# 			any_fleet_in_system = {
+# 				leader = {
+# 					has_trait = RG_leader_trait_admiral_nanorebuild_gray
+# 				}
+# 			}
+# 		}
+# 		this = {
+# 			NOT = {
+# 				is_same_value = event_target:gray_owner
+# 				is_in_federation_with = event_target:gray_owner
+# 			}
+# 		}
+# 	}
+# 	immediate = {
+# 		event_target:gray_owner = {
+# 			change_variable = {
+# 				which = rg_nanorebuild_counter
+# 				value = 1
+# 			}
+# 		}
+# 	}
+# }
+
+# On destroying enemy ship.
+country_event = {
+	id = rg_skill.13
+	hide_window = yes
+	is_triggered_only = yes
+
+	trigger = {
+		FromFrom = {
+			is_in_combat = yes
+			exists = fleet.leader
+		}
+		FromFrom.fleet.leader = {
+			has_trait = RG_leader_trait_admiral_nanorebuild_gray
+		}
+	}
+
+	immediate = {
+		FROMFROM = { # Winning ship.
+			if = {
+				limit = { exists = fleet.leader }
+				fleet.leader = {
+					if = {
+						limit = {
+							OR = {
+								has_trait = RG_leader_trait_admiral_nanorebuild_gray
+							}
+						}
+						ROOT = {
+							change_variable = {
+								which = rg_nanorebuild_counter
+								value = 1
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+# This = owner of fleet 1 (winner)
+# From = owner of fleet 2 (loser)
+# FromFrom = fleet 1
+# FromFromFrom = fleet 2
+country_event = {
+	id = rg_skill.14
+	hide_window = yes
+	is_triggered_only = yes
+	trigger = {
+		OR = {
+			fromfrom.leader = {
+				has_trait = RG_leader_trait_admiral_nanorebuild_gray
+			}
+		}
+		NOT = {
+			This = {
+				check_variable = {
+					which = rg_nanorebuild_counter
+					value = 0
+				}
+			}
+		}
+	}
+	immediate = {
+		This = {
+			set_variable = {
+				which = rg_nanorebuild_counter
+				value = 0
+			}
+		}
+	}
+}
+# This = owner of fleet 1 (loser)
+# From = owner of fleet 2 (winner)
+# FromFrom = fleet 1
+# FromFromFrom = fleet 2
+country_event = {
+	id = rg_skill.15
+	hide_window = yes
+	is_triggered_only = yes
+	trigger = {
+		OR = {
+			fromfrom.leader = {
+				has_trait = RG_leader_trait_admiral_nanorebuild_gray
+			}
+		}
+		NOT = {
+			This = {
+				check_variable = {
+					which = rg_nanorebuild_counter
+					value = 0
+				}
+			}
+		}
+	}
+	immediate = {
+		This = {
+			set_variable = {
+				which = rg_nanorebuild_counter
+				value = 0
+			}
+		}
+	}
+}
--- a/events/RG_events.txt
+++ b/events/RG_events.txt
--- a/events/RG_gray_leader_dialog_event.txt
+++ b/events/RG_gray_leader_dialog_event.txt
@@ -175,7 +175,7 @@ country_event = {
 	desc = "graygoo.501.b.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_admiral
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -213,7 +213,7 @@ country_event = {
 	desc = "graygoo.501.c.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_general
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -251,7 +251,7 @@ country_event = {
 	desc = "rg_const.501.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_scientist
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -289,7 +289,7 @@ country_event = {
 	desc = "graygoo.502.a.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -326,7 +326,7 @@ country_event = {
 	desc = "graygoo.502.c.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_general
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -363,7 +363,7 @@ country_event = {
 	desc = "RG_graygoo.502.d.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -400,7 +400,7 @@ country_event = {
 	desc = "RG_graygoo.502.e.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -437,7 +437,7 @@ country_event = {
 	desc = "rg_const.502.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_scientist
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -474,7 +474,7 @@ country_event = {
 	desc = "graygoo.503.a.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -511,7 +511,7 @@ country_event = {
 	desc = "graygoo.503.b.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -548,7 +548,7 @@ country_event = {
 	desc = "rg_const.503.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_scientist
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -585,7 +585,7 @@ country_event = {
 	desc = "graygoo.505.a.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -622,7 +622,7 @@ country_event = {
 	desc = "graygoo.505.b.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -659,7 +659,7 @@ country_event = {
 	desc = "graygoo.505.c.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_general
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
--- a/events/RG_gray_leader_event.txt
+++ b/events/RG_gray_leader_event.txt
@@ -339,7 +339,7 @@ country_event = {
 	diplomatic = yes
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -480,7 +480,7 @@ country_event = {
 	diplomatic = yes
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -514,7 +514,7 @@ country_event = {
 		capital_scope = {
 			solar_system = {
 				starbase = {
-					save_event_target_as = gray_owner_capital_starbase
+					save_global_event_target_as = gray_owner_capital_starbase
 				}
 			}
 		}
@@ -804,7 +804,7 @@ country_event = {
 	diplomatic = yes
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_general
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -1182,7 +1182,7 @@ country_event = {
 	diplomatic = yes
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_scientist
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -1376,7 +1376,7 @@ country_event = {
 	desc = "rg_event.4.a.desc"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -1525,7 +1525,7 @@ country_event = {
 	desc = "rg_event.5.c.desc"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -1579,7 +1579,7 @@ country_event = {
 	desc = "rg_event.6.b.desc"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
--- a/events/RG_story_event.txt
+++ b/events/RG_story_event.txt
@@ -725,4 +725,761 @@ country_event = {
 			}
 		}
 	}
+}
+
+# 开始改造
+country_event = {
+	id = rg_story.23
+	title = rg_story.23.title
+	desc = rg_story.23.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.23.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.23.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+		}
+		add_resource = {
+			energy = -1500
+			alloys = -1500
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_1_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.24
+	title = rg_story.24.title
+	desc = rg_story.24.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.24.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.24.b
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_2_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.25
+	title = rg_story.25.title
+	desc = rg_story.25.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.25.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_3_booster
+		}
+	}
+	option = {
+		name = rg_story.25.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 5000
+			}
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 5000
+			}
+		}
+		add_resource = {
+			energy = -5000
+			alloys = -5000
+		}
+		rg_create_gray_mod1_testship_1 = yes
+	}
+}
+
+country_event = {
+	id = rg_story.26
+	title = rg_story.26.title
+	desc = rg_story.26.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.26.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_4_booster
+		}
+	}
+	option = {
+		name = rg_story.26.b
+		add_resource = {
+			energy = -5000
+			alloys = -5000
+		}
+		rg_create_gray_planetkiller_testship_1 = yes
+	}
+}
+
+country_event = {
+	id = rg_story.27
+	title = rg_story.27.title
+	desc = rg_story.27.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.27.a
+		default_hide_option = yes
+
+	}
+	option = {
+		name = rg_story.27.b
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_5_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.28
+	title = rg_story.28.title
+	desc = rg_story.28.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+		enable_special_project = {
+			name = RG_GRAY_MOD1
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	option = {
+		name = rg_story.28.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_locked = yes
+			set_situation_flag = locked
+			set_situation_flag = rg_stage6_locked
+			set_situation_flag = situation_rg_gray_mod1_stage_6_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.29
+	title = rg_story.29.title
+	desc = rg_story.29.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.29.a
+		default_hide_option = yes
+	}
+}
+
+country_event = {
+	id = rg_story.30
+	title = rg_story.30.title
+	desc = rg_story.30.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.30.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.30.b
+		enable_special_project = {
+			name = rg_gray_mod2_stage1_project
+			# location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.31
+	title = rg_story.31.title
+	desc = rg_story.31.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.31.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.31.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = nanites
+				value >= 150
+			}
+		}
+		add_resource = {
+			resource = nanites
+			value = -150
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_2_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.32
+	title = rg_story.32.title
+	desc = rg_story.32.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.32.a
+		default_hide_option = yes
+	}
+}
+
+country_event = {
+	id = rg_story.33
+	title = rg_story.33.title
+	desc = rg_story.33.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.33.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.33.b
+		enable_special_project = {
+			name = rg_gray_mod2_stage4_project
+			# location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.34
+	title = rg_story.34.title
+	desc = rg_story.34.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.34.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.34.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+		}
+		add_resource = {
+			resource = alloys
+			value = -1500
+		}
+		add_resource = {
+			resource = energy
+			value = -1500
+		}
+		rg_create_gray_mod1_testship_2 = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_5_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.35
+	title = rg_story.35.title
+	desc = rg_story.35.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.35.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.35.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+		}
+		add_resource = {
+			resource = alloys
+			value = -1500
+		}
+		add_resource = {
+			resource = energy
+			value = -1500
+		}
+		rg_create_gray_mod1_testship_2 = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_6_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.36
+	title = rg_story.36.title
+	desc = rg_story.36.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.36.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.36.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 4000
+			}
+			resource_stockpile_compare = {
+				resource = minerals
+				value >= 1500
+			}
+		}
+		add_resource = {
+			resource = energy
+			value = -4000
+		}
+		add_resource = {
+			resource = minerals
+			value = -1500
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_7_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.37
+	title = rg_story.37.title
+	desc = rg_story.37.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.37.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.37.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = consumer_goods
+				value >= 3000
+			}
+		}
+		add_resource = {
+			resource = consumer_goods
+			value = -3000
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_8_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.38
+	title = rg_story.38.title
+	desc = rg_story.38.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.38.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.38.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+		}
+		add_resource = {
+			resource = alloys
+			value = -1500
+		}
+		add_resource = {
+			resource = energy
+			value = -1500
+		}
+		rg_create_gray_mod1_testship_2 = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_9_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.39
+	title = rg_story.39.title
+	desc = rg_story.39.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.39.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.39.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 3000
+			}
+		}
+		add_resource = {
+			resource = alloys
+			value = -3000
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_10_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.40
+	title = rg_story.40.title
+	desc = rg_story.40.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.40.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.40.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = nanites
+				value >= 500
+			}
+		}
+		add_resource = {
+			resource = alloys
+			value = -500
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_11_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.41
+	title = rg_story.41.title
+	desc = rg_story.41.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+		enable_special_project = {
+			name = RG_GRAY_MOD2
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	option = {
+		name = rg_story.41.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_locked = yes
+			set_situation_flag = locked
+			set_situation_flag = rg_stage6_locked
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.42
+	title = rg_story.42.title
+	desc = rg_story.42.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.42.a
+		default_hide_option = yes
+	}
+}
+
+country_event = {
+	id = rg_story.43
+	title = rg_story.43.title
+	desc = rg_story.43.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+		enable_special_project = {
+			name = RG_GRAY_MOD3
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	option = {
+		name = rg_story.43.a
+		default_hide_option = yes
+	}
 }
--- a/events/RG_wsg_graygoo_event.txt
+++ b/events/RG_wsg_graygoo_event.txt
@@ -455,7 +455,7 @@ country_event = {
 		capital_scope = {
 			solar_system = {
 				starbase = {
-					save_event_target_as = gray_owner_capital_starbase
+					save_global_event_target_as = gray_owner_capital_starbase
 				}
 			}
 		}
--- a/events/rg_event_base.txt
+++ b/events/rg_event_base.txt
--- a/events/rg_gray_mod_story_event.txt
+++ b/events/rg_gray_mod_story_event.txt
@@ -1,238 +0,0 @@
-namespace = rg_story
-
-# 开始改造
-country_event = {
-	id = rg_story.23
-	title = rg_story.23.title
-	desc = rg_story.23.desc
-	picture = GFX_evt_gray_goo_ships
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.23.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.23.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 1500
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 1500
-			}
-		}
-		effect = {
-			add_resource = {
-				energy = -1500
-				alloys = -1500
-			}
-			random_situation = {
-				limit = {
-					is_situation_type = situation_rg_gray_mod1
-				}
-				set_situation_flag = situation_rg_gray_mod1_stage_1_booster
-			}
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.24
-	title = rg_story.24.title
-	desc = rg_story.24.desc
-	picture = GFX_evt_gray_goo_ships
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.24.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.24.b
-		effect = {
-			random_situation = {
-				limit = {
-					is_situation_type = situation_rg_gray_mod1
-				}
-				set_situation_flag = situation_rg_gray_mod1_stage_2_booster
-			}
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.25
-	title = rg_story.25.title
-	desc = rg_story.25.desc
-	picture = GFX_evt_gray_goo_ships
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.25.a
-		default_hide_option = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_3_booster
-		}
-	}
-	option = {
-		name = rg_story.25.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 5000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 5000
-			}
-		}
-		effect = {
-			add_resource = {
-				energy = -5000
-				alloys = -5000
-			}
-			rg_create_gray_mod1_testship_1 = yes
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.26
-	title = rg_story.26.title
-	desc = rg_story.26.desc
-	picture = GFX_evt_gray_goo_ships
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.26.a
-		default_hide_option = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_4_booster
-		}
-	}
-	option = {
-		name = rg_story.26.b
-		effect = {
-			add_resource = {
-				energy = -5000
-				alloys = -5000
-			}
-			rg_create_gray_planetkiller_testship_1 = yes
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.27
-	title = rg_story.27.title
-	desc = rg_story.27.desc
-	picture = GFX_evt_gray_goo_ships
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.27.a
-		default_hide_option = yes
-
-	}
-	option = {
-		name = rg_story.27.b
-		effect = {
-			random_situation = {
-				limit = {
-					is_situation_type = situation_rg_gray_mod1
-				}
-				set_situation_flag = situation_rg_gray_mod1_stage_5_booster
-			}
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.28
-	title = rg_story.28.title
-	desc = rg_story.28.desc
-	picture = GFX_evt_gray_goo_ships
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.28.a
-		default_hide_option = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_6_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.29
-	title = rg_story.29.title
-	desc = rg_story.29.desc
-	picture = GFX_evt_gray_goo_ships
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.28.a
-		default_hide_option = yes
-	}
-}
--- a/gfx/interface/icons/traits/leader_trait_icons/nanorebuild.dds
+++ b/gfx/interface/icons/traits/leader_trait_icons/nanorebuild.dds
--- a/interface/icons/traits/rg_leader_traits.gfx
+++ b/interface/icons/traits/rg_leader_traits.gfx
@@ -0,0 +1,6 @@
+spriteTypes = {
+	spriteType = {
+		name = "GFX_leader_trait_nanorebuild"
+		texturefile = "gfx/interface/icons/traits/leader_trait_icons/nanorebuild.dds"
+	}
+}
--- a/kac_anticheat/kac_ads_compact_log.txt
+++ b/kac_anticheat/kac_ads_compact_log.txt
@@ -1,187 +0,0 @@
-# © kac ads 主动防御系统。
-# 主动兼容性筛查只能在我所订阅的mod范围内进行。有漏网之鱼很正常。
-# 主动兼容性筛查只标记我认为不应该被覆盖的文件。
-# 唔姆。
-kac_ads.1 = {
-	name = "碧蓝航线"
-	supported_version = "3.*.*"
-	remote_file_id = "2020164764"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2020164764"
-	compact_file = {
-		!!azur_R_ships_designs.txt
-		azur_R_graygoo_sizes.txt
-		adt_ship_designs_distars.txt
-		gray_goo.txt
-	}
-	overwritten_id = {
-		ship_design = "NAME_Gray_Warship"
-	}
-	active_flag = {
-		exist = have_azur_R_fallen
-	}
-	desc = {
-		# 描述：小灰战舰设计会被魔怔人强覆盖。
-		# 处理方法：弹窗提醒
-		# 判断结果：小灰舰船设计被该mod覆盖，但大体上不影响游玩
-	}
-}
-
-kac_ads.2 = {
-	name = "Warship Girls R And MIST Species"
-	supported_version = "3.8.*"
-	remote_file_id = "1747099270"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=1747099270"
-	compact_file = {
-		00_wg_event_ship_designs_distant_stars.txt
-		scripted_effects_override.txt
-		00_wg_gray_goo_events.txt
-	}
-	overwritten_id = {
-	}
-	active_flag = {
-		exist = has_wsg_mod
-	}
-	desc = {
-		# 描述：小灰事件和设计重复。
-		# 处理方法：已经主动兼容
-		# 判断结果：会被本mod覆盖，不影响游玩。
-	}
-}
-
-kac_ads.3 = {
-	name = "A Deadly Tempest [3.8.☠]"
-	supported_version = "3.8.*"
-	remote_file_id = "2028826064"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2028826064"
-	compact_file = {
-		adt_ship_designs_distars.txt
-		gray_goo_effects_override.txt
-		3_gray_goo_events.txt
-		01_lcluster_+_event_override.txt
-		01_gray_goo_events_override.txt
-		# ~gray_goo_country_type.txt
-		z_graygoo_ships.txt
-		*
-	}
-	overwritten_id = {
-	}
-	active_flag = {
-		exist = a_deadly_tempest_mod_active
-	}
-	desc = {
-		# 描述：小灰事件和设计重复。大量事件重复。
-		# 处理方法：弹窗提醒
-		# 判断结果：太多了查不过来，可能会出问题。
-	}
-}
-
-kac_ads.4 = {
-	name = "( Twinks Dessanu )"
-	supported_version = "3.0.*"
-	remote_file_id = "2285039543"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2285039543"
-	compact_file = {
-		000_nanite_ship_designs.txt
-		gray_goo_nanite_effects.txt
-	}
-	overwritten_id = {
-	}
-	desc = {
-		# 描述：小灰战舰设计，小灰生成函数重复，并且原作者噶了。
-		# 处理方法：不做处理
-		# 判断结果：会被本mod覆盖，不影响游玩。
-	}
-}
-
-kac_ads.5 = {
-	name = "KDC Story Pack"
-	supported_version = "3.7.*"
-	remote_file_id = "2737603165"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2737603165"
-	compact_file = {
-		00_wg_event_ship_designs_distant_stars.txt
-		z_kdc_scripted_effects_override.txt
-	}
-	overwritten_id = {
-	}
-	desc = {
-		# 描述：小灰战舰设计，小灰生成函数重复。
-		# 处理方法：已经主动兼容
-		# 判断结果：会被本mod覆盖，不影响游玩。
-	}
-}
-
-kac_ads.6 = {
-	name = "Gray  with animated portrait"
-	supported_version = "3.8.3"
-	remote_file_id = "2976454692"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2976454692"
-	compact_file = {
-		gray_goo_effects.txt
-		gray_goo_events.txt
-	}
-	overwritten_id = {
-	}
-	desc = {
-		# 描述：小灰事件，小灰生成函数重复。该mod的Gray.dds瞎猫碰上死耗子一样替换了本mod的默认立绘。
-		# 处理方法：不做处理
-		# 判断结果：会被本mod覆盖，不影响游玩。
-	}
-}
-
-kac_ads.7 = {
-	name = "BRC United Fleet"
-	supported_version = "3.6.*"
-	remote_file_id = "2923867738"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2923867738"
-	compact_file = {
-		00_wg_gray_goo_events.txt
-	}
-	overwritten_id = {
-	}
-	desc = {
-		# 描述：小灰事件重复。
-		# 处理方法：不做处理
-		# 判断结果：会被本mod覆盖，不影响游玩。
-	}
-}
-
-kac_ads.9 = {
-	name = "L-Cluster Plus"
-	supported_version = "3.7.*"
-	remote_file_id = "2293169684"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2293169684"
-	compact_file = {
-		01_l_cluster_plus_distar_overwrite_events.txt
-		01_l_cluster_plus_graygoo_overwrite_events.txt
-		000_nanite_ship_designs.txt
-	}
-	overwritten_id = {
-	}
-	desc = {
-		# 描述：L星团事件重复。
-		# 处理方法：不做处理
-		# 判断结果：会被本mod覆盖，不影响游玩。
-	}
-}
-
-kac_ads.8 = {
-	name = "!CM伞の天灾之主(旧)!"
-	supported_version = "2.8.*"
-	remote_file_id = "2411774658"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2411774658"
-	compact_file = {
-		z_cm_ships_overwrite.txt
-		*
-	}
-	overwritten_id = {
-	}
-	active_flag = {
-		exist = z_cm_installed
-	}
-	desc = {
-		# 描述：灰蛊事件冲突，舰船设计覆盖，并且小伞已经不管这个mod了
-		# 处理方法：弹窗提醒
-		# 判断结果：可能会出问题，不过可能没人会开一个2.8的mod。
-	}
-}
--- a/localisation/simp_chinese/RG_event_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_event_l_simp_chinese.yml
@@ -267,12 +267,12 @@
 rg_event.10.a:0 "我们做了一个错误的决定..."

 rg_story.23.title:0 "§Y第一阶段：基本舰体修复§!"
- rg_story.23.desc:0 "我们的$NAME_Gray$改造计划将分为六个子阶段。在第一阶段，我们需要$NAME_Gray$舰体中严重损耗的部分，并修复一部分供能系统，并修复舰体上损坏无法挂载武器的挂载点。\n§Y在这一阶段计划不加干预仍将正常进行，不过进行一些小小的投资能够加快这一进程。§!"
+ rg_story.23.desc:0 "我们的$NAME_Gray$改造计划将分为六个子阶段。在第一阶段，我们需要修复$NAME_Gray$舰体中严重损耗的部分，并修复一部分供能系统，并修复舰体上损坏无法挂载武器的挂载点。\n§Y在这一阶段计划不加干预仍将正常进行，不过进行一些小小的投资能够加快这一进程。§!"
 rg_story.23.a:0 "就这么办。"
 rg_story.23.b:0 "§Y买买买，我要这合金有何用？§!"

 rg_story.24.title:0 "§Y第二阶段：武器载点重构§!"
- rg_story.24.desc:0 "我们的计划已经进入第二阶段。在这一阶段，我们将修复$NAME_Gray$舰体上损坏的主武器挂载点，通过给反应堆添加节能认证，整合掉不需要的旅馆房间等措施来添加更多的武器挂载点，通过优化舰载机发射流程以搭载更多的舰载机。\n§Y在这一阶段计划不加干预仍将正常进行。不过指派我们的科研团队加以协助能够加快这一进程。§!"
+ rg_story.24.desc:0 "我们的计划已经进入第二阶段。在这一阶段，我们将修复$NAME_Gray$舰体上损坏的主武器挂载点，通过给反应堆添加节能认证，整合掉不需要的旅馆房间等措施来添加更多的武器挂载点，通过优化舰载机弹射流程中不必要的安全措施以搭载更多的舰载机。\n§Y在这一阶段计划不加干预仍将正常进行。不过指派我们的科研团队加以协助能够加快这一进程。§!"
 rg_story.24.a:0 "那就这样吧。"
 rg_story.24.b:0 "§Y指派工程学团队协助。§!"

@@ -297,4 +297,73 @@

 rg_story.29.title:0 "§Y改造项目顺利收官§!"
 rg_story.29.desc:0 "我们的计划已经成功完成。经过测试的$NAME_Gray$母舰各项指标都非常喜人，我们的科研团队已经准备好了一场庆祝集会。"
- rg_story.29.a:0 "所向披靡。"
+ rg_story.29.a:0 "所向披靡。"
+
+ rg_story.30.title:0 "§Y第一阶段：基本力学验证§!"
+ rg_story.30.desc:0 "有了上一次的经验，我们的$NAME_Gray$旗舰改造计划将分为十二个子阶段与两个可选改造阶段。我们要证明比小行星还要大的战舰不是痴人说梦。为了将这一梦想从想象中拉回现实，我们的科研团队必须先进行如此尺寸战舰的力学分析。\n§Y在这一阶段计划不加干预仍将正常进行，不过指派科学家协助能够加快这一进程。§!"
+ rg_story.30.a:0 "就这么办。"
+ rg_story.30.b:0 "§Y指派首席科学家协助项目§!"
+
+ rg_story.31.title:0 "§Y第二阶段：纳米构成研究§!"
+ rg_story.31.desc:0 "我们的计划已经进入第二阶段。先前的研究已经证明想要建造如此尺寸的战舰，以我们所知的任何材料的都难以完美满足要求。我们需要进行对纳米物质的进一步构成研究，这种物质所表现出的物理性质似乎高度契合我们的目标。\n§Y在这一阶段计划不加干预仍将正常进行，不过投资一些纳米机器人将能够加快这一进程。§!"
+ rg_story.31.a:0 "继续。"
+ rg_story.31.b:0 "§Y投资纳米机器研究§!"
+
+ rg_story.32.title:0 "§Y第三阶段：工程场地建设§!"
+ rg_story.32.desc:0 "我们的计划已经进入第三阶段。建造如此工程的项目，即使使用自编程纳米机器协助也难以在太空中建设达到强度要求的结构。这无疑是一种巨构工程。我们需要建设工程场地协调材料运输和进行结构固定。\n§Y在这一阶段我们需要建设巨型结构来继续推进计划。§!"
+ rg_story.32.a:0 "建设开始"
+
+ rg_story.33.title:0 "§Y第四阶段：反应堆稳定研究§!"
+ rg_story.33.desc:0 "我们的计划已经进入第四阶段。我们的旗舰无疑需要巨量的能源，而将传统反应堆进行简单规模放大已经难以完成。我们需要探索超大规模反应堆设计方案，研究超临界能量输出方案。\n§Y在这一阶段不加干预仍将正常进行，但可能发生重大事故导致我们的进度被迫倒退。§!"
+ rg_story.33.a:0 "放着呗，还会出什么乱子呢？"
+ rg_story.33.b:0 "§Y指派精英科学家参与设计§!"
+
+ rg_story.34.title:0 "§Y第五阶段：主武器载点设计§!"
+ rg_story.34.desc:0 "我们的计划已经进入第五阶段。武备是战舰的核心。在实际建造舰体之前我们就需要设计武器载点来装载武器。我们的旗舰将拥有一套万向轴巨型歼星武器系统。多联泰坦级武器阵列，以及超大规模宏炮阵列和密集舰载机弹射阵列。如何协调舰船空间无疑是一项巨大的挑战。\n§Y在这一阶段不加干预仍将正常进行，不过投资建造试验舰将能够加快这一进程。§!"
+ rg_story.34.a:0 "我们能做到"
+ rg_story.34.b:0 "§Y投资建造试验单元§!"
+
+ rg_story.35.title:0 "§Y第六阶段：舱室布局设计§!"
+ rg_story.35.desc:0 "我们的计划即将推进过半。我们的舰体在设计之初留有大量吨位冗余，这并非是浪费，在我们的设想中，旗舰将能够独立运行一套生态系统以供数个大型居住站规模的居民生活，同时舰体预留有大量改装空间。如何设计好人民的未来家园将是一项不可忽视的重要任务。\n§Y在这一阶段不加干预仍将正常进行，不过投资建造试验舰将能够加快这一进程。§!"
+ rg_story.35.a:0 "为了新的家园"
+ rg_story.35.b:0 "§Y投资建造试验单元§!"
+
+ rg_story.36.title:0 "§Y第七阶段：舰体龙骨铺设§!"
+ rg_story.36.desc:0 "我们的计划已经进入第七阶段。我们将铺设舰体的第一条龙骨，这对舰体完整性至关重要。\n§Y在这一阶段不加干预仍将正常进行，不过进行一些小小的投资能够加快这一进程。§!"
+ rg_story.36.a:0 "继续"
+ rg_story.36.b:0 "§Y投资额外材料§!"
+
+ rg_story.37.title:0 "§Y第八阶段：舰体主结构铺设§!"
+ rg_story.37.desc:0 "我们的计划已经进入第八阶段。在这一阶段我们将为舰体铺设强化装甲。舰船已经初具雏形。\n§Y在这一阶段不加干预仍将正常进行，不过进行一些小小的投资能够加快这一进程。§!"
+ rg_story.37.a:0 "即将完成..."
+ rg_story.37.b:0 "§Y投资额外材料§!"
+
+ rg_story.38.title:0 "§Y第九阶段：超空间引擎验证§!"
+ rg_story.38.desc:0 "我们的计划已经进入第九阶段。在这一阶段我们需要设计一种超级规模的超空间引擎供旗舰使用。嗯，可能会出岔子。\n§Y在这一阶段不加干预仍将正常进行，不过投资建造试验舰将能够加快这一进程。§!"
+ rg_story.38.a:0 "应该不会出问题的...吧？"
+ rg_story.38.b:0 "§Y投资额外材料§!"
+
+ rg_story.39.title:0 "§Y第十阶段：子系统吊装§!"
+ rg_story.39.desc:0 "我们的计划已经进入第十阶段。我们需要设计并安装舰船光环投射器，隐形阵列等软设备。\n§Y在这一阶段不加干预仍将正常进行，不过进行一些小小的投资能够加快这一进程。§!"
+ rg_story.39.a:0 "就这样了"
+ rg_story.39.b:0 "§Y投资额外材料§!"
+
+ rg_story.40.title:0 "§Y第十一阶段：全舰纳米化设计§!"
+ rg_story.40.desc:0 "我们的计划已经进入第十一阶段。在这一阶段，我们需要帮助$NAME_Gray$进行舰体纳米化蓝图设计来让$NAME_Gray$能够自由变换自身形态。倘若一切顺利，我们的计划即将接近尾声。\n§Y在这一阶段不加干预仍将正常进行，不过进行一些小小的投资能够加快这一进程。§!"
+ rg_story.40.a:0 "就这样了"
+ rg_story.40.b:0 "§Y投资额外材料§!"
+
+ rg_story.41.title:0 "§Y第十二阶段：最终试航§!"
+ rg_story.41.desc:0 "我们的计划已经进入最终阶段。我们的旗舰改造项目已经基本完成，接下来就是实际试航的阶段。如果一切顺利，那就一切顺利。\n§Y在这一阶段我们需要执行小灰改造计划。§!"
+ rg_story.41.a:0 "启动计划"
+
+ rg_story.42.title:0 "§Y第十三阶段：居住区划设计§!"
+ rg_story.42.desc:0 "我们的计划已经进入基本完成，作为追加选项，我们可以对旗舰进行主宰改造。但这需要我们进行额外的投资。在这一阶段我们将制造一个能够容纳大量人口居住的宜居仓段。\n§Y在这一阶段不加干预仍将正常进行，不过进行一些小小的投资能够加快这一进程。§!"
+ rg_story.42.a:0 "就这样了"
+ rg_story.42.b:0 "§Y投资额外材料§!"
+
+ rg_story.43.title:0 "§Y第十四阶段：主宰船坞铺设§!"
+ rg_story.43.desc:0 "我们的计划已经进入基本完成，作为追加选项，我们可以对旗舰进行主宰改造。我不知道，我编不出来了。\n§Y在这一阶段我们需要执行小灰改造计划。§!"
+ rg_story.43.a:0 "就这样了"
+ rg_story.43.b:0 "§Y投资额外材料§!"
+
--- a/localisation/simp_chinese/RG_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_l_simp_chinese.yml
@@ -18,6 +18,9 @@
 RG_leader_trait_general_gray_skill:0 "§Y风暴将至§!"
 RG_leader_trait_general_gray_skill_desc:0 "灰色风暴在L星团中席卷无数纪元。倘若风暴再度到来，想必那星球上的人们所看到的景色一定永生难忘吧。"
 RG_leader_trait_tempest_incoming_effect:0 "\n$t$§Y每击杀一个敌军单位§!：\n$tt$§G  额外陆军伤害 +5%§!\n§G  额外陆军生命值 +5%§!$t$\n当前BUFF层数：§G[owner.rg_general_skill_combat_daypassed_variable]§!£time£\n$tt$§G直接击杀一支敌对陆军的概率增加：§!§Y1%§!\n当前概率为：§R[owner.rg_general_skill_combat_killed_variable]%§!"
+ RG_leader_trait_admiral_nanorebuild_gray:0 "§Y灰质重塑§!"
+ RG_leader_trait_admiral_nanorebuild_gray_desc:0 "分解与重组，纳米机器席卷之处我们无所不能。"
+ RG_leader_trait_admiral_nanorebuild_effect:0 "\n$t$§Y每击杀一个敌军单位§!：\n$t$§G重组计数器 +1§!\n$t$当前计数器层数：§G[owner.rg_nanorebuild_counter]§!\n$tt$§Y该领袖所在舰队损失舰船时：消耗1计数器层数立即重塑舰船。灰风母舰无法被该技能重组。§!"

 SMALL_GRAY_MIX_ARMOR:0 "§Y纳米能量装甲§!"
 MEDIUM_GRAY_MIX_ARMOR:0 "§Y纳米能量装甲§!"
@@ -238,6 +241,9 @@
 tech_gray_army_7:0 "§Y自演化纳米战体§!"
 tech_gray_army_7_desc:0 "通过植入一些低级自演化程序，结合对纳米物质的了解，我们能够小批量生产一些纳米战体作为陆军投放。"

+ tech_gray_juggernaut_8:0 "§Y纳米超宏舰系统§!"
+ tech_gray_juggernaut_8_desc:0 "纳米物质的自构特性使得它们能够用来建造一些规模无以伦比的工程。而我们将踏出第一步。"
+
 RG_PLANET_KILLER:0 "§H远星之歌§!"
 RG_PLANET_KILLER_DESC:0 "§Y发射高能级纳米射线蒸发行星大气，彻底污染星球上所有物体。以恒星级功率发射时，剧烈的扰动将摧毁恒星引发超新星爆炸，并污染星系中所有行星。若将能量重定向到敌舰上，将造成难以置信的伤害。§!"
 RG_PLANET_KILLER_ACTION:0 "§H纳米注入§!"
@@ -331,16 +337,8 @@
 MESSAGE_KOGASA_VIRUS_EXTERMINATED:0 "§R检测到伞病毒威胁§!"
 rg_kogasa_exterminated_desc:0 "守护进程检测到$NAME_Gray$人格完整性遭到篡改，污染目标已被净化，处理方案：无害化处理。"

- situation_rg_gray_mod1:0 "$RG_GRAY_MOD1$"
- situation_rg_gray_mod1_desc:0 "由于L星团资源太缺乏，$NAME_Gray$的舰体已经很久没有维护了。通过调集足够的资源$NAME_Gray$能够将母舰状态恢复到完全体。为了执行这项计划，$NAME_Gray$需要我们的工程团队的帮助。"
-
- situation_rg_gray_mod1_finish_tooltip:0 "§Y我们的计划按部就班地顺利完成。§!"
- situation_rg_gray_mod1_stage_1_tooltip:0 "$rg_story.23.desc$"
- situation_rg_gray_mod1_stage_2_tooltip:0 "$rg_story.24.desc$"
- situation_rg_gray_mod1_stage_3_tooltip:0 "$rg_story.25.desc$"
- situation_rg_gray_mod1_stage_4_tooltip:0 "$rg_story.26.desc$"
- situation_rg_gray_mod1_stage_5_tooltip:0 "$rg_story.27.desc$"
- situation_rg_gray_mod1_stage_6_tooltip:0 "$rg_story.28.desc$"
+ situation_rg_gray_mod1:0 "§Y$NAME_Gray$改造工程§!"
+ situation_rg_gray_mod1_desc:0 "由于L星团资源太缺乏，$NAME_Gray$的舰体已经很久没有维护了。通过调集足够的资源$NAME_Gray$能够将母舰状态恢复到完全体。为了执行这项计划，$NAME_Gray$需要我们的工程团队的帮助。\n§R切换$NAME_Gray$形态将会导致计划失败。§!"

 situation_rg_gray_mod1_stage_1:0 "§Y第一阶段：基本舰体修复阶段§!"
 situation_rg_gray_mod1_stage_2:0 "§Y第二阶段：武器载点重构阶段§!"
@@ -349,13 +347,71 @@
 situation_rg_gray_mod1_stage_5:0 "§Y第五阶段：全舰纳米化设计阶段§!"
 situation_rg_gray_mod1_stage_6:0 "§Y第六阶段：最终试航阶段§!"

+ situation_rg_gray_mod1_stage_1_tooltip:0 "$rg_story.23.desc$"
+ situation_rg_gray_mod1_stage_2_tooltip:0 "$rg_story.24.desc$"
+ situation_rg_gray_mod1_stage_3_tooltip:0 "$rg_story.25.desc$"
+ situation_rg_gray_mod1_stage_4_tooltip:0 "$rg_story.26.desc$"
+ situation_rg_gray_mod1_stage_5_tooltip:0 "$rg_story.27.desc$"
+ situation_rg_gray_mod1_stage_6_tooltip:0 "$rg_story.28.desc$"
+
+ situation_rg_gray_mod1_monthly_change_tooltip:0 "§Y我们正在稳步推进改造项目。§!"
+ situation_rg_gray_mod1_finish_tooltip:0 "§Y我们的计划按部就班地顺利完成。§!"
+
+ situation_rg_gray_mod2_monthly_change_tooltip:0 "§Y我们正在稳步推进改造项目。§!"
+ situation_rg_gray_mod2_finish_tooltip:0 "§Y我们的计划按部就班地顺利完成。§!"
+
 situation_rg_gray_mod1_approach_1:0 "按计划执行"
 situation_rg_gray_mod1_approach_2:0 "暂停执行计划"
- situation_rg_gray_mod1_approach_1_tooltip:0 "§Y我们的项目将会按计划按部就班执行。§!"
- situation_rg_gray_mod2_approach_2_tooltip:0 "§Y迫于外部压力，我们需要暂缓执行改造项目。§!"
+ situation_rg_gray_mod1_approach_3:0 "放弃执行计划"
+ situation_rg_gray_mod1_approach_1_tooltip:0 "§G我们的项目将会按计划按部就班执行。§!"
+ situation_rg_gray_mod1_approach_2_tooltip:0 "§Y迫于外部压力，我们需要暂缓执行改造项目。§!"
+ situation_rg_gray_mod1_approach_3_tooltip:0 "§R我们遇到了使计划难以为继的困难，不得不暂时中止计划等待下一个时机。§!"

- situation_rg_gray_mod1_stage_1_booster_tooltip:0 "§Y我们的项目获得了额外预算§!"
- situation_rg_gray_mod1_stage_2_booster_tooltip:0 "§Y我们的工程团队将会被指派帮助改造项目§!"
- situation_rg_gray_mod1_stage_3_booster_tooltip:0 "§Y由于我们的计划缺少预算，项目团队只能用想象力来弥补不足...§!"
- situation_rg_gray_mod1_stage_5_booster_tooltip:0 "§Y我们的物理团队将会被指派帮助改造项目§!"
- situation_rg_gray_mod1_stage_6_booster_tooltip:0 "§Y我们需要实际开始执行改造项目§!"
+ situation_rg_gray_mod1_stage_1_booster_tooltip:0 "§G我们的项目获得了额外预算§!"
+ situation_rg_gray_mod1_stage_2_booster_tooltip:0 "§G我们的工程团队被指派帮助改造项目§!"
+ situation_rg_gray_mod1_stage_3_booster_tooltip:0 "§R由于我们的计划缺少预算，项目团队只能用想象力来弥补不足§!"
+ situation_rg_gray_mod1_stage_5_booster_tooltip:0 "§G我们的物理团队被指派帮助改造项目§!"
+ situation_rg_gray_mod1_stage_6_booster_tooltip:0 "§Y我们需要实际开始执行改造项目§!"
+
+ situation_rg_gray_mod2_stage_1_booster_tooltip:0 "§G我们的科研团队被指派帮助改造项目§!"
+ situation_rg_gray_mod2_stage_2_booster_tooltip:0 "§G我们的项目获得了额外预算§!"
+ situation_rg_gray_mod2_stage_3_booster_tooltip:0 "§G我们的项目被批准建造试验船§!"
+
+ situation_rg_gray_mod2:0 "§Y$NAME_Gray$旗舰改造工程§!"
+ situation_rg_gray_mod2_desc:0 "我们的科学家相信，随着我们对$NAME_Gray$舰体和科技的研究成果的积累，我们能够设计一种巨型的旗舰舰体。如果取得成功，$NAME_Gray$母舰将获得足以匹敌堕落帝国的战斗力。为了这项伟大的项目，我们需要调集巨量的资源。一旦资源准备妥当，项目可以立即开始\n§H这是一项长期工程，因此切换$NAME_Gray$形态不会导致计划失败。§!"
+
+ situation_rg_gray_mod2_stage_1:0 "§Y第一阶段：基本力学验证阶段§!"
+ situation_rg_gray_mod2_stage_2:0 "§Y第二阶段：纳米构成研究阶段§!"
+ situation_rg_gray_mod2_stage_3:0 "§Y第三阶段：工程场地建设阶段§!"
+ situation_rg_gray_mod2_stage_4:0 "§Y第四阶段：反应堆稳定研究阶段§!"
+ situation_rg_gray_mod2_stage_5:0 "§Y第五阶段：主武器载点设计阶段§!"
+ situation_rg_gray_mod2_stage_6:0 "§Y第六阶段：舱室布局设计阶段§!"
+ situation_rg_gray_mod2_stage_7:0 "§Y第七阶段：舰体龙骨铺设阶段§!"
+ situation_rg_gray_mod2_stage_8:0 "§Y第八阶段：舰体主结构铺设阶段§!"
+ situation_rg_gray_mod2_stage_9:0 "§Y第九阶段：超空间引擎验证阶段§!"
+ situation_rg_gray_mod2_stage_10:0 "§Y第十阶段：子系统吊装阶段§!"
+ situation_rg_gray_mod2_stage_11:0 "§Y第十一阶段：全舰纳米化设计阶段§!"
+ situation_rg_gray_mod2_stage_12:0 "§Y第十二阶段：最终试航阶段§!"
+ situation_rg_gray_mod2_stage_13:0 "§Y第十三阶段：居住区划设计阶段§!"
+ situation_rg_gray_mod2_stage_14:0 "§Y第十四阶段：主宰船坞铺设阶段§!"
+
+ situation_rg_gray_mod2_stage_1_tooltip:0 "$rg_story.30.desc$"
+ situation_rg_gray_mod2_stage_2_tooltip:0 "$rg_story.31.desc$"
+ situation_rg_gray_mod2_stage_3_tooltip:0 "$rg_story.32.desc$"
+ situation_rg_gray_mod2_stage_4_tooltip:0 "$rg_story.33.desc$"
+ situation_rg_gray_mod2_stage_5_tooltip:0 "$rg_story.34.desc$"
+ situation_rg_gray_mod2_stage_6_tooltip:0 "$rg_story.35.desc$"
+ situation_rg_gray_mod2_stage_7_tooltip:0 "$rg_story.36.desc$"
+ situation_rg_gray_mod2_stage_8_tooltip:0 "$rg_story.37.desc$"
+ situation_rg_gray_mod2_stage_9_tooltip:0 "$rg_story.38.desc$"
+ situation_rg_gray_mod2_stage_10_tooltip:0 "$rg_story.39.desc$"
+ situation_rg_gray_mod2_stage_11_tooltip:0 "$rg_story.40.desc$"
+ situation_rg_gray_mod2_stage_12_tooltip:0 "$rg_story.41.desc$"
+ situation_rg_gray_mod2_stage_13_tooltip:0 "$rg_story.42.desc$"
+ situation_rg_gray_mod2_stage_14_tooltip:0 "$rg_story.43.desc$"
+
+ rg_gray_mod2_stage1_project:0 "§Y指派首席科学家帮助改造项目§!"
+ rg_gray_mod2_stage1_project_desc:0 "为了加快$NAME_Gray$改造项目进度，我们需要指派我们的科学家研究这个项目。嗯，就是这样。" 
+
+ rg_gray_mod2_stage4_project:0 "$rg_gray_mod2_stage1_project$"
+ rg_gray_mod2_stage4_project_desc:0 "$rg_gray_mod2_stage1_project_desc$"
--- a/localisation/simp_chinese/RG_ships_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_ships_l_simp_chinese.yml
@@ -33,6 +33,7 @@
 NAME_RG_GRAY_scienceship:0 "纳米机器科研单元"
 NAME_Gray_Warship_base:0 "略有磨损的纳米机器个体"
 NAME_Gray_Warship:0 "纳米机器个体"
+ NAME_Gray_Warship_rg:0 "$NAME_Gray_Warship$"
 NAME_gray_capitalship:0 "纳米机器终端核心"
 NAME_gray_juggernautship:0 "纳米机器中央处理核心"
 NAME_RG_GRAY_constructor:0 "纳米机器工造单元"
@@ -60,3 +61,5 @@
 NAME_RG_Nanite_Dragon:0 "§Y模拟模拟龙§!"
 Name_rg_fake_dragon:0 "§Y模拟龙§!"
 NAME_RG_FAKE_Dragon:0 "龙之幼体"
+ NAME_rg_gray_habitat:0 "纳米机器核心站点"
+ NAME_rg_gray_habitat_base:0 "纳-迪-沙空间站点"
Author	SHA1	Message	Date
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	62346f1646	暂存	2023-06-27 22:45:33 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	2d1edf15b8	暂存	2023-06-24 15:07:12 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	d7e34a789b	暂存	2023-06-21 13:08:31 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	0f0e2f8fc8	zc	2023-06-21 12:58:32 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	f9553b97d2	暂存	2023-06-21 12:40:53 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	fce296c7a0	开局事件改动	2023-06-21 12:39:36 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	3e37da9379	暂存	2023-06-21 12:34:44 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	1abedd9510	总之是坏的	2023-06-20 14:34:40 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	3cc7c6b4ef	暂存	2023-06-20 14:05:14 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	4cae3bfc19	清理	2023-06-16 11:19:12 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	f16086c2db	清理弃用flag	2023-06-15 22:40:33 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	804fefc917	setspecies	2023-06-15 21:48:11 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	28a9d51ca9	清理无用文件	2023-06-15 15:00:54 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	58ed0a3f1a	Merge branch 'master' of https://cloud.armorrush.com/Kalospacer/realgray-stellaris-mod	2023-06-14 22:17:22 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	9b31d1abc0	俺寻思这么能行	2023-06-14 22:17:19 +08:00
Kalospacer	676effd682	fix l drake	2023-06-14 12:57:34 +00:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	525867a6d9	暂存	2023-06-14 17:15:05 +08:00
Kalospacer	0104f3237d	Merge branch 'master' of https://cloud.armorrush.com/kalospacer/realgray-stellaris-mod	2023-06-14 01:40:30 +00:00
Kalospacer	61d914c66e	trait change	2023-06-14 01:38:04 +00:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	9177b3e215	fix	2023-06-12 19:50:07 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	6a6c848751	r	2023-06-12 15:14:31 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	fac04a1386	rr	2023-06-12 15:04:08 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	7705256be5	暂存	2023-06-12 15:03:29 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	8e4f17253a	补名字	2023-06-12 11:48:07 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	0357e98241	fix	2023-06-12 11:40:30 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	f1f9fa7ed7	r	2023-06-12 11:25:02 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	c114cd6773	暂存	2023-06-12 11:21:42 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	d6fbf32eae	暂存	2023-06-12 10:50:49 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	0d4a971da1	暂存	2023-06-12 10:40:22 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	4a8a26bb7c	暂存	2023-06-12 10:30:34 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	2ac403c1ac	r	2023-06-11 23:46:29 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	3cfb803fd8	暂存	2023-06-11 19:15:46 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	910ffc9cba	再换回领袖看板	2023-06-11 17:53:31 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	7b5b520672	提前收费	2023-06-11 17:42:48 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	4568d320a5	暂存	2023-06-11 17:39:48 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	144b726051	暂存	2023-06-11 16:17:01 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	a708c18df6	r	2023-06-11 16:00:21 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	e48ced2893	暂存	2023-06-11 15:56:54 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	19a8e99a0b	暂存	2023-06-11 15:39:42 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	0a8698882b	暂存	2023-06-11 15:12:30 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	c28c858bb3	暂存	2023-06-11 14:51:17 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	c54b555f2f	暂存	2023-06-11 14:40:20 +08:00