diff --git a/common/global_ship_designs/RG_graygoo_ship_designs.txt b/common/global_ship_designs/RG_graygoo_ship_designs.txt
index 6e356d5..6d41ca0 100644
--- a/common/global_ship_designs/RG_graygoo_ship_designs.txt
+++ b/common/global_ship_designs/RG_graygoo_ship_designs.txt
@@ -102,6 +102,164 @@ ship_design = {
 	required_component = "RG_COMBAT_COMPUTER_MotherShip"
 }
 
+# Gray Warship
+ship_design = {
+	name = "NAME_Gray_Warship_rg"
+	ship_size = RG_graygoo_mothership
+	is_event_design = yes
+	section = {
+		template = "RG_gray_warship_key"
+		slot = "mid"
+		component = {
+			slot = "PLANET_KILLER_GUN_01"
+			template = "RG_PLANET_KILLER_SMALL"
+		}
+		component = {
+			slot = "TITAN_01"
+			template = "GRAY_BEAM_STATIC_EX"
+		}
+		component = {
+			slot = "TORPEDO_01"
+			template = "RG_ENERGY_MISSILE"
+		}
+		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 = "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 = "STRIKE_CRAFT_01"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_02"
+			template = "RG_BOMBER_HANGAR_ATTACK_ROCKET"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_03"
+			template = "RG_BOMBER_HANGAR_AP_BOMB"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_04"
+			template = "RG_BOMBER_HANGAR_NEUTRON_TORPEDO"
+		}
+		component = {
+			slot = "PD_01"
+			template = "RG_FLAK_BATTERY"
+		}
+		component = {
+			slot = "PD_02"
+			template = "RG_FLAK_BATTERY"
+		}
+		component = {
+			slot = "PD_03"
+			template = "RG_FLAK_BATTERY"
+		}
+		component = {
+			slot = "PD_04"
+			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 = "LARGE_UTILITY_3"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_4"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_5"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_6"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_7"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_8"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_9"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_10"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_11"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_12"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "AUX_UTILITY_1"
+			template = "RG_AUTO_REPAIR"
+		}
+		component = {
+			slot = "AUX_UTILITY_2"
+			template = "RG_ARMOR_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_3"
+			template = "RG_ENIGMATIC_SCHEDULER"
+		}
+	}
+	required_component = "TITAN_ZERO_POINT_REACTOR"
+	required_component = "RG_gatebuilder_jump"
+	required_component = "RG_gatebuilder_sensor"
+	required_component = "RG_gatebuilder_thruster"
+	required_component = "RG_COMBAT_COMPUTER_MotherShip"
+	required_component = "RG_CORVETTE_CLOAKING_3"
+	required_component = "RG_SHIP_AURA_NANOBOT_CLOUD"
+}
+
 # Gray Goo capitalship
 ship_design = {
 	name = "NAME_gray_capitalship"
diff --git a/common/scripted_effects/RG_gray_goo_effects.txt b/common/scripted_effects/RG_gray_goo_effects.txt
index a3b71b1..8c33317 100644
--- a/common/scripted_effects/RG_gray_goo_effects.txt
+++ b/common/scripted_effects/RG_gray_goo_effects.txt
@@ -584,164 +584,4 @@ rg_create_gray_const = {
 			set_skill = owner.rg_gray_level
 		}
 	}
