暂存

2023-11-04 15:21:08 +08:00 · 2023-11-04 13:17:46 +08:00 · 2023-10-29 00:50:12 +08:00 · 2023-10-29 00:33:16 +08:00 · 2023-10-28 23:49:01 +08:00 · 2023-10-28 22:19:18 +08:00
61 changed files with 3513 additions and 2892 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_sets/RG_weapon_sets.txt
+++ b/common/component_sets/RG_weapon_sets.txt
@@ -6,7 +6,7 @@ component_set = {

 component_set = {
 	key = "LARGE_GRAY_WEAPON_LANCE"
-	icon = "GFX_ship_part_gray_laser_1"
+	icon = "GFX_ship_weapon_rg_spacetime_disruptor"
 	icon_frame = 1
 }

@@ -36,13 +36,13 @@ component_set = {

 component_set = {
 	key = "LARGE_GRAY_WEAPON_KIN"
-	icon = "GFX_ship_part_autocannon_4"
+	icon = "GFX_ship_weapon_phaser_bank"
 	icon_frame = 1
 }

 component_set = {
 	key = "HUGE_GRAY_WEAPON_KIN"
-	icon = "GFX_ship_part_autocannon_4"
+	icon = "GFX_ship_weapon_phaser_bank"
 	icon_frame = 1
 }

@@ -54,7 +54,7 @@ component_set = {

 component_set = {
 	key = "RG_FLAK_PHOENIX"
-	icon = "GFX_ship_part_flak_batteries_3"
+	icon = "GFX_ship_part_graymine_old"
 	icon_frame = 1
 }

@@ -72,7 +72,7 @@ component_set = {

 component_set = {
 	key = "RG_CARRIER_RADAR"
-	icon = "GFX_ship_part_sensor_1"
+	icon = "GFX_ship_part_gray_sensor"
 	icon_frame = 1
 }

@@ -90,7 +90,7 @@ component_set = {

 component_set = {
 	key = "RG_BOMBER_HANGAR_ATTACK_ROCKET"
-	icon = "STRIKE_CRAFT_HANGAR_3"
+	icon = "GFX_ship_part_strike_craft_bomber_3"
 	icon_frame = 1
 }

--- a/common/component_templates/RG_interdictor_parts.txt
+++ b/common/component_templates/RG_interdictor_parts.txt
@@ -19,10 +19,14 @@ utility_component_template = {
 	}
 	component_set = "power_core"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_FUSION_REACTOR"
 	ai_weight = {
@@ -51,10 +55,14 @@ utility_component_template = {
 	}
 	component_set = "power_core"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		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 = {
@@ -83,10 +91,14 @@ utility_component_template = {
 	}
 	component_set = "power_core"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_ANTIMATTER_REACTOR"
 	ai_weight = {
@@ -115,10 +127,14 @@ utility_component_template = {
 	}
 	component_set = "power_core"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		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 = {
@@ -147,6 +163,8 @@ utility_component_template = {
 	}
 	component_set = "power_core"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_icebreaker_interdictor
@@ -210,6 +228,8 @@ utility_component_template = {
 	}
 	component_set = "power_core"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_icebreaker_interdictor
@@ -278,7 +298,11 @@ utility_component_template = {
 			alloys = 0.08
 		}
 	}
+	prerequisites = {
+		"tech_gray_matter_spray_5"
+	}
 	component_set = "power_core"
+	upgrades_to = "RG_Arsenal_FUSION_NANO_REACTOR"
 	size_restriction = {
 		RG_graygoo_Arsenal
 	}
@@ -287,6 +311,38 @@ utility_component_template = {
 	}
 }

+utility_component_template = {
+	key = "RG_Arsenal_FUSION_NANO_REACTOR"
+	size = small
+	icon = "GFX_ship_part_gray_reactor"
+	icon_frame = 1
+	power = 600
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 80
+			nanties = 2
+		}
+		upkeep = {
+			energy = 0.8
+		}
+	}
+	component_set = "power_core"
+	prerequisites = {
+		"tech_gray_nano_fusion_3"
+		"tech_gray_matter_spray_5"
+	}
+	tags = {
+		weapon_type_rg_reactor
+	}
+	size_restriction = {
+		RG_graygoo_Arsenal
+	}
+	ai_weight = {
+		weight = 0
+	}
+}
+
 utility_component_template = {
 	key = "RG_ID_SHIP_THRUSTER_1"
 	size = small
@@ -306,6 +362,8 @@ utility_component_template = {
 	}
 	component_set = "thruster_components"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
@@ -341,6 +399,8 @@ utility_component_template = {
 	}
 	component_set = "thruster_components"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
@@ -376,6 +436,8 @@ utility_component_template = {
 	}
 	component_set = "thruster_components"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
@@ -411,6 +473,8 @@ utility_component_template = {
 	}
 	component_set = "thruster_components"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
@@ -447,6 +511,8 @@ utility_component_template = {
 	}
 	component_set = "thruster_components"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
@@ -640,6 +706,8 @@ utility_component_template = {
 	}
 	component_set = "power_core"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_mothership
@@ -675,6 +743,8 @@ utility_component_template = {
 	}
 	component_set = "thruster_components"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
@@ -716,6 +786,8 @@ utility_component_template = {
 	}
 	component_set = "power_core"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_mothership
@@ -750,6 +822,8 @@ utility_component_template = {
 	}
 	component_set = "thruster_components"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
@@ -791,6 +865,8 @@ utility_component_template = {
 	}
 	component_set = "power_core"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
@@ -826,6 +902,8 @@ utility_component_template = {
 	}
 	component_set = "thruster_components"
 	size_restriction = {
+		RG_armed_science_ship
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
--- a/common/component_templates/RG_ship_parts.txt
+++ b/common/component_templates/RG_ship_parts.txt
@@ -16,10 +16,13 @@ utility_component_template = {
 		ship_shield_regen_add_perc = 0.1
 	}
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_matter_remix_2"
@@ -38,6 +41,9 @@ utility_component_template = {
 			alloys = 2
 		}
 	}
+	ai_weight = {
+		weight = 0
+	}
 }

 #超限聚合装甲
@@ -78,6 +84,9 @@ utility_component_template = {
 			alloys = 2
 		}
 	}
+	ai_weight = {
+		weight = 0
+	}
 }

 #L槽光矛
@@ -86,7 +95,7 @@ weapon_component_template = {
 	size = large
 	entity = "invisible_turret_entity"
 	type = instant
-	icon = "GFX_ship_part_gray_laser_1"
+	icon = "GFX_ship_weapon_rg_spacetime_disruptor"
 	icon_frame = 1
 	damage = {
 		min = 120
@@ -108,10 +117,8 @@ weapon_component_template = {
 	tags = {
 		weapon_type_rg_secondary
 	}
-	shield_damage = 1.2
 	armor_damage = 1.2
 	shield_penetration = 1
-	armor_penetration = 1
 	resources = {
 		category = ship_components
 		cost = {
@@ -127,6 +134,9 @@ weapon_component_template = {
 	tags = {
 		weapon_type_energy
 	}
+	ai_weight = {
+		weight = 0
+	}
 }

 #S槽光矛Mini
@@ -138,8 +148,8 @@ weapon_component_template = {
 	icon = "GFX_ship_part_gray_laser_1"
 	icon_frame = 1
 	damage = {
-		min = 20
-		max = 200
+		min = 40
+		max = 400
 	}
 	windup = {
 		min = 1
@@ -157,8 +167,8 @@ weapon_component_template = {
 	tags = {
 		weapon_type_rg_secondary
 	}
+	armor_damage = 1.2
 	shield_penetration = 1
-	armor_penetration = 1
 	resources = {
 		category = ship_components
 		cost = {
@@ -173,6 +183,58 @@ weapon_component_template = {
 	tags = {
 		weapon_type_energy
 	}
+	ai_weight = {
+		weight = 0
+	}
+}
+
+#M槽光矛Mini
+weapon_component_template = {
+	key = "MEDIUM_GRAY_WEAPON_LANCE"
+	size = medium
+	entity = "invisible_turret_entity"
+	type = instant
+	icon = "GFX_ship_part_gray_laser_1"
+	icon_frame = 1
+	damage = {
+		min = 100
+		max = 1000
+	}
+	windup = {
+		min = 1
+		max = 5
+	}
+	total_fire_time = 55
+	range = 120
+	accuracy = 0.85
+	tracking = 0.4
+	power = -50
+	component_set = "SMALL_GRAY_WEAPON_LANCE"
+	prerequisites = {
+		"tech_minilaser_gray_1"
+	}
+	tags = {
+		weapon_type_rg_secondary
+	}
+	armor_damage = 1.2
+	shield_penetration = 1
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 25
+		}
+		upkeep = {
+			energy = 1.2
+			alloys = 1
+		}
+	}
+	projectile_gfx = "gatebuilder_lance_weapon"
+	tags = {
+		weapon_type_energy
+	}
+	ai_weight = {
+		weight = 0
+	}
 }

 #X槽光矛Mini
@@ -196,8 +258,8 @@ weapon_component_template = {
 	total_fire_time = 100
 	range = 200
 	accuracy = 1
+	armor_damage = 1.2
 	shield_penetration = 1
-	armor_penetration = 1
 	tracking = 0.4
 	power = -600
 	component_set = "GRAY_BEAM_STATIC_MX"
@@ -222,6 +284,9 @@ weapon_component_template = {
 		weapon_type_energy
 	}
 	projectile_gfx = "gatebuilder_lance_weapon"
+	ai_weight = {
+		weight = 0
+	}
 }

 #X槽光矛
@@ -245,10 +310,8 @@ weapon_component_template = {
 	total_fire_time = 100
 	range = 250
 	accuracy = 1
-	shield_damage = 1.5
-	armor_damage = 1.5
+	armor_damage = 1.2
 	shield_penetration = 1
-	armor_penetration = 1
 	tracking = 0.4
 	power = -600
 	component_set = "GRAY_BEAM_STATIC_X"
@@ -273,6 +336,9 @@ weapon_component_template = {
 		weapon_type_energy
 	}
 	projectile_gfx = "gatebuilder_lance_weapon"
+	ai_weight = {
+		weight = 0
+	}
 }

 #歼星武器
@@ -320,14 +386,12 @@ weapon_component_template = {
 	}
 	size_restriction = {
 		RG_graygoo_capitalship
-		RG_graygoo_mothership
 		RG_gray_juggernaut
 	}
 	component_set = "RG_PLANET_KILLER"
 	prerequisites = {
 		"tech_gray_juggernaut_8"
 	}
-	hidden = yes
 	ship_limit = 1
 	ai_weight = {
 		weight = 0
@@ -414,8 +478,8 @@ weapon_component_template = {
 	total_fire_time = 200
 	range = 400
 	accuracy = 1
-	shield_damage = 1.5
-	armor_damage = 1.5
+	shield_damage = 1.2
+	armor_damage = 1.2
 	shield_penetration = 1
 	armor_penetration = 1
 	tracking = 0.4
@@ -442,6 +506,9 @@ weapon_component_template = {
 		weapon_type_energy
 	}
 	projectile_gfx = "gatebuilder_titan_weapon_ex"
+	ai_weight = {
+		weight = 0
+	}
 }

 #点防
@@ -461,7 +528,7 @@ weapon_component_template = {
 	}
 	total_fire_time = 4
 	range = 110
-	shield_penetration = 1
+	shield_damage = 1.2
 	armor_penetration = 1
 	accuracy = 1
 	tracking = 0.8
@@ -503,7 +570,7 @@ weapon_component_template = {
 	type = point_defence
 	key = "RG_FLAK_PHOENIX"
 	size = point_defence
-	icon = GFX_ship_part_deluge
+	icon = "GFX_ship_part_graymine_old"
 	icon_frame = 1
 	damage = {
 		min = 10200
@@ -563,7 +630,7 @@ weapon_component_template = {
 	type = instant
 	use_ship_kill_target = no
 	component_set = "LARGE_GRAY_WEAPON_KIN"
-	icon = "GFX_ship_part_autocannon_4"
+	icon = "GFX_ship_weapon_phaser_bank"
 	icon_frame = 1
 	damage = {
 		min = 2000
@@ -590,9 +657,8 @@ weapon_component_template = {
 	tags = {
 		weapon_type_rg_secondary
 	}
-	shield_damage = 1.2
+	armor_damage = 1.2
 	shield_penetration = 1
-	armor_penetration = 0.5
 	resources = {
 		category = ship_components
 		cost = {
@@ -607,6 +673,9 @@ weapon_component_template = {
 	tags = {
 		weapon_type_kinetic
 	}
+	ai_weight = {
+		weight = 0
+	}
 }

 #一次性动能炮-聚合
@@ -617,7 +686,7 @@ weapon_component_template = {
 	type = instant
 	use_ship_kill_target = no
 	component_set = "HUGE_GRAY_WEAPON_KIN"
-	icon = "GFX_ship_part_autocannon_4"
+	icon = "GFX_ship_weapon_phaser_bank"
 	icon_frame = 1
 	damage = {
 		min = 20000
@@ -644,9 +713,8 @@ weapon_component_template = {
 	tags = {
 		weapon_type_rg_secondary
 	}
-	shield_damage = 1.2
+	armor_damage = 1.2
 	shield_penetration = 1
-	armor_penetration = 0.5
 	resources = {
 		category = ship_components
 		cost = {
@@ -661,6 +729,9 @@ weapon_component_template = {
 	tags = {
 		weapon_type_kinetic
 	}
+	ai_weight = {
+		weight = 0
+	}
 }

 #无制导
@@ -688,19 +759,15 @@ weapon_component_template = {
 	power = -180
 	tags = {
 		weapon_type_energy
+		weapon_type_rg_torpedoe
 	}
 	projectile_gfx = "rg_gatebuilder_torpedo_ballistic"
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
-	tags = {
-		weapon_type_rg_torpedoe
-	}
 	size_damage_factor = 1
-	shield_damage = 1.2
 	armor_damage = 1.2
 	shield_penetration = 1
-	armor_penetration = 1
 	resources = {
 		category = ship_components
 		cost = {
@@ -712,6 +779,9 @@ weapon_component_template = {
 			alloys = 0
 		}
 	}
+	ai_weight = {
+		weight = 0
+	}
 }

 #鱼雷
@@ -737,6 +807,7 @@ weapon_component_template = {
 	power = -180
 	tags = {
 		weapon_type_energy
+		weapon_type_rg_torpedoe
 	}
 	projectile_gfx = "gatebuilder_torpedo"
 	prerequisites = {
@@ -749,10 +820,8 @@ weapon_component_template = {
 	missile_health = 1000
 	missile_retarget_range = 100
 	size_damage_factor = 1
-	shield_damage = 1.2
 	armor_damage = 1.2
 	shield_penetration = 1
-	armor_penetration = 1
 	resources = {
 		category = ship_components
 		cost = {
@@ -775,7 +844,7 @@ weapon_component_template = {
 	size = point_defence
 	entity = "turret_point_defence_entity"
 	type = instant
-	icon = "GFX_ship_part_sensor_1"
+	icon = "GFX_ship_part_gray_sensor"
 	icon_frame = 1
 	damage = {
 		min = 0
@@ -835,6 +904,7 @@ strike_craft_component_template = {
 		}
 	}
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_mothership
 		RG_gray_juggernaut
@@ -864,13 +934,11 @@ strike_craft_component_template = {
 	rotation_speed = 0.25
 	acceleration = 0.6
 	shield_damage = 1.2
-	armor_damage = 1.2
-	shield_penetration = 1
 	armor_penetration = 1
 	weapon_type = instant
 	projectile_gfx = "gatebuilder_titan_weapon_ex"
 	ship_behavior = "rg_bombers_behavior"
-	icon = "GFX_ship_part_strike_craft_skrand"
+	icon = "GFX_ship_weapon_rg_cutting_beam"
 	icon_frame = 1
 	component_set = "RG_BOMBER_HANGAR_ATTACK_ROCKET"
 	tags = {
@@ -903,6 +971,7 @@ strike_craft_component_template = {
 		}
 	}
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_mothership
 		RG_gray_juggernaut
@@ -935,13 +1004,11 @@ strike_craft_component_template = {
 	acceleration = 0.6
 	size_damage_factor = 1
 	shield_damage = 1.2
-	armor_damage = 1.2
-	shield_penetration = 1
 	armor_penetration = 1
 	weapon_type = instant
 	projectile_gfx = "gatebuilder_torpedo"
 	ship_behavior = "rg_bombers_behavior"
-	icon = "GFX_ship_part_strike_craft_skrand"
+	icon = "GFX_ship_weapon_rg_cutting_beam"
 	icon_frame = 1
 	component_set = "RG_BOMBER_HANGAR_NEUTRON_TORPEDO"
 	tags = {
@@ -974,6 +1041,7 @@ strike_craft_component_template = {
 		}
 	}
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_mothership
 		RG_gray_juggernaut
@@ -1005,13 +1073,11 @@ strike_craft_component_template = {
 	acceleration = 0.6
 	size_damage_factor = 1
 	shield_damage = 1.2
-	armor_damage = 1.2
-	shield_penetration = 1
 	armor_penetration = 1
 	weapon_type = instant
 	projectile_gfx = "proton_torpedoes"
 	ship_behavior = "rg_bombers_behavior"
-	icon = "GFX_ship_part_strike_craft_skrand"
+	icon = "GFX_ship_weapon_rg_cutting_beam"
 	icon_frame = 1
 	component_set = "RG_BOMBER_HANGAR_AP_BOMB"
 	tags = {
@@ -1046,6 +1112,7 @@ strike_craft_component_template = {
 		}
 	}
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_mothership
 		RG_gray_juggernaut
@@ -1075,11 +1142,9 @@ strike_craft_component_template = {
 	rotation_speed = 0.25
 	acceleration = 0.6
 	shield_damage = 1.2
-	armor_damage = 1.2
-	shield_penetration = 1
 	armor_penetration = 1
 	ship_behavior = "rg_bombers_behavior"
-	icon = "GFX_ship_part_strike_craft_skrand"
+	icon = "GFX_ship_weapon_rg_cutting_beam"
 	icon_frame = 1
 	component_set = "RG_FIGHTER_HANGAR_BEAM"
 	tags = {
@@ -1109,6 +1174,7 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_colossus"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
@@ -1149,6 +1215,7 @@ utility_component_template = {
 	}
 	ship_behavior = "rg_carrier_behavior"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
@@ -1187,6 +1254,7 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_line"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
@@ -1225,6 +1293,7 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_artillery"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
@@ -1299,6 +1368,7 @@ utility_component_template = {
 	}
 	ship_behavior = "rg_aura_behavior"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
@@ -1338,6 +1408,7 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_battle"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
@@ -1376,6 +1447,7 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_torpedo"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
@@ -1414,6 +1486,7 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_AA"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
@@ -1452,6 +1525,7 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_icebreak"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
@@ -1600,7 +1674,7 @@ utility_component_template = {
 		weapon_type_rg_aux
 	}
 	ai_weight = {
-		weight = 5
+		weight = 0
 	}
 }

@@ -1749,7 +1823,7 @@ weapon_component_template = {
 		}
 	}
 	ai_weight = {
-		weight = 1
+		weight = 0
 	}
 }

@@ -2140,7 +2214,7 @@ weapon_component_template = {
 utility_component_template = {
 	key = "RG_gatebuilder_jump"
 	size = small
-	icon = "GFX_ship_part_warp_drive_3"
+	icon = "GFX_ship_part_mod_warp_drive_3"
 	icon_frame = 1
 	power = -50
 	# hidden = yes
@@ -2150,7 +2224,7 @@ utility_component_template = {
 			alloys = 300
 		}
 	}
-	prerequisites = { "tech_gray_interdictor_4" }
+	prerequisites = { "tech_gray_nano_boost_3" }
 	ftl = yes
 	jumpdrive = yes
 	ship_modifier = {
@@ -2162,10 +2236,7 @@ utility_component_template = {
 		weapon_type_rg_jumpdrive
 	}
 	ai_weight = {
-		weight = 100
-	}
-	class_restriction = {
-		shipclass_military
+		weight = 0
 	}
 	component_set = "ftl_components"
 }
@@ -2174,7 +2245,7 @@ utility_component_template = {
 utility_component_template = {
 	key = "RG_gatebuilder_sensor"
 	size = medium
-	icon = "GFX_ship_part_sensor_4"
+	icon = "GFX_ship_part_gray_sensor"
 	icon_frame = 1
 	power = -20
 	# hidden = yes
@@ -2186,7 +2257,7 @@ utility_component_template = {
 	}
 	sensor_range = 15
 	hyperlane_range = 20
-	prerequisites = { "tech_gray_interdictor_4" }
+	prerequisites = { "tech_gray_matter_remix_2" }
 	ship_modifier = {
 		ship_tracking_add = 20
 	}
@@ -2195,7 +2266,7 @@ utility_component_template = {
 		weapon_type_rg_sensor
 	}
 	ai_weight = {
-		weight = 100
+		weight = 0
 	}
 }

@@ -2203,7 +2274,7 @@ utility_component_template = {
 utility_component_template = {
 	key = "RG_gatebuilder_thruster"
 	size = small
-	icon = "GFX_ship_part_thruster_4"
+	icon = "GFX_ship_part_gray_engine"
 	icon_frame = 1
 	power = -50
 	# hidden = yes
@@ -2213,20 +2284,112 @@ utility_component_template = {
 			alloys = 200
 		}
 	}
-	prerequisites = { "tech_gray_interdictor_4" }
+	prerequisites = { "tech_gray_nano_boost_3" }
 	modifier = {
 		ship_speed_mult = 1.25
 		ship_evasion_add = 10
 	}
 	component_set = "thruster_components"
-	class_restriction = {
-		shipclass_military
-	}
 	tags = {
 		weapon_type_rg_thruster
 	}
 	ai_weight = {
-		weight = 100
+		weight = 0
+	}
+}
+
+#反应堆
+utility_component_template = {
+	key = "RG_FUSION_NANO_REACTOR_S"
+	size = small
+	icon = "GFX_ship_part_gray_reactor"
+	icon_frame = 1
+	power = 4800
+	resources = {
+		category = ship_components
+		cost = {
+			nanties = 12
+			alloys = 120
+		}
+		upkeep = {
+			energy = 2.0
+		}
+	}
+	prerequisites = {
+		"tech_gray_nano_fusion_3"
+	}
+	tags = {
+		weapon_type_rg_reactor
+	}
+	component_set = "power_core"
+	ai_weight = {
+		weight = 0
+	}
+}
+
+utility_component_template = {
+	key = "RG_FUSION_NANO_REACTOR_M"
+	size = small
+	icon = "GFX_ship_part_gray_reactor"
+	icon_frame = 1
+	power = 9600
+	resources = {
+		category = ship_components
+		cost = {
+			nanties = 24
+			alloys = 120
+		}
+		upkeep = {
+			energy = 3.0
+		}
+	}
+	prerequisites = {
+		"tech_gray_nano_fusion_3"
+	}
+	tags = {
+		weapon_type_rg_reactor
+	}
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_interdictor
+		RG_graygoo_Buff
+		RG_graygoo_mothership
+		RG_graygoo_icebreaker_interdictor
+	}
+	ai_weight = {
+		weight = 0
+	}
+}
+
+utility_component_template = {
+	key = "RG_FUSION_NANO_REACTOR_L"
+	size = small
+	icon = "GFX_ship_part_gray_reactor"
+	icon_frame = 1
+	power = 280000
+	resources = {
+		category = ship_components
+		cost = {
+			nanties = 120
+			alloys = 120
+		}
+		upkeep = {
+			energy = 5.0
+		}
+	}
+	prerequisites = {
+		"tech_gray_nano_fusion_3"
+	}
+	tags = {
+		weapon_type_rg_reactor
+	}
+	component_set = "power_core"
+	size_restriction = {
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	ai_weight = {
+		weight = 0
 	}
 }

@@ -2269,9 +2432,11 @@ utility_component_template = {
 		RG_graygoo_mothership
 	}
 	prerequisites = {
-		"tech_cloaking_3"
+		"tech_gray_cloaking_3"
 	}
 	ship_limit = 1
-	hidden = yes
 	component_set = "science_cloaking_components"
+	ai_weight = {
+		weight = 0
+	}
 }
--- 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
@@ -147,7 +147,7 @@ ship_design = {
 			template = "RG_ENIGMATIC_SCHEDULER"
 		}
 	}
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
@@ -326,7 +326,7 @@ ship_design = {
 		}
 	}
 	required_component = "RG_gatebuilder_sensor"
-	required_component = "TITAN_ANTIMATTER_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_L"
 	required_component = "COMBAT_COMPUTER_PLATFORM_ADVANCED"
 }

@@ -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"
 }
@@ -981,7 +549,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_torpedo"
 }

@@ -1141,7 +709,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_CARRIER"
 }

@@ -1248,7 +816,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_torpedo"
 }

@@ -1312,7 +880,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_torpedo"
 }

@@ -1445,7 +1013,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_torpedo"
 }

@@ -1509,7 +1077,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_torpedo"
 }

--- a/common/global_ship_designs/RG_graygoo_ship_designs.txt
+++ b/common/global_ship_designs/RG_graygoo_ship_designs.txt
@@ -20,15 +20,15 @@ ship_design = {
 		}
 		component = {
 			slot = "MEDIUM_GUN_01"
-			template = "SMALL_GRAY_WEAPON_LANCE"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
 		}
 		component = {
 			slot = "MEDIUM_GUN_02"
-			template = "SMALL_GRAY_WEAPON_LANCE"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
 		}
 		component = {
 			slot = "MEDIUM_GUN_03"
-			template = "SMALL_GRAY_WEAPON_LANCE"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
 		}
 		component = {
 			slot = "LARGE_GUN_01"
@@ -251,7 +251,7 @@ ship_design = {
 			template = "RG_ENIGMATIC_SCHEDULER"
 		}
 	}
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
@@ -841,7 +841,7 @@ ship_design = {
 			template = "RG_ENGINE_BOOSTER"
 		}
 	}
-	required_component = "COLOSSUS_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_L"
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
@@ -1433,7 +1433,7 @@ ship_design = {
 			template = "RG_ENGINE_BOOSTER"
 		}
 	}
-	required_component = "COLOSSUS_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_L"
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
@@ -1505,7 +1505,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_CARRIER"
 }

@@ -1569,7 +1569,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_battle"
 }

@@ -1613,7 +1613,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_artillery"
 }

@@ -1669,7 +1669,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_CHARGE"
 }

@@ -1733,7 +1733,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_torpedo"
 }

@@ -1817,7 +1817,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_AA"
 }

@@ -1861,7 +1861,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_aura"
 	required_component = "RG_ANTIBAKAHALO"
 	required_component = "RG_BAKAHALO"
@@ -2199,7 +2199,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_battle"
 }

@@ -2259,7 +2259,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_battle"
 }

@@ -2323,7 +2323,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_torpedo"
 }

@@ -2407,7 +2407,7 @@ ship_design = {
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_M"
 	required_component = "RG_COMBAT_COMPUTER_icebreak"
 	required_component = "RG_CORVETTE_CLOAKING_3"
 }
--- a/common/global_ship_designs/RG_ship_designs_starbase.txt
+++ b/common/global_ship_designs/RG_ship_designs_starbase.txt
@@ -87,19 +87,19 @@ ship_design = {
 		}
 		component = {
 			slot = "MEDIUM_GUN_01"
-			template = "SMALL_GRAY_WEAPON_LANCE"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
 		}
 		component = {
 			slot = "MEDIUM_GUN_02"
-			template = "SMALL_GRAY_WEAPON_LANCE"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
 		}
 		component = {
 			slot = "MEDIUM_GUN_03"
-			template = "SMALL_GRAY_WEAPON_LANCE"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
 		}
 		component = {
 			slot = "MEDIUM_GUN_04"
-			template = "SMALL_GRAY_WEAPON_LANCE"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
 		}
 		component = {
 			slot = "PD_01"
@@ -159,7 +159,7 @@ ship_design = {
 		}
 	}
 	required_component = "RG_gatebuilder_sensor"
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_L"
 	required_component = "RG_COMBAT_COMPUTER_COLOSSUS"
 	required_component = "RG_CORVETTE_CLOAKING_3"
 	required_component = "STARBASE_AURA_FTL_INHIBITOR"
@@ -335,7 +335,7 @@ ship_design = {
 		}
 	}
 	required_component = "RG_gatebuilder_sensor"
-	required_component = "TITAN_ANTIMATTER_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_L"
 	required_component = "COMBAT_COMPUTER_PLATFORM_ADVANCED"
 	required_component = "RG_CORVETTE_CLOAKING_3"
 	required_component = "STARBASE_AURA_FTL_INHIBITOR"
--- a/common/global_ship_designs/RG_special_ship_designs.txt
+++ b/common/global_ship_designs/RG_special_ship_designs.txt
@@ -75,7 +75,7 @@ ship_design = {
 			template = "RG_ENGINE_BOOSTER"
 		}
 	}
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_S"
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
@@ -161,7 +161,7 @@ ship_design = {
 			template = "RG_ENGINE_BOOSTER"
 		}
 	}
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_S"
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
@@ -247,7 +247,7 @@ ship_design = {
 			template = "RG_ENGINE_BOOSTER"
 		}
 	}
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_S"
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
@@ -332,7 +332,7 @@ ship_design = {
 			template = "RG_ENGINE_BOOSTER"
 		}
 	}
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_S"
 	required_component = "RG_gatebuilder_jump"
 	required_component = "RG_gatebuilder_sensor"
 	required_component = "RG_gatebuilder_thruster"
@@ -381,7 +381,7 @@ ship_design = {
 			template = ""
 		}
 	}
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_S"
 	required_component = "HYPER_DRIVE_3"
 	required_component = "SENSOR_4"
 	required_component = "RG_gatebuilder_thruster"
@@ -425,7 +425,7 @@ ship_design = {
 			template = "RG_revive_component"
 		}
 	}
-	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_FUSION_NANO_REACTOR_S"
 	required_component = "HYPER_DRIVE_3"
 	required_component = "SENSOR_4"
 	required_component = "RG_gatebuilder_thruster"
@@ -524,3 +524,88 @@ ship_design = {
 	required_component = "GUARDIAN_PROPULSION"
 	required_component = "GUARDIAN_SENSORS"
 }
+
+#运航舰
+ship_design = {
+	name = "NAME_RG_carrier_destroyer"
+	ship_size = RG_armed_transport_ship
+	is_event_design = yes
+	section = {
+		template = "RG_carrier_destroyer_key"
+		slot = "mid"
+		component = {
+			slot = "STRIKE_CRAFT_01"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_02"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		component = {
+			slot = "PD_01"
+			template = "RG_FLAK_BATTERY"
+		}
+		component = {
+			slot = "LARGE_UTILITY_1"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_2"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "AUX_UTILITY_1"
+			template = "RG_AUTO_REPAIR"
+		}
+	}
+	required_component = "RG_FUSION_NANO_REACTOR_S"
+	required_component = "RG_gatebuilder_jump"
+	required_component = "RG_gatebuilder_sensor"
+	required_component = "RG_gatebuilder_thruster"
+	required_component = "RG_COMBAT_COMPUTER_torpedo"
+}
+
+#驱逐舰
+ship_design = {
+	name = "NAME_RG_base_destroyer"
+	ship_size = RG_graygoo_destroyer
+	is_event_design = yes
+	section = {
+		template = "RG_base_destroyer_key"
+		slot = "mid"
+		component = {
+			slot = "MEDIUM_GUN_01"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_02"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_03"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "TORPEDO_01"
+			template = "RG_ENERGY_MISSILE"
+		}
+		component = {
+			slot = "LARGE_UTILITY_1"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_2"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "AUX_UTILITY_1"
+			template = "RG_AUTO_REPAIR"
+		}
+	}
+	required_component = "RG_FUSION_NANO_REACTOR_S"
+	required_component = "RG_gatebuilder_jump"
+	required_component = "RG_gatebuilder_sensor"
+	required_component = "RG_gatebuilder_thruster"
+	required_component = "RG_COMBAT_COMPUTER_torpedo"
+}
+
--- 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
@@ -113,45 +113,6 @@ on_planet_attackers_lose = {
 # 	}
 # }
 # this = country
-on_destroy_planet_with_RG_PLANET_KILLER = {
-	events = {
-		RG_planet_killer.1
-		RG_planet_killer.2
-		origin.3245
-	}
-}
-
-on_destroy_planet_with_RG_PLANET_KILLER_queued = {
-}
-
-on_destroy_planet_with_RG_PLANET_KILLER_unqueued = {
-}
-
-on_destroy_planet_with_RG_PLANET_KILLER_SMALL = {
-	events = {
-		RG_planet_killer.2
-		origin.3245
-	}
-}
-
-on_destroy_planet_with_RG_PLANET_KILLER_SMALL_queued = {
-}
-
-on_destroy_planet_with_RG_PLANET_KILLER_SMALL_unqueued = {
-}
-
-on_destroy_planet_with_RG_PLANET_KILLER_SP = {
-	events = {
-		RG_planet_killer.3
-		rg_story.6
-	}
-}
-
-on_destroy_planet_with_RG_PLANET_KILLER_SP_queued = {
-}
-
-on_destroy_planet_with_RG_PLANET_KILLER_SP_unqueued = {
-}

 #舰船建造完成
 # Root = Ship
@@ -190,5 +151,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/on_actions/RG_planet_destruction.txt
+++ b/common/on_actions/RG_planet_destruction.txt
@@ -0,0 +1,162 @@
+# Scope:
+# this/root = planet that have been fired upon
+# from = fleet that fired
+#on_destroy_planet_with_PLANET_DESTRUCTION_COMPONENT = {
+#	events = {
+#		planet_destruction.1
+#	}
+#}
+
+# Note: The _queued on_actions also fire when the command is made even if there is nothing else in the queue
+# Similarly, the _unqueued on_actions fire even if you cancel the order while the weapon is on the wind-up to fire
+# They use the same scopes as the standard events
+
+on_destroy_planet_with_RG_PLANET_KILLER = {
+	events = {
+		RG_planet_killer.1
+		RG_planet_killer.2
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_queued = {
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_unqueued = {
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_SMALL = {
+	events = {
+		RG_planet_killer.2
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_SMALL_queued = {
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_SMALL_unqueued = {
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_SP = {
+	events = {
+		RG_planet_killer.3
+		rg_story.6
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_SP_queued = {
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_SP_unqueued = {
+}
+# World Cracker
+on_destroy_planet_with_RG_PLANET_KILLER_CRACKER = {
+	events = {
+		toxoids.8016 #Destroyed knight Keep
+		crisis.5015 # Menace Objective - Destroy World/Empire
+		planet_destruction.110
+		origin.3245 # Glassing a Progenitors Nest
+		planet_destruction.600 # frag holy world
+		planet_destruction.100 # goes last because it can kill a country, making some trigger checks impossible
+		awareness.150 # Planet cracker used OR planet terraformed, chance to gain 20 awareness.
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_CRACKER_queued = {
+	events = {
+		fircon.5035 #Solarpunk Planet queued
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_CRACKER_unqueued = {
+}
+# Pacifier
+on_destroy_planet_with_RG_PLANET_KILLER_SHIELDER = {
+	events = {
+		crisis.5015 # Menace Objective - Destroy World/Empire
+		toxoids.8016 #Destroyed knight Keep placed up here so events fire while it's a planet
+		planet_destruction.200
+		planet_destruction.600 # frag holy world
+		origin.3245
+		awareness.150 # Planet cracker used OR planet terraformed, chance to gain 20 awareness.
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_SHIELDER_queued = {
+	events = {
+		fircon.5035 #Solarpunk Planet queued
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_SHIELDER_unqueued = {
+}
+# Neutron Beam
+on_destroy_planet_with_RG_PLANET_KILLER_NEUTRON = {
+	events = {
+		planet_destruction.300
+		origin.3245
+		awareness.150 # Planet cracker used OR planet terraformed, chance to gain 20 awareness.
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_NEUTRON_queued = {
+	events = {
+		fircon.5035 #Solarpunk Planet queued
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_NEUTRON_unqueued = {
+}
+# God Ray
+on_destroy_planet_with_RG_PLANET_KILLER_GODRAY = {
+	events = {
+		planet_destruction.400
+		origin.3245
+		awareness.150 # Planet cracker used OR planet terraformed, chance to gain 20 awareness.
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_GODRAY_queued = {
+	events = {
+		fircon.5035 #Solarpunk Planet queued
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_GODRAY_unqueued = {
+}
+# Nanobot Assimilation
+on_destroy_planet_with_RG_PLANET_KILLER_NANOBOTS = {
+	events = {
+		crisis.5015 # Menace Objective - Destroy World/Empire
+		planet_destruction.500
+		origin.3245
+		awareness.150 # Planet cracker used OR planet terraformed, chance to gain 20 awareness.
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_NANOBOTS_queued = {
+	events = {
+		fircon.5035 #Solarpunk Planet queued
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_NANOBOTS_unqueued = {
+}
+# Deluge
+on_destroy_planet_with_RG_PLANET_KILLER_DELUGE = {
+	events = {
+		planet_destruction.607 # frag holy world
+		planet_destruction.700
+		origin.3245
+		awareness.150 # Planet cracker used OR planet terraformed, chance to gain 20 awareness.
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_DELUGE_queued = {
+	events = {
+		fircon.5035 #Solarpunk Planet queued
+#		planet_destruction.705
+	}
+}
+
+on_destroy_planet_with_RG_PLANET_KILLER_DELUGE_unqueued = {
+}
--- 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
@@ -118,9 +118,17 @@ rg_gray_govener_init = {
 					}
 				}
 			}
-			leader_event = {
-				id = wg_affection.8
-				days = 1
+			if = {
+				limit = {
+					has_leader_flag = has_wg_affection_wg_gray
+				}
+				if = {
+					limit = {
+						owner = { has_country_flag = married_gray }
+					}
+					set_leader_flag = married
+				}
+				set_variable = { which = affection value = owner.wg_gray_affection }
 			}
 			if = {
 				limit = {
@@ -137,7 +145,7 @@ rg_gray_govener_init = {
 			rg_set_gray_portrait = yes
 		}
 	}
-	set_global_flag = rg_kac_leader
+	
 }

 rg_gray_admiral_init = {
@@ -196,6 +204,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
@@ -223,9 +232,17 @@ rg_gray_admiral_init = {
 					}
 				}
 			}
-			leader_event = {
-				id = wg_affection.8
-				days = 1
+			if = {
+				limit = {
+					has_leader_flag = has_wg_affection_wg_gray
+				}
+				if = {
+					limit = {
+						owner = { has_country_flag = married_gray }
+					}
+					set_leader_flag = married
+				}
+				set_variable = { which = affection value = owner.wg_gray_affection }
 			}
 			add_trait_no_notify = leader_trait_admiral_wg_gray_affection
 			if = {
@@ -243,7 +260,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 = {
@@ -315,9 +332,17 @@ rg_gray_general_init = {
 					}
 				}
 			}
-			leader_event = {
-				id = wg_affection.8
-				days = 1
+			if = {
+				limit = {
+					has_leader_flag = has_wg_affection_wg_gray
+				}
+				if = {
+					limit = {
+						owner = { has_country_flag = married_gray }
+					}
+					set_leader_flag = married
+				}
+				set_variable = { which = affection value = owner.wg_gray_affection }
 			}
 			# add_trait_no_notify = leader_trait_admiral_wg_gray_affection
 			if = {
@@ -343,7 +368,7 @@ rg_gray_general_init = {
 		which = rg_general_skill_combat_killed_variable
 		value = 0
 	}
-	set_global_flag = rg_kac_leader
+	
 }

 rg_gray_scientist_init = {
@@ -414,9 +439,17 @@ rg_gray_scientist_init = {
 					}
 				}
 			}
-			leader_event = {
-				id = wg_affection.8
-				days = 1
+			if = {
+				limit = {
+					has_leader_flag = has_wg_affection_wg_gray
+				}
+				if = {
+					limit = {
+						owner = { has_country_flag = married_gray }
+					}
+					set_leader_flag = married
+				}
+				set_variable = { which = affection value = owner.wg_gray_affection }
 			}
 			add_trait_no_notify = leader_trait_admiral_wg_gray_affection
 			if = {
@@ -434,14 +467,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
@@ -2609,3 +2609,17 @@ RG_gray_mod3_effect = {
 		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
@@ -185,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
@@ -298,3 +289,31 @@ rg_create_gray_colony_1 = {
 	}
 	remove_ship_design = last_created_design
 }
+
+rg_create_gray_destroyer_1 = {
+	create_fleet = {
+		name = "NAME_RG_base_destroyer"
+		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_base_destroyer"
+				design = "RG_base_destroyer_key"
+				prefix = no
+				upgradable = no
+			}
+			set_location = {
+				target = root.capital_scope
+				distance = 0
+				angle = random
+			}
+		}
+	}
+}
--- 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 = {
@@ -98,6 +107,10 @@ rg_warship_init_mod3 = {
 				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/section_templates/RG_special_ship_section.txt
+++ b/common/section_templates/RG_special_ship_section.txt
@@ -701,3 +701,78 @@ ship_section_template = {
 		}
 	}
 }
+
+ship_section_template = {
+	key = "RG_carrier_destroyer_key"
+	ship_size = RG_graygoo_destroyer
+	fits_on_slot = mid
+	entity = "grey_tempesttw_colony_ship_entity"
+	icon = "GFX_ship_part_core_mid"
+
+	component_slot = {
+		name = "STRIKE_CRAFT_01"
+		template = "large_strike_craft"
+		rotation = 90
+		locatorname = "xl_gun_01"
+	}
+	component_slot = {
+		name = "STRIKE_CRAFT_02"
+		template = "large_strike_craft"
+		rotation = 90
+		locatorname = "xl_gun_01"
+	}
+
+	component_slot = {
+		name = "PD_01"
+		template = "point_defence_turret"
+		locatorname = "xl_gun_01"
+	}
+
+	large_utility_slots = 2
+	aux_utility_slots = 1
+	resources = {
+		category = ship_sections
+		cost = {
+			alloys = 30
+		}
+	}
+}
+
+ship_section_template = {
+	key = "RG_base_destroyer_key"
+	ship_size = RG_graygoo_destroyer
+	fits_on_slot = mid
+	entity = "grey_tempesttw_colony_ship_entity"
+	icon = "GFX_ship_part_core_mid"
+
+	component_slot = {
+		name = "MEDIUM_GUN_01"
+		template = "medium_turret"
+		locatorname = "xl_gun_01"
+	}
+	component_slot = {
+		name = "MEDIUM_GUN_02"
+		template = "medium_turret"
+		locatorname = "xl_gun_01"
+	}
+	component_slot = {
+		name = "MEDIUM_GUN_03"
+		template = "medium_turret"
+		locatorname = "xl_gun_01"
+	}
+
+	component_slot = {
+		name = "TORPEDO_01"
+		template = "invisible_missile_turret"
+		locatorname = "wing_1_3"
+	}
+
+	large_utility_slots = 2
+	aux_utility_slots = 1
+	resources = {
+		category = ship_sections
+		cost = {
+			alloys = 30
+		}
+	}
+}
--- a/common/ship_sizes/RG_ship_sizes.txt
+++ b/common/ship_sizes/RG_ship_sizes.txt
@@ -293,6 +293,68 @@ RG_graygoo_interdictor = {
 	}
 }

+# Gray Goo destroyer
+RG_graygoo_destroyer = {
+	graphical_culture = no
+	entity = "grey_tempesttw_colonizer_entity"
+	max_speed = 220
+	acceleration = 0.25
+	rotation_speed = 0.175
+	collision_radius = 4
+	modifier = {
+		ship_evasion_add = 40
+		ships_upkeep_mult = -1
+		ship_piracy_suppression_add = 4
+		ship_armor_add = 1100
+		ship_shield_add = 1100
+	}
+	max_hitpoints = 2000
+	size_multiplier = 2
+	fleet_slot_size = 2
+	section_slots = {
+		"mid" = {
+			locator = "part1"
+		}
+	}
+	num_target_locators = 2
+	is_space_station = no
+	icon = ship_size_military_2
+	base_buildtime = @battleship_build_time
+	can_have_federation_design = yes
+	enable_default_design = yes	#if yes, countries will have an auto-generated design at start
+	enable_3dview_in_ship_browser = yes	#if yes, ship design will have a 3d view in the ship browser
+	is_designable = yes
+	default_behavior = line
+	prerequisites = {
+		"tech_gray_interdictor_4"
+	}
+	ship_roles = { screen gunship artillery brawler }
+	triggered_ship_roles = {
+		{
+			name = artillery_stealth
+			trigger = { has_technology = tech_cloaking_2 }
+		}
+	}
+	combat_disengage_chance = 1.25
+	class = shipclass_military
+	construction_type = starbase_shipyard
+	required_component_set = "power_core"
+	required_component_set = "ftl_components"
+	required_component_set = "combat_computers"
+	required_component_set = "thruster_components"
+	required_component_set = "sensor_components"
+	resources = {
+		category = ships
+		upkeep = {
+			energy = @destroyer_upkeep_energy
+			alloys = @destroyer_upkeep_alloys
+		}
+	}
+	min_upgrade_cost = {
+		alloys = 8
+	}
+}
+
 # Gray Goo Icebreaker
 RG_graygoo_icebreaker_interdictor = {
 	graphical_culture = no
--- a/common/situations/rg_gray_situations.txt
+++ b/common/situations/rg_gray_situations.txt
@@ -98,7 +98,7 @@ situation_rg_gray_mod1 = {
 		}
 		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 = {
@@ -404,7 +404,7 @@ situation_rg_gray_mod2 = {
 		}
 		situation_rg_gray_mod2_stage_12 = {
 			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_mod2_stage_12_tooltip
 			on_first_enter = {
@@ -413,6 +413,9 @@ situation_rg_gray_mod2 = {
 						id = rg_story.41
 					}
 				}
+				event_target:gray_warship = {
+					set_event_locked = no
+				}
 			}
 		}
 	}
--- a/common/special_projects/RG_story_special_projects.txt
+++ b/common/special_projects/RG_story_special_projects.txt
@@ -69,6 +69,9 @@ special_project = {
 					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
 			}
 		}
 	}
@@ -106,6 +109,9 @@ special_project = {
 					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
@@ -26,6 +26,83 @@ tech_gray_weapon_lance_1 = {
 	}
 }

+tech_minilaser_gray_1 = {
+	cost = 2000
+	area = physics
+	tier = 5
+	is_rare = yes
+	is_reverse_engineerable = no
+	category = {
+		particles
+	}
+	ai_update_type = military
+	prerequisites = {
+		"tech_gray_weapon_lance_1"
+		"tech_zero_point_power"
+	}
+	weight = @tier2weight3
+	## unlock 
+	ai_weight = {
+		factor = 0
+	}
+}
+
+# Elite Cloaking Devices
+tech_gray_cloaking_3 = {
+	cost = @tier4cost3
+	area = physics
+	tier = 4
+	category = { field_manipulation }
+	ai_update_type = all
+	is_rare = yes
+	prerequisites = { "tech_cloaking_3" "tech_gray_weapon_lance_1" }
+	is_reverse_engineerable = no
+	weight = @tier4weight3
+
+	potential = {
+		has_first_contact_dlc = yes
+	}
+
+	prereqfor_desc = {
+		hide_prereq_for_desc = component
+		custom = {
+			title = "TECH_UNLOCK_RG_CLOAKING_3_TITLE"
+			desc = "TECH_UNLOCK_RG_CLOAKING_3_DESC"
+		}
+	}
+
+	weight_modifier = {
+		modifier = {
+			factor = value:tech_weight_likelihood
+			has_trait_in_council = { TRAIT = leader_trait_curator }
+		}
+		modifier = {
+			factor = value:tech_weight_likelihood
+			has_trait_in_council = { TRAIT = leader_trait_fotd_scientist }
+		}
+		modifier = {
+			factor = @ap_technological_ascendancy_rare_tech
+			has_ascension_perk = ap_technological_ascendancy
+		}
+		modifier = {
+			factor = @federation_perk_factor
+			has_federation = yes
+			federation = {
+				has_federation_perk = rare_tech_boost
+				any_member = { has_technology = tech_cloaking_3 }
+			}
+		}
+		modifier = {
+			factor = 5
+			has_tradition = tr_subterfuge_adopt
+		}
+	}
+
+	ai_weight = {
+		factor = 0
+	}
+}
+
 tech_gray_matter_remix_2 = {
 	area = engineering
 	cost = 5000
@@ -36,6 +113,7 @@ tech_gray_matter_remix_2 = {
 	}
 	ai_update_type = military
 	weight = @tier2weight3
+	is_reverse_engineerable = no
 	prerequisites = {
 		"tech_gray_weapon_lance_1"
 		"tech_ship_armor_5"
@@ -53,6 +131,34 @@ tech_gray_matter_remix_2 = {
 	}
 }

+tech_gray_nano_fusion_3 = {
+	area = physics
+	cost = 5000
+	tier = 5
+	is_rare = yes
+	is_reverse_engineerable = no
+	category = {
+		particles
+	}
+	ai_update_type = military
+	weight = @tier2weight3
+	prerequisites = {
+		"tech_gray_matter_remix_2"
+		"tech_zero_point_power"
+	}
+	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_nano_boost_3 = {
 	area = engineering
 	cost = 5000
@@ -63,6 +169,7 @@ tech_gray_nano_boost_3 = {
 	}
 	ai_update_type = military
 	weight = @tier2weight3
+	is_reverse_engineerable = no
 	prerequisites = {
 		"tech_gray_matter_remix_2"
 		"tech_thrusters_4"
@@ -90,6 +197,7 @@ tech_gray_interdictor_4 = {
 	}
 	ai_update_type = military
 	weight = @tier2weight3
+	is_reverse_engineerable = no
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 		"tech_battleships"
@@ -117,6 +225,7 @@ tech_gray_matter_spray_5 = {
 	}
 	ai_update_type = military
 	weight = @tier2weight3
+	is_reverse_engineerable = no
 	prerequisites = {
 		"tech_gray_interdictor_4"
 		"tech_kinetic_artillery_2"
@@ -144,6 +253,7 @@ tech_gray_buffnut_6 = {
 	}
 	ai_update_type = military
 	weight = @tier2weight3
+	is_reverse_engineerable = no
 	prerequisites = {
 		"tech_gray_interdictor_4"
 		"tech_juggernaut"
@@ -171,6 +281,7 @@ tech_gray_army_7 = {
 	}
 	ai_update_type = military
 	weight = @tier2weight3
+	is_reverse_engineerable = no
 	prerequisites = {
 		"tech_gray_matter_remix_2"
 		"tech_self_aware_logic"
@@ -198,6 +309,7 @@ tech_gray_juggernaut_8 = {
 	}
 	ai_update_type = military
 	weight = @tier2weight3
+	is_reverse_engineerable = no
 	prerequisites = {
 		"tech_gray_matter_remix_2"
 		"tech_juggernaut"
@@ -257,22 +369,6 @@ tech_object_gray_5 = {
 	}
 }

-tech_minilaser_gray_1 = {
-	cost = 2000
-	area = physics
-	tier = 5
-	is_rare = yes
-	is_reverse_engineerable = no
-	category = {
-		particles
-	}
-	weight = 0
-	## unlock 
-	ai_weight = {
-		factor = 1
-	}
-}
-
 tech_object_gray_6 = {
 	cost = 2000
 	area = physics
--- 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/descriptor.mod
+++ b/descriptor.mod
@@ -8,5 +8,5 @@ tags={
 }
 name="Real Gray"
 picture="thumbnail.png"
-supported_version="3.8.*"
+supported_version="3.9.*"
 remote_file_id="2136166095"
--- a/events/!_RG_gray_goo_events.txt
+++ b/events/!_RG_gray_goo_events.txt
@@ -272,15 +272,20 @@ country_event = {
 		default_hide_option = yes
 		tag = hire_leader
 		hidden_effect = {
-			create_message = {
-				type = MESSAGE_RECRUITED_LEADER
-				localization = MESSAGE_RECRUITED_LEADER_DESC
-				days = @toast_message_days
-				target = event_target:gray_governor
-				variable = {
-					type = name
-					localization = LEADER
-					scope = event_target:gray_governor
+			# create_message = {
+			# 	type = MESSAGE_RECRUITED_LEADER
+			# 	localization = MESSAGE_RECRUITED_LEADER_DESC
+			# 	days = @toast_message_days
+			# 	target = event_target:gray_governor
+			# 	variable = {
+			# 		type = name
+			# 		localization = LEADER
+			# 		scope = event_target:gray_governor
+			# 	}
+			# }
+			owner = {
+				country_event = {
+					id = rg_grayleader_dialog.4063
 				}
 			}
 			country_event = {
--- 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
+
+# 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
-#				}
-#    }
+#     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
-#				}
-#			}
+#     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
+# 			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
-#				}
-#    }
+#     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 }	
-#		}
-#	}
-#}
-#自动星系建设
+#     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 = {
@@ -169,7 +166,6 @@ ship_event = {
 				solar_system = {
 					has_star_flag = lcluster
 					NOT = {	
-						#星系内不能有敌舰		
 						any_fleet_in_system = {
 							exists = controller
 							controller = {
@@ -179,7 +175,6 @@ ship_event = {
 					}
 				}
 			}
-			#创建自动工程船暂存国家
 			RG_const_auto_build_effect_event = yes
 		}
 		else_if = {
@@ -191,7 +186,6 @@ ship_event = {
 				solar_system = {
 					# has_star_flag = lcluster
 					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
@@ -17,6 +17,22 @@ country_event = {
 	}
 }

+country_event = {
+	id = rg_grayleader_dialog.4063
+	title = "TRANSMISSION"
+	desc = "graygoo.406.c.response"
+	diplomatic = yes
+	picture_event_data = {
+		portrait = event_target:rg_gray_country_leader
+		planet_background = event_target:gray_homeworld
+		room = ship_room
+	}
+	is_triggered_only = yes
+	option = {
+		name = OK
+	}
+}
+
 country_event = {
 	id = rg_grayleader_dialog.5001
 	title = "graygoo.500.title"
--- a/events/RG_story_event.txt
+++ b/events/RG_story_event.txt
@@ -726,3 +726,760 @@ 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
@@ -204,7 +204,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -403,7 +403,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -792,7 +792,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -1153,7 +1153,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -1216,7 +1216,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -1461,7 +1461,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
--- 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,745 +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
-	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 = {
-	}
-	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
-		}
-		enable_special_project = {
-			name = RG_GRAY_MOD1
-			location = event_target:gray_owner_capital_starbase
-			owner = event_target:gray_owner
-		}
-	}
-}
-
-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 = nanties
-				value >= 150
-			}
-		}
-		add_resource = {
-			resource = nanties
-			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 = nanties
-				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 = {
-	}
-	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
-		}
-		enable_special_project = {
-			name = RG_GRAY_MOD2
-			location = event_target:gray_owner_capital_starbase
-			owner = event_target:gray_owner
-		}
-	}
-}
-
-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
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod2
-			}
-			set_situation_locked = yes
-			set_situation_flag = locked
-			set_situation_flag = rg_stage6_locked
-		}
-		enable_special_project = {
-			name = RG_GRAY_MOD2
-			location = event_target:gray_owner_capital_starbase
-			owner = event_target:gray_owner
-		}
-	}
-}
--- a/events/z_RG_placeholder_event.txt
+++ b/events/z_RG_placeholder_event.txt
@@ -0,0 +1,22 @@
+namespace = wg_affection
+
+country_event = {
+	id = wg_affection.30000
+	title = wg_affection.30000.name
+	desc = wg_affection.30000.desc
+	is_triggered_only = yes
+	diplomatic = yes
+	show_sound = event_wg_wedding
+	custom_gui = wg_gray_commu_window
+	custom_gui_option = wg_gray_commu_option
+
+	immediate = {
+		set_country_flag = married_gray
+	}
+
+	option = {
+		name = wg_affection.30000.a
+		response_text = wg_affection.30000.response
+		change_variable = { which = rankpts value = 2 }
+	}
+}
--- a/gfx/interface/icons/ship_parts/mod_disruptor_3.dds
+++ b/gfx/interface/icons/ship_parts/mod_disruptor_3.dds
--- a/gfx/interface/icons/ship_parts/mod_phaser_2.dds
+++ b/gfx/interface/icons/ship_parts/mod_phaser_2.dds
--- a/gfx/interface/icons/ship_parts/rg_aux_engine_1.dds
+++ b/gfx/interface/icons/ship_parts/rg_aux_engine_1.dds
--- a/gfx/interface/icons/ship_parts/rg_big_bomb_2.dds
+++ b/gfx/interface/icons/ship_parts/rg_big_bomb_2.dds
--- a/gfx/interface/icons/ship_parts/rg_cutting_beam.dds
+++ b/gfx/interface/icons/ship_parts/rg_cutting_beam.dds
--- a/gfx/interface/icons/ship_parts/rg_hull_4.dds
+++ b/gfx/interface/icons/ship_parts/rg_hull_4.dds
--- a/gfx/interface/icons/ship_parts/rg_reactor_2.dds
+++ b/gfx/interface/icons/ship_parts/rg_reactor_2.dds
--- a/gfx/interface/icons/ship_parts/rg_warp_drive_3
+++ b/gfx/interface/icons/ship_parts/rg_warp_drive_3
--- a/gfx/interface/icons/ship_parts/rg_warp_drive_3.dds
+++ b/gfx/interface/icons/ship_parts/rg_warp_drive_3.dds
--- a/gfx/interface/icons/ship_parts/ship_part_rg_sensors.dds
+++ b/gfx/interface/icons/ship_parts/ship_part_rg_sensors.dds
--- a/gfx/interface/icons/technologies/tech_gray_army_7.dds
+++ b/gfx/interface/icons/technologies/tech_gray_army_7.dds
--- a/gfx/interface/icons/technologies/tech_gray_cloaking_3.dds
+++ b/gfx/interface/icons/technologies/tech_gray_cloaking_3.dds
--- a/gfx/interface/icons/technologies/tech_gray_juggernaut_8.dds
+++ b/gfx/interface/icons/technologies/tech_gray_juggernaut_8.dds
--- a/gfx/interface/icons/technologies/tech_gray_matter_remix_2.dds
+++ b/gfx/interface/icons/technologies/tech_gray_matter_remix_2.dds
--- a/gfx/interface/icons/technologies/tech_gray_nano_fusion_3.dds
+++ b/gfx/interface/icons/technologies/tech_gray_nano_fusion_3.dds
--- a/gfx/interface/icons/technologies/tech_object_gray_5.dds
+++ b/gfx/interface/icons/technologies/tech_object_gray_5.dds
--- 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/interface/rg_icons.gfx
+++ b/interface/rg_icons.gfx
@@ -1,7 +1,22 @@
 spriteTypes = {
 	spriteType = {
 		name = "GFX_ship_part_gray_armor"
-		textureFile = "gfx/interface/icons/ship_parts/ship_part_gray_armor.dds"
+		textureFile = "gfx/interface/icons/ship_parts/rg_hull_4.dds"
+		noOfFrames = 1
+	}
+	spriteType = {
+		name = "GFX_ship_part_gray_reactor"
+		textureFile = "gfx/interface/icons/ship_parts/rg_reactor_2.dds"
+		noOfFrames = 1
+	}
+	spriteType = {
+		name = "GFX_ship_part_gray_engine"
+		textureFile = "gfx/interface/icons/ship_parts/rg_aux_engine_1.dds"
+		noOfFrames = 1
+	}
+	spriteType = {
+		name = "GFX_ship_part_gray_sensor"
+		textureFile = "gfx/interface/icons/ship_parts/ship_part_rg_sensors.dds"
 		noOfFrames = 1
 	}
 	spriteType = {
@@ -16,7 +31,12 @@ spriteTypes = {
 	}
 	spriteType = {
 		name = "GFX_ship_part_graymine"
-		textureFile = "gfx/interface/icons/ship_parts/ship_part_graymine.dds"
+		textureFile = "gfx/interface/icons/ship_parts/rg_big_bomb_2.dds"
+		noOfFrames = 1
+	}
+	spriteType = {
+		name = "GFX_ship_part_graymine_old"
+		textureFile = "gfx/interface/icons/ship_parts/GFX_ship_part_graymine.dds"
 		noOfFrames = 1
 	}
 	spriteType = {
@@ -24,4 +44,22 @@ spriteTypes = {
 		textureFile = "gfx/interface/icons/ship_parts/ship_part_rg_armor_hardener.dds"
 		noOfFrames = 1
 	}
+	spriteType = {
+		name = "GFX_ship_part_mod_warp_drive_3"
+		texturefile = "gfx/interface/icons/ship_parts/rg_warp_drive_3.dds"
+		noOfFrames = 1
+	}
+	spriteType = {
+		name = "GFX_ship_weapon_rg_spacetime_disruptor"
+		texturefile = "gfx/interface/icons/ship_parts/mod_disruptor_3.dds"
+		noOfFrames = 1
+	}
+	spriteType = {
+		name = "GFX_ship_weapon_phaser_bank"
+		texturefile = "gfx/interface/icons/ship_parts/mod_phaser_2.dds"
+	}
+	spriteType = {
+		name = "GFX_ship_weapon_rg_cutting_beam"
+		texturefile = "gfx/interface/icons/ship_parts/rg_cutting_beam.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_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_l_simp_chinese.yml
@@ -18,67 +18,72 @@
 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纳米能量装甲§!"
+ SMALL_GRAY_MIX_ARMOR:0 "§Y「梦想领域」§!"
+ MEDIUM_GRAY_MIX_ARMOR:0 "§Y「梦想领域」§!"

- RG_CARRIER_RADAR:0 "§Y航空调度雷达§!"
- RG_CARRIER_RADAR_DESC:0 "先进的雷达能够在极远处探测到敌舰，航母索敌用。"
- RG_ENERGY_MISSILE:0 "§Y$NAME_Gray$融合球§!"
- RG_ENERGY_MISSILE_DESC:0 "这些混合材料制作的鱼雷拥有强大的能量，能够自我加速到极高速来击毁敌舰"
- RG_ENERGY_MISSILE_KIN:0 "§Y$NAME_Gray$超空融合球§!"
- RG_ENERGY_MISSILE_KIN_DESC:0 "这种奇特鱼雷改型能够捕捉到微小的超空间空泡进行加速，从而消除掉鱼雷速度的缺陷，可惜的是为了承受不稳定超空间航道中的波动被迫减少了装药。"
- RG_FLAK_BATTERY:0 "§Y纳米融合排炮§!"
- RG_FLAK_BATTERY_DESC:0 "密集布置的新型防空炮能够高速发射抛射体击毁极远处的抛射体。"
+ RG_CARRIER_RADAR:0 "§Y「星河道标」§!"
+ RG_CARRIER_RADAR_DESC:0 "§Y为孩子们指引明路，点亮家的路标。§!\n建门者标准型航空雷达。先进的扫描装置为舰载机指引目标，也为她们指引回家的方向。能够在极远处探测到敌舰。"
+ RG_ENERGY_MISSILE:0 "§Y「微光团子」§!"
+ RG_ENERGY_MISSILE_DESC:0 "§Y它们像发光的团子一样呢。我饿了。§!\n建门者融合球导弹初型。这些混合材料制作的鱼雷拥有强大的能量，能够自我加速到极高速来击毁敌舰"
+ RG_ENERGY_MISSILE_KIN:0 "§Y「汐光团子」§!"
+ RG_ENERGY_MISSILE_KIN_DESC:0 "§Y世上最闪耀最暗淡的萤火。§!\n建门者超空间融合球导弹。这种奇特鱼雷改型能够捕捉到微小的超空间空泡进行加速，从而消除掉鱼雷速度的缺陷，可惜的是为了承受不稳定超空间航道中的波动被迫减少了装药。"
+ RG_FLAK_BATTERY:0 "§Y「逐火织机」§!"
+ RG_FLAK_BATTERY_DESC:0 "§Y想要握住所有的星光。§!\n建门者防空导弹阵列。密集布置的防空炮发射小型融合球击毁极远处的抛射体。"

- RG_gatebuilder_jump:0 "§Y$NAME_Gray$跃迁引擎§!"
- RG_gatebuilder_sensor:0 "§Y$NAME_Gray$传感器§!"
- RG_gatebuilder_thruster:0 "§Y$NAME_Gray$推进器§!"
+ RG_gatebuilder_jump:0 "§Y「终抵群星」§!"
+ RG_gatebuilder_sensor:0 "§Y「星穹相会」§!"
+ RG_gatebuilder_thruster:0 "§Y「漫步星海」§!"
 origin_rg_gray:0 "§Y遥远约定§!"
 origin_rg_gray_desc:0 "你偷偷说服了$NAME_Gray$从遥远的L星团前来看望你"
- origin_tooltip_rg_gray_effects:0 "开局时拥有$NAME_Gray$,并在一个孤立的L-星团中开始你的冒险。你将很难有重见银河的机会。\n\n§R<但...代价是什么？>§！\n§Y- 该起源被重复选择时将被替换成隐藏起源§！§H<你也事龙>§！§Y并开局获得全部L星门认知。§！\n§R- 多人游戏中存在重复龙开起源国家，L星团国家将无法触发中期开门事件。§！\n§R- 该起源被AI帝国占用时L-星团将被AI帝国占用。唔，你懂的。§！"
- RG_SHIP_AURA_NANOBOT_CLOUD:0 "§Y纳米机器场§!"
- RG_SHIP_AURA_NANOBOT_CLOUD_DESC:0 "$NAME_Gray$可以通过布置一个高浓度纳米机器人场来维修同星系内的友方舰船。"
- RG_BOMBER_HANGAR_AP_BOMB:0 "§Y纳米轰炸机中队§!"
+ origin_tooltip_rg_gray_effects:0 "开局时拥有$NAME_Gray$,并在一个孤立的L-星团中开始你的冒险。你将很难有重见银河的机会。\n\n§R<但...代价是什么？>§！\n§Y- 为防止重复选择，该起源被重复选择时将被替换成隐藏起源§！§H<你也事龙>§！§Y并开局获得全部L星门认知。§！\n§R- 多人游戏中存在重复龙开起源国家，L星团国家将无法触发中期开门事件。§！\n§R- 该起源被AI帝国占用时L-星团将被AI帝国占用。唔，你懂的。§！"
+ RG_SHIP_AURA_NANOBOT_CLOUD:0 "§Y「漫播飞尘」§!"
+ RG_SHIP_AURA_NANOBOT_CLOUD_DESC:0 "§Y散播希望，还有绝望。§!\n多用途微型纳米机器。$NAME_Gray$可以通过布置一个高浓度纳米机器人场来维修同星系内的友方舰船。"
+ RG_BOMBER_HANGAR_AP_BOMB:0 "§Y「落光」§!"
 RG_BOMBER_HANGAR_AP_BOMB_DESC:0 "这些轰炸机通过加速到近距离投放重型无制导炸弹来击毁敌舰，奇怪的是这种设计在我们的设计师看来非常危险和不可靠......"
- RG_BOMBER_HANGAR_NEUTRON_TORPEDO:0 "§Y纳米鱼雷机中队§!"
- RG_BOMBER_HANGAR_NEUTRON_TORPEDO_DESC:0 "这些轰炸机可以迅速编队投放中子鱼雷来击毁敌舰，奇怪的是这种设计在我们的设计师看来非常危险和不可靠......"
- RG_FIGHTER_HANGAR_BEAM:0 "§Y纳米截击机中队§!"
- RG_FIGHTER_HANGAR_BEAM_DESC:0 "这些攻击机可以使用小型化光束武器来击毁敌舰，奇怪的是这种设计在我们的设计师看来非常危险和不可靠......"
- RG_BOMBER_HANGAR_ATTACK_ROCKET:0 "§Y纳米攻击机中队§!"
+ RG_BOMBER_HANGAR_NEUTRON_TORPEDO:0 "§Y「飞光」§!"
+ RG_BOMBER_HANGAR_NEUTRON_TORPEDO_DESC:0 "这些轰炸机可以迅速编队投放融合球鱼雷来击毁敌舰，奇怪的是这种设计在我们的设计师看来非常危险和不可靠......"
+ RG_FIGHTER_HANGAR_BEAM:0 "§Y「逐光」§!"
+ RG_FIGHTER_HANGAR_BEAM_DESC:0 "这些攻击机可以使用小型化光束武器拦截小型航空器，奇怪的是这种设计在我们的设计师看来非常危险和不可靠......"
+ RG_BOMBER_HANGAR_ATTACK_ROCKET:0 "§Y「棱光」§!"
 RG_BOMBER_HANGAR_ATTACK_ROCKET_DESC:0 "这些攻击机可以使用小型化光束武器来击毁敌舰，奇怪的是这种设计在我们的设计师看来非常危险和不可靠......"
- RG_aura_nanobot_cloud:0 "§Y纳米机器场§!"
- RG_AUTO_REPAIR:0 "§Y纳米损害管制§!"
- RG_AUTO_REPAIR_DESC:0 "$NAME_Gray$通过这些预留用于损害管制的纳米机器人来紧急修复舰体。"
- RG_ARMOR_BOOSTER:0 "§Y质能对抗装置§!"
- RG_ARMOR_BOOSTER_DESC:0 "通过消耗大量能源进行质能转换从而达到实时加固舰体的效果。"
- RG_ENIGMATIC_SCHEDULER:0 "§Y神秘调度器§!"
- RG_ENIGMATIC_SCHEDULER_DESC:0 "神秘调度器通过一种极其先进的算法控制资源的调度优先顺序，确保最大化效率利用资源的同时又可使用额外的能量增幅战舰的武器和护盾。"
- RG_ENGINE_BOOSTER:0 "§Y$NAME_Gray$特型引擎增压§!"
+ RG_aura_nanobot_cloud:0 "§Y「漫播飞尘」§!"
+ RG_AUTO_REPAIR:0 "§Y「晨昏之间」§!"
+ RG_AUTO_REPAIR_DESC:0 "§Y极昼与极夜。§!\n$NAME_Gray$通过这些预留用于损害管制的纳米机器人来紧急修复舰体。"
+ RG_ARMOR_BOOSTER:0 "§Y「裁定机」§!"
+ RG_ARMOR_BOOSTER_DESC:0 "§Y丈量万物。§!\n一种通过消耗大量能源进行质能转换从而实时加固舰体的装置。我们已经试过了，造不出第二台。"
+ RG_ENIGMATIC_SCHEDULER:0 "§Y「空想盒」§!"
+ RG_ENIGMATIC_SCHEDULER_DESC:0 "§Y想要理解本就是妄为。§!\n该装置通过一种无法理解的算法控制资源的调度优先顺序，确保最大化效率利用资源的同时又可使用额外的能量增幅战舰的武器和护盾。"
+ RG_ENGINE_BOOSTER:0 "§Y「工具箱」§!"
 RG_ENGINE_BOOSTER_DESC:0 "为了支援前线工程，我们只有更快！更快！更快！更快！更快！更快！更快！更快！更快！"
 bombardment_graygoo:0 "§R灰色风暴§!"
 bombardment_graygoo_name:0 "§Y灰色风暴轨道轰炸§!" 
- bombardment_graygoo_desc:0 "$bombardment_graygoo$轰炸将在星球上散布灰色风暴，以最快的速度席卷一切。\n-对§Y军团§!造成§Y巨大的§!伤害\n-对§Y星球§!造成§Y不可修复的§!伤害\n-对§Y人口§!造成§Y巨大的§!伤害\n-将会轰炸不设防的星球。！"
- LARGE_GRAY_WEAPON_LANCE:0 "§Y$NAME_Gray$能量束§!"
- LARGE_GRAY_WEAPON_LANCE_DESC:0 "使用远古L星门建造者的技术所制成的武器，作用原理不明。"
- SMALL_GRAY_WEAPON_LANCE:0 "§Y$NAME_Gray$能量束Mini§!"
+ bombardment_graygoo_desc:0 "$bombardment_graygoo$轰炸将在星球上散布灰色风暴，以最快的速度席卷一切有形之物。\n-对§Y军团§!造成§Y巨大的§!伤害\n-对§Y星球§!造成§Y不可修复的§!伤害\n-对§Y人口§!造成§Y巨大的§!伤害\n-将会轰炸不设防的星球。！"
+ LARGE_GRAY_WEAPON_LANCE:0 "§Y「星光」§!"
+ LARGE_GRAY_WEAPON_LANCE_DESC:0 "使用远古L星门建造者的技术所制成的武器，是最初的一型光束武器。"
+ MEDIUM_GRAY_WEAPON_LANCE:0 "§Y「星光」Lite§!"
+ MEDIUM_GRAY_WEAPON_LANCE_DESC:0 "使用远古L星门建造者的技术所制成的武器的...仿真模型，未成年智慧生物请勿玩耍。"
+ SMALL_GRAY_WEAPON_LANCE:0 "§Y「星光」Mini§!"
 SMALL_GRAY_WEAPON_LANCE_DESC:0 "使用远古L星门建造者的技术所制成的武器的...玩具模型，仍然具有巨大威力。"
- GRAY_BEAM_STATIC_MX:0 "§Y$NAME_Gray$聚能束Mini§!"
+ GRAY_BEAM_STATIC_MX:0 "§Y「耀光」Mini§!"
 GRAY_BEAM_STATIC_MX_DESC:0 "使用远古L星门建造者的技术所制成的武器武器的...限量版玩具模型？仍然具有巨大威力。"
- GRAY_BEAM_STATIC_X:0 "§Y$NAME_Gray$聚能束§!"
- GRAY_BEAM_STATIC_X_DESC:0 "使用远古L星门建造者的技术所制成的武器，作用原理不明。"
- GRAY_BEAM_STATIC_EX:0 "§Y$NAME_Gray$能量弧§!"
- GRAY_BEAM_STATIC_EX_DESC:0 "使用远古L星门建造者的技术所制成的武器，作用原理不明。"
- RG_GRAY_WEAPON_LANCE_X:0 "§Y$NAME_Gray$聚能束§!"
- RG_GRAY_WEAPON_LANCE_X_DESC:0 "使用远古L星门建造者的技术所制成的武器，作用原理不明。"
- RG_GRAY_WEAPON_LANCE:0 "§Y$NAME_Gray$能量束§!"
- RG_GRAY_WEAPON_LANCE_DESC:0 "使用远古L星门建造者的技术所制成的武器，作用原理不明。"
- LARGE_GRAY_MIX_ARMOR:0 "§Y纳米装甲§!"
- LARGE_GRAY_MIX_ARMOR_DESC:0 "高度集成化的装甲，表面被一层能量波动包裹，作用原理不明。"
- HUGE_GRAY_MIX_ARMOR:0 "§Y聚合-纳米装甲§!"
- HUGE_GRAY_MIX_ARMOR_DESC:0 "高度集成化的装甲，密度远超于灰色风暴舰船中发现的装甲，作用原理不明。"
- RG_FLAK_PHOENIX:0 "§R撞击-不死鸟§!"
- RG_FLAK_PHOENIX_DESC:0 "会不会玩啊！怎么不撞！"
+ GRAY_BEAM_STATIC_X:0 "§Y「耀光」§!"
+ GRAY_BEAM_STATIC_X_DESC:0 "使用远古L星门建造者的技术所制成的武器，为了增加威力而提高了功率，除此之外没有任何实质性改进。"
+ GRAY_BEAM_STATIC_EX:0 "§Y「凌光」§!"
+ GRAY_BEAM_STATIC_EX_DESC:0 "§Y你说武器不够强？那就提高功率！§!\n使用远古L星门建造者的技术所制成的武器，拥有不可理喻的破坏力同时拥有不可理喻的能量消耗。可它仍旧没有任何改进！"
+ RG_GRAY_WEAPON_LANCE_X:0 "§Y「耀光」§!"
+ RG_GRAY_WEAPON_LANCE_X_DESC:0 "使用远古L星门建造者的技术所制成的武器，为了增加威力而提高了功率，除此之外没有任何实质性改进。"
+ RG_GRAY_WEAPON_LANCE:0 "§Y「星光」§!"
+ RG_GRAY_WEAPON_LANCE_DESC:0 "使用远古L星门建造者的技术所制成的武器，是最初的一型光束武器。"
+ LARGE_GRAY_MIX_ARMOR:0 "§Y「梦想领域」§!"
+ LARGE_GRAY_MIX_ARMOR_DESC:0 "§Y怀抱着想被礼貌对待的矛盾心情。§!\n高度集成化的装甲，表面被一层能量波动包裹，这部分纳米机器舍弃掉了变形的能力。"
+ HUGE_GRAY_MIX_ARMOR:0 "§Y「幻想领域」§!"
+ HUGE_GRAY_MIX_ARMOR_DESC:0 "§Y在这里一切愿望都能成真。§!\n高度集成化的装甲，密度远超于灰色风暴舰船中发现的装甲，作用原理不明。"
+ RG_FLAK_PHOENIX:0 "§R「起源」§!"
+ RG_FLAK_PHOENIX_DESC:0 "§Y创造与解构。§!\n没有什么比一个拥抱更能消除隔阂。"

 RG_Interdictor_FISSION_REACTOR:0 "$FISSION_REACTOR$"
 RG_Interdictor_FISSION_REACTOR_DESC:0 "$FISSION_REACTOR_DESC$"
@@ -111,6 +116,8 @@

 RG_Arsenal_FISSION_REACTOR:0 "$FISSION_REACTOR$"
 RG_Arsenal_FISSION_REACTOR_DESC:0 "$FISSION_REACTOR_DESC$"
+ RG_Arsenal_FUSION_NANO_REACTOR:0 "$RG_FUSION_NANO_REACTOR$"
+ RG_Arsenal_FUSION_NANO_REACTOR_DESC:0 "$RG_FUSION_NANO_REACTOR_DESC$"

 RG_PLANET_KILLER_CRACKER:0 "$PLANET_KILLER_CRACKER$"
 RG_PLANET_KILLER_CRACKER_DESC:0 "$PLANET_KILLER_CRACKER_DESC$"
@@ -198,16 +205,23 @@
 RG_graygoo_juggernaut_key: "§Y主宰核心§!"
 RG_icebreaker_interdictor_key: "§Y破冰核心§!"

- LARGE_GRAY_WEAPON_KIN:0 "§Y纳米物质投射器§!"
- LARGE_GRAY_WEAPON_KIN_DESC:0 "这些密集的轴基无管动能炮使用了前所未有的重型弹头，被设计成只能发射一次的终极火炮。这种武器通常成编制部署，占据了整艘战舰一半以上的质量。"
- HUGE_GRAY_WEAPON_KIN:0 "§Y超限-纳米物质投射器§!"
- HUGE_GRAY_WEAPON_KIN_DESC:0 "这些密集的轴基无管动能炮发射密度前所未有的超级弹头，弹头能够自我加速到无限接近光速。却依然无法再次发射。"
+ RG_carrier_destroyer_key: "§Y运航核心§!"
+ RG_base_destroyer_key: "§Y驱逐核心§!"
+
+ LARGE_GRAY_WEAPON_KIN:0 "§Y「糖豆发射器」§!"
+ LARGE_GRAY_WEAPON_KIN_DESC:0 "§Y多就是美。§!\n这些密集的轴基无管动能炮使用了前所未有的重型弹头，被设计成只能发射一次的终极火炮。这种武器通常成编制部署，占据了整艘战舰一半以上的质量。"
+ HUGE_GRAY_WEAPON_KIN:0 "§Y「棒糖发射器」§!"
+ HUGE_GRAY_WEAPON_KIN_DESC:0 "§Y大就是好。§!\n这些密集的轴基无管动能炮发射质量前所未有的超级弹头，弹头能够自我加速到极限。却依然无法再次发射。"

 tech_gray_weapon_lance_1:0 "§Y纳米层级能量操纵§!"
 tech_gray_weapon_lance_1_desc:0 "通过研究L星门中灰色风暴战舰所使用的武器，我们得以使用纳米机器人部分还原这种技术。"
+
 tech_gray_matter_remix_2:0 "§Y纳米物质混合工程§!"
 tech_gray_matter_remix_2_desc:0 "通过将纳米机器人运用在特殊材料中，我们得以赋予这些材料新的性质。"

+ tech_gray_nano_fusion_3:0 "§Y纳米物质能量生产§!"
+ tech_gray_nano_fusion_3_desc:0 "利用纳米物质特性大幅压缩传统反应堆，极大提升能量产出效率。"
+
 tech_gray_nano_boost_3:0 "§Y纳米物质推进工程§!"
 tech_gray_nano_boost_3_desc:0 "将新的材料进一步加以改良，我们得以制造出可以自我产生推力的材料，使得更加精密的工程成为可能。"

@@ -220,6 +234,9 @@
 tech_gray_buffnut_6:0 "§Y纳米支援巨像工程§!"
 tech_gray_buffnut_6_desc:0 "拥有巨像技术的我们可以使用L星门技术设计新型的支援战舰，他们拥有巨大的潜力。"

+ tech_gray_cloaking_3:0 "§Y纳米光线追踪力场§!"
+ tech_gray_cloaking_3_desc:0 "通过逆向计算光线的照射路线，精细调整护盾力场，使得舰体在部分光线频谱不可见。显然这是一项昂贵的技术。"
+
 tech_gray_repair_system_1:0 "§Y$NAME_Gray$纳米修复系统§!"
 tech_gray_repair_system_1_desc:0 "在灰色风暴的残骸里发现了一种高效的船壳自动维修系统，由数十亿个微型纳米机器人组成，并已改造成可为我们所用。"

@@ -227,7 +244,7 @@
 tech_object_gray_5_desc:0 "通过日常维护$NAME_Gray$舰体以及...小小的逆向工程，我们得以部分复制$NAME_Gray$母舰的设计，当然，这一切还要征得$NAME_Gray$本人同意。"

 tech_minilaser_gray_1:0 "§Y$NAME_Gray$武器微型化§!"
- tech_minilaser_gray_1_desc:0 "从某个资料架上掉下来一个奇怪的盒子，经过研究里面装着一些奇怪的科技。"
+ tech_minilaser_gray_1_desc:0 "从某个资料架上掉下来一个奇怪的盒子，里面装着一份将纳米武器小型化的可行性验证设计图。"

 tech_gray_noway:0 "§Y$NAME_Gray$的不存在课题§!"
 tech_gray_noway_desc:0 "好像是一些奇怪的东西，还是不要管比较好吧。"
@@ -241,16 +258,16 @@
 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:0 "§H「远星之歌」§!"
+ RG_PLANET_KILLER_DESC:0 "§Y再度听到了星星的歌声。仿佛做了一个永恒的梦。§!\n§Y发射高能级纳米射线重构行星大气，将所有智慧生命形态彻底重构。以恒星级功率发射时，剧烈的扰动将摧毁恒星引发超新星爆炸，并污染星系中所有行星。若将能量重定向到敌舰上，嗯，会很痛。§!"
 RG_PLANET_KILLER_ACTION:0 "§H纳米注入§!"
 FLEETORDER_DESTROY_PLANET_WITH_RG_PLANET_KILLER:0 "准备注入$PLANET|Y$"
 MESSAGE_DESC_FOR_RG_PLANET_KILLER:0 "被执行了星球纳米转化"
 message_RG_planet_killer_killed_star_desc:0 "$RG_target_planet|Y$因遭受$RG_attacker|Y$的$RG_attacker_ship|Y$的§R恒星级功率纳米同化注入攻击而被彻底净化§!，$RG_target_system|Y$恒星系被§R灰蛊风暴彻底污染§!。"
 message_RG_planet_killer_killed_planet_desc:0 "$RG_target_planet|Y$因遭受$RG_attacker|Y$的$RG_attacker_ship|Y$的§R纳米同化注入攻击而被彻底净化§!。"

- RG_PLANET_KILLER_SMALL:0 "§H远星之歌§!"
- RG_PLANET_KILLER_SMALL_DESC:0 "§Y发射高能级纳米射线蒸发行星大气，彻底污染星球上所有物体。若将能量重定向到敌舰上，将造成大量伤害。§!"
+ RG_PLANET_KILLER_SMALL:0 "§H「远星之歌」§!"
+ RG_PLANET_KILLER_SMALL_DESC:0 "§Y再度听到了星星的歌声。仿佛做了一个永恒的梦。§!\n§Y发射高能级纳米射线重构行星大气，将所有智慧生命形态彻底重构。以恒星级功率发射时，剧烈的扰动将摧毁恒星引发超新星爆炸，并污染星系中所有行星。若将能量重定向到敌舰上，嗯，会很痛。§!"
 RG_PLANET_KILLER_SMALL_ACTION:0 "§H纳米注入§!"
 FLEETORDER_DESTROY_PLANET_WITH_RG_PLANET_KILLER_SMALL:0 "准备注入$PLANET|Y$"
 MESSAGE_DESC_FOR_RG_PLANET_KILLER_SMALL:0 "被执行了星球纳米转化"
@@ -287,6 +304,20 @@
 weapon_type_rg_torpedoe:0 "§Y鱼雷§!"
 weapon_type_rg_main:0 "§Y主武器§!"
 weapon_type_rg_armor:0 "§Y装甲部件§!"
+ weapon_type_rg_reactor:0 "§Y能源核心§!"
+
+ RG_FUSION_NANO_REACTOR:0 "§Y「梦核」§!"
+ RG_FUSION_NANO_REACTOR_DESC:0 "利用纳米物质的能量传导特性大幅压缩传统反应堆提升密度。如果要制造一颗恒星，还是把它关在笼子里比较好吧。"
+
+ RG_FUSION_NANO_REACTOR_S:0 "$RG_FUSION_NANO_REACTOR$"
+ RG_FUSION_NANO_REACTOR_S_DESC:0 "$RG_FUSION_NANO_REACTOR_DESC$"
+
+ RG_FUSION_NANO_REACTOR_M:0 "$RG_FUSION_NANO_REACTOR$"
+ RG_FUSION_NANO_REACTOR_M_DESC:0 "$RG_FUSION_NANO_REACTOR_DESC$"
+
+ RG_FUSION_NANO_REACTOR_L:0 "$RG_FUSION_NANO_REACTOR$"
+ RG_FUSION_NANO_REACTOR_L_DESC:0 "$RG_FUSION_NANO_REACTOR_DESC$"
+
 rg_distant_stars_modifier:0 "§H遥远繁星§!"
 rg_distant_stars_modifier_desc:0 "L-星团是一群距离我们所熟知的银河系相距极远的星系组成的星团。从内部几乎没有可能启动跃迁引擎回到银河系。\n§H当然你执意要出去...那我也没办法嘛。L-星门开启后自动移除该修正。§!"

@@ -299,13 +330,16 @@
 RG_AUTOCONST_HANGER_tool_tip:0 "§H自动工程队模块将会在星系探索完成后自动释放工程舰建造哨站。§!"
 RG_PLANET_KILLER_tool_tip:0 "伤害： §Y35000-350000§!\n冷却： §Y30.00£time£§!\n命中： §Y100%§!\n追踪： §Y100%§!\n射程： §Y0§! ~ §Y800§!\n发射扇面： §Y25§!度\n平均伤害： §Y5250.00/£time£§!\n\n§G+100% 船体伤害§!\n§G+100% 护盾伤害§!\n§G+100% 装甲伤害§!\n§G+100% 护盾穿透§!\n§G+100% 装甲穿透§!\n\n该武器依据目标舰船大小的§G100%§!施加额外的倍乘伤害。"

- RG_revive_component:0 "§Y原型折纸仪§!"
+ RG_revive_component:0 "§Y「折纸」§!"
 RG_REVIVE_COMPONENT_tooltip:0 "§H据说能够瞬间重组舰船的神奇设备。真想真正的看一眼。§!"

- RG_CORVETTE_CLOAKING_3:0 "§Y改装$CLOAKING_3$§!"
+ RG_CORVETTE_CLOAKING_3:0 "§Y「记忆中的流星」§!"
 RG_CORVETTE_CLOAKING_3_DESC:0 "通过$NAME_Gray$精细的能量输入调控，改装过的隐形场能够保留绝大多数的护盾强度的同时提高隐形场强度。但这种改造却无法量产。"
 RG_CLOAKING_3_TOOLTIP:0 "\n隐形时护盾强度削减： §R-10%§!"

+ TECH_UNLOCK_RG_CLOAKING_3_TITLE: "§H解锁部件：§!$RG_CORVETTE_CLOAKING_3$"
+ TECH_UNLOCK_RG_CLOAKING_3_DESC: "§H$RG_CORVETTE_CLOAKING_3$§!\n$tech_gray_cloaking_3_desc$"
+
 rg_gray_army_base:0 "§Y自走纳米机器战体§!"
 rg_gray_army_base_desc:0 "经过逆向工程制造出的纳米作战体复制品，只拥有有限的作战决策能力。不过仍具有巨大的威力。"

@@ -408,7 +442,7 @@
 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_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
@@ -22,7 +22,9 @@
 RG_gray_juggernaut:0 "§B纳米机器主宰舰§!"
 RG_gray_juggernaut_plural:0 "§B纳米机器主宰舰§!"
 RG_orbital_ring_tier_1:0 "§Y纳米星环防御终端§!"
- RG_orbital_ring_tier_1_plural:0 "§B纳米机器主宰舰§!"
+ RG_orbital_ring_tier_1_plural:0 "§Y纳米星环防御终端§!"
+ RG_graygoo_destroyer:0 "§Y纳米机器驱逐舰§!"
+ RG_graygoo_destroyer_plural:0 "§Y纳米机器驱逐舰§!"

 RG_gray_warship_key:0 "§Y$NAME_Gray$船体§!"
 RG_gray_warship_base_key:0 "§Y$NAME_Gray$船体§!"
@@ -61,3 +63,7 @@
 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 "纳-迪-沙空间站点"
+ NAME_RG_carrier_destroyer:0 "纳米机器航运单元"
+ NAME_RG_base_destroyer:0 "纳米机器阵列单元"
Author	SHA1	Message	Date
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	7fba597294	暂存	2023-11-04 15:21:08 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	0741aac406	暂存	2023-11-04 13:17:46 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	f95ac26913	暂存	2023-10-29 00:50:12 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	08c6ff9a6a	暂存	2023-10-29 00:33:16 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	b9cd8bf9f6	暂存	2023-10-28 23:49:01 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	185db2b335	icon	2023-10-28 22:19:18 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	7c341eb145	event tootltip	2023-10-28 20:58:38 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	9fc5a0358a	weapon	2023-10-28 16:31:32 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	86465b862e	Merge branch 'master' of https://cloud.armorrush.com/Kalospacer/realgray-stellaris-mod	2023-10-28 15:01:55 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	ac61fddf1e	re	2023-10-28 15:01:53 +08:00
$FA507RM-KALOSPA\Kalo$ FA507RM-KALOSPA\Kalo	cf69509930	textchange	2023-10-16 01:45:17 +08:00
$ProjectKoi-Kalo\Kalo$ ProjectKoi-Kalo\Kalo	a5c19c83e3	3.9改动不准引用未定义的event	2023-09-14 21:54:00 +08:00
$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