-}
-
-rg_warship_init_mod1 = {
-	create_fleet = {
-		name = "NAME_Gray"
-		settings = {
-			can_upgrade = no
-			can_disband = no
-			can_change_composition = no
-			can_change_leader = yes
-			uses_naval_capacity = no
-			spawn_debris = no
-		}
-		effect = {
-			set_owner = prev
-			create_ship = {
-				name = "NAME_Gray"
-				design = "NAME_Gray_Warship"
-				prefix = no
-				upgradable = yes
-			}
-			set_fleet_stance = aggressive
-			set_location = {
-				target = event_target:global_gray_location
-				distance = 0
-				angle = random
-			}
-			set_fleet_flag = gray_fleet
-			save_global_event_target_as = gray_warship
-			assign_leader = event_target:gray_leader_admiral
-			if = {
-				limit = {
-					has_global_flag = kdc_event_mod_active
-				}
-				add_modifier = {
-					modifier = remove_fleet_maintenance
-				}
-			}
-		}
-	}
-}
-
-rg_warship_init_mod2 = {
-	create_fleet = {
-		name = "NAME_Gray"
-		settings = {
-			can_upgrade = no
-			can_disband = no
-			can_change_composition = no
-			can_change_leader = yes
-			uses_naval_capacity = no
-			spawn_debris = no
-		}
-		effect = {
-			set_owner = prev
-			create_ship = {
-				name = "NAME_Gray"
-				random_existing_design = RG_graygoo_capitalship
-				prefix = no
-				upgradable = yes
-			}
-			set_fleet_stance = aggressive
-			set_location = {
-				target = event_target:global_gray_location
-				distance = 0
-				angle = random
-			}
-			set_fleet_flag = gray_fleet
-			save_global_event_target_as = gray_warship
-			assign_leader = event_target:gray_leader_admiral
-			if = {
-				limit = {
-					has_global_flag = kdc_event_mod_active
-				}
-				add_modifier = {
-					modifier = remove_fleet_maintenance
-				}
-			}
-		}
-	}
-}
-
-rg_warship_init_mod3 = {
-	create_fleet = {
-		name = "NAME_Gray"
-		settings = {
-			can_upgrade = no
-			can_disband = no
-			can_change_composition = no
-			can_change_leader = yes
-			uses_naval_capacity = no
-			spawn_debris = no
-		}
-		effect = {
-			set_owner = prev
-			create_ship = {
-				name = "NAME_Gray"
-				design = "NAME_gray_juggernautship"
-				# random_existing_design = RG_gray_juggernaut
-				prefix = no
-				upgradable = yes
-			}
-			set_fleet_stance = aggressive
-			set_location = {
-				target = event_target:global_gray_location
-				distance = 0
-				angle = random
-			}
-			set_fleet_flag = gray_fleet
-			save_global_event_target_as = gray_warship
-			if = {
-				limit = {
-					has_global_flag = kdc_event_mod_active
-				}
-				add_modifier = {
-					modifier = remove_fleet_maintenance
-				}
-			}
-		}
-	}
-}
-
-rg_warship_init_mod0 = {
-	create_fleet = {
-		name = "NAME_Gray"
-		settings = {
-			can_upgrade = no
-			can_disband = no
-			can_change_composition = no
-			can_change_leader = yes
-			uses_naval_capacity = no
-			spawn_debris = no
-		}
-		effect = {
-			set_owner = prev
-			create_ship = {
-				name = "NAME_Gray"
-				design = "NAME_Gray_Warship_base"
-				prefix = no
-				upgradable = yes
-			}
-			set_fleet_stance = aggressive
-			set_location = {
-				target = event_target:global_gray_location
-				distance = 0
-				angle = random
-			}
-			set_fleet_flag = gray_fleet
-			save_global_event_target_as = gray_warship
-			assign_leader = event_target:gray_leader_admiral
-			if = {
-				limit = {
-					has_global_flag = kdc_event_mod_active
-				}
-				add_modifier = {
-					modifier = remove_fleet_maintenance
-				}
-			}
-		}
-	}
-}
+}
\ No newline at end of file
diff --git a/common/scripted_effects/rg_gray_warship_init_effects.txt b/common/scripted_effects/rg_gray_warship_init_effects.txt
new file mode 100644
index 0000000..ec3b7c5
--- /dev/null
+++ b/common/scripted_effects/rg_gray_warship_init_effects.txt
@@ -0,0 +1,160 @@
+#普通的母舰
+rg_warship_init_mod1 = {
+	create_fleet = {
+		name = "NAME_Gray"
+		settings = {
+			can_upgrade = no
+			can_disband = no
+			can_change_composition = no
+			can_change_leader = yes
+			uses_naval_capacity = no
+			spawn_debris = no
+		}
+		effect = {
+			set_owner = prev
+			create_ship = {
+				name = "NAME_Gray"
+				design = "NAME_Gray_Warship_rg"
+				prefix = no
+				upgradable = yes
+			}
+			set_fleet_stance = aggressive
+			set_location = {
+				target = event_target:global_gray_location
+				distance = 0
+				angle = random
+			}
+			set_fleet_flag = gray_fleet
+			save_global_event_target_as = gray_warship
+			assign_leader = event_target:gray_leader_admiral
+			if = {
+				limit = {
+					has_global_flag = kdc_event_mod_active
+				}
+				add_modifier = {
+					modifier = remove_fleet_maintenance
+				}
+			}
+		}
+	}
+}
+#纳米旗舰
+rg_warship_init_mod2 = {
+	create_fleet = {
+		name = "NAME_Gray"
+		settings = {
+			can_upgrade = no
+			can_disband = no
+			can_change_composition = no
+			can_change_leader = yes
+			uses_naval_capacity = no
+			spawn_debris = no
+		}
+		effect = {
+			set_owner = prev
+			create_ship = {
+				name = "NAME_Gray"
+				random_existing_design = RG_graygoo_capitalship
+				prefix = no
+				upgradable = yes
+			}
+			set_fleet_stance = aggressive
+			set_location = {
+				target = event_target:global_gray_location
+				distance = 0
+				angle = random
+			}
+			set_fleet_flag = gray_fleet
+			save_global_event_target_as = gray_warship
+			assign_leader = event_target:gray_leader_admiral
+			if = {
+				limit = {
+					has_global_flag = kdc_event_mod_active
+				}
+				add_modifier = {
+					modifier = remove_fleet_maintenance
+				}
+			}
+		}
+	}
+}
+#纳米主宰
+rg_warship_init_mod3 = {
+	create_fleet = {
+		name = "NAME_Gray"
+		settings = {
+			can_upgrade = no
+			can_disband = no
+			can_change_composition = no
+			can_change_leader = yes
+			uses_naval_capacity = no
+			spawn_debris = no
+		}
+		effect = {
+			set_owner = prev
+			create_ship = {
+				name = "NAME_Gray"
+				design = "NAME_gray_juggernautship"
+				# random_existing_design = RG_gray_juggernaut
+				prefix = no
+				upgradable = yes
+			}
+			set_fleet_stance = aggressive
+			set_location = {
+				target = event_target:global_gray_location
+				distance = 0
+				angle = random
+			}
+			set_fleet_flag = gray_fleet
+			save_global_event_target_as = gray_warship
+			if = {
+				limit = {
+					has_global_flag = kdc_event_mod_active
+				}
+				add_modifier = {
+					modifier = remove_fleet_maintenance
+				}
+			}
+		}
+	}
+}
+#略有磨损的母舰
+rg_warship_init_mod0 = {
+	create_fleet = {
+		name = "NAME_Gray"
+		settings = {
+			can_upgrade = no
+			can_disband = no
+			can_change_composition = no
+			can_change_leader = yes
+			uses_naval_capacity = no
+			spawn_debris = no
+		}
+		effect = {
+			set_owner = prev
+			create_ship = {
+				name = "NAME_Gray"
+				design = "NAME_Gray_Warship_base"
+				prefix = no
+				upgradable = yes
+			}
+			set_fleet_stance = aggressive
+			set_location = {
+				target = event_target:global_gray_location
+				distance = 0
+				angle = random
+			}
+			set_fleet_flag = gray_fleet
+			save_global_event_target_as = gray_warship
+			assign_leader = event_target:gray_leader_admiral
+			if = {
+				limit = {
+					has_global_flag = kdc_event_mod_active
+				}
+				add_modifier = {
+					modifier = remove_fleet_maintenance
+				}
+			}
+		}
+	}
+}