空间站核心

revert 暂存

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.idea/Real Gray.iml

@@ -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>

.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>

.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>

README.md

@@ -1,2 +1,2 @@
 # Real-Gray
-Stellaris mod real gray page.
+Stellaris mod real gray page.

Real 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>

common/agreement_presets/RG_agreement_presets.txt

@@ -0,0 +1,37 @@
+##############
+# SCION
+##############
+
+preset_rg_scion = {
+	icon = "GFX_diplomacy_status_is_scion"
+	term_data = {
+		discrete_terms = {
+			{ key = specialist_type				value = specialist_none }
+			{ key = subject_integration			value = subject_can_not_be_integrated }
+			{ key = subject_diplomacy			value = subject_can_do_diplomacy }
+			{ key = subject_expand				value = subject_can_expand }
+			{ key = joins_overlord_wars			value = joins_overlord_wars_all }
+			{ key = joins_subject_wars			value = joins_subject_wars_all }
+			{ key = subject_holdings_limit		value = subject_holdings_limit_0 }
+			{ key = subject_sensors				value = subject_does_not_get_sensors }
+		}
+		resource_terms = {
+			{ key = resource_subsidies_basic	value = -0.5 }
+			{ key = resource_subsidies_advanced		value = -0.5 }
+			{ key = resource_subsidies_strategic	value = -0.5 }
+			# { key = resource_subsidies_research value = -0.35 }
+		}
+	}
+	potential = {
+		# any_agreement = {
+		# 	agreement_preset = preset_rg_scion
+		# }
+		from = {
+			OR = {
+				is_country_type = fallen_empire
+				is_country_type = awakened_fallen_empire
+				has_country_flag = rg_scion_master
+			}
+		}
+	}
+}

common/ascension_perks/rg_ascension_perks.txt

@@ -18,8 +18,10 @@ rg_ap_nantiematter = {
 		OR = {
 			has_country_flag = origin_rg_gray
 			has_country_flag = gray_owner
-			has_event_chain = l_cluster_chain
-			has_technology = tech_lgate_activation
+			AND = {
+				has_event_chain = l_cluster_chain
+				has_technology = tech_lgate_activation
+			}
 		}
 		is_ai = no
 	}

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
 }
 
@@ -159,4 +159,4 @@ component_set = {
 	key = "RG_REVIVE_COMPONENT"
 	icon = "GFX_ship_part_aura_inspiring_presence"
 	icon_frame = 1
-}
+}

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
@@ -157,35 +175,6 @@ utility_component_template = {
 	}
 }
 
-utility_component_template = {
-	key = "RG_Mothership_ZERO_POINT_REACTOR"
-	size = small
-	icon = "GFX_ship_part_reactor_5"
-	icon_frame = 1
-	power = 5000
-	resources = {
-		category = ship_components
-		cost = {
-			alloys = 224
-		}
-		upkeep = {
-			energy = 2.29
-			alloys = 0.229
-		}
-	}
-	prerequisites = {
-		"tech_zero_point_power"
-	}
-	component_set = "power_core"
-	size_restriction = {
-		RG_graygoo_mothership
-	}
-	upgrades_to = "RG_Interdictor_DARK_MATTER_REACTOR"
-	ai_weight = {
-		weight = 5
-	}
-}
-
 utility_component_template = {
 	key = "RG_Interdictor_DARK_MATTER_REACTOR"
 	size = small
@@ -208,6 +197,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
@@ -223,12 +214,168 @@ utility_component_template = {
 	}
 }
 
+utility_component_template = {
+	key = "RG_Mothership_FISSION_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_1"
+	icon_frame = 1
+	power = 7700
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 44.8
+		}
+		upkeep = {
+			energy = 0.458
+			alloys = 0.045
+		}
+	}
+
+	prerequisites = { "tech_fission_power" }
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_FUSION_REACTOR"
+
+	ai_weight = {
+		weight = 1
+	}
+}
+
+utility_component_template = {
+	key = "RG_Mothership_FUSION_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_2"
+	icon_frame = 1
+	power = 15400
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 89.6
+		}
+		upkeep = {
+			energy = 0.92
+			alloys = 0.09
+		}
+	}
+
+	prerequisites = { "tech_fusion_power" }
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_COLD_FUSION_REACTOR"
+
+	ai_weight = {
+		weight = 2
+	}
+}
+
+utility_component_template = {
+	key = "RG_Mothership_COLD_FUSION_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_3"
+	icon_frame = 1
+	power = 23100
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 134
+		}
+		upkeep = {
+			energy = 1.37
+			alloys = 0.137
+		}
+	}
+
+	prerequisites = { "tech_cold_fusion_power" }
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_ANTIMATTER_REACTOR"
+
+	ai_weight = {
+		weight = 3
+	}
+}
+
+utility_component_template = {
+	key = "RG_Mothership_ANTIMATTER_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_4"
+	icon_frame = 1
+	power = 30800
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 179
+		}
+		upkeep = {
+			energy = 1.83
+			alloys = 0.183
+		}
+	}
+
+	prerequisites = { "tech_antimatter_power" }
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_ZERO_POINT_REACTOR"
+
+	ai_weight = {
+		weight = 4
+	}
+}
+
+
+utility_component_template = {
+	key = "RG_Mothership_ZERO_POINT_REACTOR"
+	size = small
+	icon = "GFX_ship_part_reactor_5"
+	icon_frame = 1
+	power = 38500
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = 224
+		}
+		upkeep = {
+			energy = 2.29
+			alloys = 0.229
+		}
+	}
+	prerequisites = {
+		"tech_zero_point_power"
+	}
+	component_set = "power_core"
+	size_restriction = {
+		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+	}
+	upgrades_to = "RG_Mothership_DARK_MATTER_REACTOR"
+	ai_weight = {
+		weight = 5
+	}
+}
+
 utility_component_template = {
 	key = "RG_Mothership_DARK_MATTER_REACTOR"
 	size = small
 	icon = "GFX_ship_part_dark_matter_power_core"
 	icon_frame = 1
-	power = 6000
+	power = 
 	resources = {
 		category = ship_components
 		cost = {
@@ -246,6 +393,8 @@ utility_component_template = {
 	component_set = "power_core"
 	size_restriction = {
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	ai_weight = {
 		weight = 6
@@ -274,7 +423,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
 	}
@@ -283,6 +436,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
@@ -302,10 +487,14 @@ 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
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	upgrades_to = "BATTLESHIP_SHIP_THRUSTER_2"
@@ -335,10 +524,14 @@ 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
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	upgrades_to = "BATTLESHIP_SHIP_THRUSTER_3"
@@ -368,10 +561,14 @@ 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
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	upgrades_to = "BATTLESHIP_SHIP_THRUSTER_4"
@@ -401,10 +598,14 @@ 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
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	upgrades_to = "BATTLESHIP_SHIP_THRUSTER_5"
@@ -435,10 +636,14 @@ 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
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -469,6 +674,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "PLANET_KILLER_CRACKER"
 	planet_destruction_gfx = "shatter_planet_gfx"
@@ -488,6 +695,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "PLANET_KILLER_SHIELDER"
 	planet_destruction_gfx = "global_pacifier_gfx"
@@ -507,6 +716,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "PLANET_KILLER_NEUTRON"
 	planet_destruction_gfx = "neutron_planet_gfx"
@@ -526,6 +737,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "PLANET_KILLER_GODRAY"
 	planet_destruction_gfx = "god_ray_gfx"
@@ -545,6 +758,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "PLANET_KILLER_NANOBOTS"
 	planet_destruction_gfx = "assimilation_nanobots_gfx"
@@ -564,6 +779,8 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "PLANET_KILLER_DELUGE"
 	planet_destruction_gfx = "planet_deluge_gfx"
@@ -614,9 +831,13 @@ 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_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -647,10 +868,14 @@ 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
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -686,9 +911,13 @@ 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_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -718,10 +947,14 @@ 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
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -757,10 +990,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_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -790,10 +1027,14 @@ 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
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
 	}
 	ai_weight = {
@@ -1020,4 +1261,4 @@ utility_component_template = {
 	ai_weight = {
 		weight = 25
 	}
-}
+}

common/component_templates/RG_ship_parts.txt

@@ -12,14 +12,20 @@ utility_component_template = {
 		ship_armor_regen_add_perc = 0.2
 		ship_hull_add = 1960
 		ship_hull_regen_add_perc = 0.2
-		ship_shield_add = 980
-		ship_shield_regen_add_perc = 0.1
 	}
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+		RG_armed_science_ship
+		RG_armed_constructor_ship
+		RG_armed_transport_ship
+		RG_armed_colony_ship
+		RG_graygoo_icebreaker_interdictor
 	}
 	prerequisites = {
 		"tech_gray_matter_remix_2"
@@ -38,6 +44,9 @@ utility_component_template = {
 			alloys = 2
 		}
 	}
+	ai_weight = {
+		weight = 0
+	}
 }
 
 #超限聚合装甲
@@ -50,15 +59,14 @@ utility_component_template = {
 	power = 0
 	power = -180
 	modifier = {
-		ship_armor_add = 13840
+		ship_armor_add = 7680
 		ship_armor_regen_add_perc = 0.2
-		ship_hull_add = 11960
+		ship_hull_add = 3920
 		ship_hull_regen_add_perc = 0.2
-		ship_shield_add = 4560
-		ship_shield_regen_add_perc = 0.1
 	}
 	size_restriction = {
 		RG_graygoo_capitalship
+		RG_gray_juggernaut
 	}
 	prerequisites = {
 		"tech_gray_matter_remix_2"
@@ -77,6 +85,9 @@ utility_component_template = {
 			alloys = 2
 		}
 	}
+	ai_weight = {
+		weight = 0
+	}
 }
 
 #L槽光矛
@@ -85,7 +96,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
@@ -107,10 +118,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 = {
@@ -126,6 +135,9 @@ weapon_component_template = {
 	tags = {
 		weapon_type_energy
 	}
+	ai_weight = {
+		weight = 0
+	}
 }
 
 #S槽光矛Mini
@@ -137,8 +149,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
@@ -156,8 +168,8 @@ weapon_component_template = {
 	tags = {
 		weapon_type_rg_secondary
 	}
+	armor_damage = 1.2
 	shield_penetration = 1
-	armor_penetration = 1
 	resources = {
 		category = ship_components
 		cost = {
@@ -172,6 +184,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
@@ -195,8 +259,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"
@@ -221,6 +285,9 @@ weapon_component_template = {
 		weapon_type_energy
 	}
 	projectile_gfx = "gatebuilder_lance_weapon"
+	ai_weight = {
+		weight = 0
+	}
 }
 
 #X槽光矛
@@ -244,10 +311,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"
@@ -272,6 +337,9 @@ weapon_component_template = {
 		weapon_type_energy
 	}
 	projectile_gfx = "gatebuilder_lance_weapon"
+	ai_weight = {
+		weight = 0
+	}
 }
 
 #歼星武器
@@ -319,13 +387,12 @@ weapon_component_template = {
 	}
 	size_restriction = {
 		RG_graygoo_capitalship
-		RG_graygoo_mothership
+		RG_gray_juggernaut
 	}
 	component_set = "RG_PLANET_KILLER"
 	prerequisites = {
-		"tech_object_gray_6"
+		"tech_gray_juggernaut_8"
 	}
-	hidden = yes
 	ship_limit = 1
 	ai_weight = {
 		weight = 0
@@ -378,12 +445,12 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_capitalship
 		RG_graygoo_mothership
+		RG_gray_juggernaut
 	}
 	component_set = "RG_PLANET_KILLER"
 	prerequisites = {
-		"tech_object_gray_6"
+		"tech_gray_juggernaut_8"
 	}
-	hidden = yes
 	ship_limit = 1
 	ai_weight = {
 		weight = 0
@@ -411,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
@@ -439,6 +506,9 @@ weapon_component_template = {
 		weapon_type_energy
 	}
 	projectile_gfx = "gatebuilder_titan_weapon_ex"
+	ai_weight = {
+		weight = 0
+	}
 }
 
 #点防
@@ -458,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
@@ -500,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
@@ -528,6 +598,7 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_capitalship
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
 	}
 	prerequisites = {
 		"tech_gray_buffnut_6"
@@ -559,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
@@ -580,13 +651,14 @@ weapon_component_template = {
 	size_restriction = {
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	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 = {
@@ -601,6 +673,9 @@ weapon_component_template = {
 	tags = {
 		weapon_type_kinetic
 	}
+	ai_weight = {
+		weight = 0
+	}
 }
 
 #一次性动能炮-聚合
@@ -611,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
@@ -630,14 +705,16 @@ weapon_component_template = {
 		"tech_gray_matter_spray_5"
 	}
 	size_restriction = {
+		RG_graygoo_Arsenal
+		RG_graygoo_mothership
+		RG_gray_juggernaut
 		RG_graygoo_capitalship
 	}
 	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 = {
@@ -652,6 +729,9 @@ weapon_component_template = {
 	tags = {
 		weapon_type_kinetic
 	}
+	ai_weight = {
+		weight = 0
+	}
 }
 
 #无制导
@@ -679,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 = {
@@ -703,6 +779,9 @@ weapon_component_template = {
 			alloys = 0
 		}
 	}
+	ai_weight = {
+		weight = 0
+	}
 }
 
 #鱼雷
@@ -728,6 +807,7 @@ weapon_component_template = {
 	power = -180
 	tags = {
 		weapon_type_energy
+		weapon_type_rg_torpedoe
 	}
 	projectile_gfx = "gatebuilder_torpedo"
 	prerequisites = {
@@ -740,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 = {
@@ -766,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
@@ -825,10 +903,6 @@ strike_craft_component_template = {
 			alloys = 0.2
 		}
 	}
-	size_restriction = {
-		RG_graygoo_interdictor
-		RG_graygoo_mothership
-	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
@@ -853,13 +927,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 = {
@@ -891,10 +963,6 @@ strike_craft_component_template = {
 			alloys = 0.2
 		}
 	}
-	size_restriction = {
-		RG_graygoo_interdictor
-		RG_graygoo_mothership
-	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
@@ -922,13 +990,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 = {
@@ -960,10 +1026,6 @@ strike_craft_component_template = {
 			alloys = 0.2
 		}
 	}
-	size_restriction = {
-		RG_graygoo_interdictor
-		RG_graygoo_mothership
-	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
@@ -990,13 +1052,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 = {
@@ -1030,10 +1090,6 @@ strike_craft_component_template = {
 			alloys = 0.2
 		}
 	}
-	size_restriction = {
-		RG_graygoo_interdictor
-		RG_graygoo_mothership
-	}
 	prerequisites = {
 		"tech_gray_nano_boost_3"
 	}
@@ -1058,11 +1114,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 = {
@@ -1092,11 +1146,18 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_colossus"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Buff
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
+		RG_armed_science_ship
+		RG_armed_constructor_ship
+		RG_armed_transport_ship
+		RG_armed_colony_ship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1130,9 +1191,12 @@ utility_component_template = {
 	}
 	ship_behavior = "rg_carrier_behavior"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1166,9 +1230,12 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_line"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1202,9 +1269,12 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_artillery"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1242,6 +1312,8 @@ utility_component_template = {
 	}
 	size_restriction = {
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	tags = {
 		weapon_type_rg_computer
@@ -1272,10 +1344,13 @@ utility_component_template = {
 	}
 	ship_behavior = "rg_aura_behavior"
 	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_interdictor_4"
@@ -1309,9 +1384,12 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_battle"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1345,9 +1423,12 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_torpedo"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1381,9 +1462,12 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_AA"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1417,10 +1501,13 @@ utility_component_template = {
 	}
 	ship_behavior = "RG_icebreak"
 	size_restriction = {
+		RG_graygoo_destroyer
 		RG_graygoo_interdictor
 		RG_graygoo_Arsenal
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_interdictor_4"
@@ -1450,6 +1537,8 @@ utility_component_template = {
 		titan
 		RG_graygoo_Buff
 		RG_graygoo_mothership
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "ship_aura_components"
 	prerequisites = {
@@ -1561,7 +1650,7 @@ utility_component_template = {
 		weapon_type_rg_aux
 	}
 	ai_weight = {
-		weight = 5
+		weight = 0
 	}
 }
 
@@ -1710,7 +1799,7 @@ weapon_component_template = {
 		}
 	}
 	ai_weight = {
-		weight = 1
+		weight = 0
 	}
 }
 
@@ -1800,6 +1889,8 @@ utility_component_template = {
 	hidden = yes
 	size_restriction = {
 		RG_graygoo_Buff
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "ship_aura_components"
 	tags = {
@@ -1856,6 +1947,8 @@ utility_component_template = {
 	hidden = yes
 	size_restriction = {
 		RG_graygoo_Buff
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	component_set = "ship_aura_components"
 	tags = {
@@ -1934,6 +2027,8 @@ weapon_component_template = {
 	tracking = 0
 	size_restriction = {
 		RG_graygoo_Buff
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_buffnut_6"
@@ -2018,6 +2113,8 @@ weapon_component_template = {
 	tracking = 0
 	size_restriction = {
 		RG_graygoo_Buff
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	prerequisites = {
 		"tech_gray_buffnut_6"
@@ -2093,17 +2190,18 @@ 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
+	# hidden = yes
 	resources = {
 		category = ship_components
 		cost = {
 			alloys = 300
+			nanties = 10
 		}
 	}
-	#prerequisites = { "tech_gray_interdictor_4" }
+	prerequisites = { "tech_gray_nano_boost_3" }
 	ftl = yes
 	jumpdrive = yes
 	ship_modifier = {
@@ -2115,10 +2213,7 @@ utility_component_template = {
 		weapon_type_rg_jumpdrive
 	}
 	ai_weight = {
-		weight = 100
-	}
-	class_restriction = {
-		shipclass_military
+		weight = 0
 	}
 	component_set = "ftl_components"
 }
@@ -2127,19 +2222,20 @@ 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
+	# hidden = yes
 	resources = {
 		category = ship_components
 		cost = {
 			alloys = 100
+			nanties = 5
 		}
 	}
 	sensor_range = 15
 	hyperlane_range = 20
-	#prerequisites = { "tech_gray_interdictor_4" }
+	prerequisites = { "tech_gray_matter_remix_2" }
 	ship_modifier = {
 		ship_tracking_add = 20
 	}
@@ -2148,7 +2244,7 @@ utility_component_template = {
 		weapon_type_rg_sensor
 	}
 	ai_weight = {
-		weight = 100
+		weight = 0
 	}
 }
 
@@ -2156,30 +2252,130 @@ 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
+	# hidden = yes
 	resources = {
 		category = ship_components
 		cost = {
 			alloys = 200
+			nanties = 10
 		}
 	}
-	#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
+	}
+	size_restriction = {
+		RG_graygoo_destroyer
+		RG_armed_science_ship
+		RG_armed_constructor_ship
+		RG_armed_transport_ship
+		RG_armed_colony_ship
+	}
+	component_set = "power_core"
+	ai_weight = {
+		weight = 0
+	}
+}
+
+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_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 = 92400
+	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
+		RG_graygoo_mothership
+	}
+	ai_weight = {
+		weight = 0
 	}
 }
 
@@ -2194,6 +2390,7 @@ utility_component_template = {
 		category = ship_components
 		cost = {
 			alloys = 200
+			nanties = 10
 		}
 	}
 	modifier = {
@@ -2222,9 +2419,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
+	}
 }

common/component_templates/RG_special_ship_parts.txt

@@ -39,6 +39,7 @@ weapon_component_template = {
 		weapon_type_energy
 	}
 	size_restriction = {
+		RG_gray_juggernaut
 		RG_graygoo_capitalship
 		RG_graygoo_mothership
 	}

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
-		}
-	}
-}

common/fallen_empires/RG_fallen_empire.txt

@@ -0,0 +1,109 @@
+# Machine
+# rg_fallen_gray_empire = {
+# 	graphical_culture = "fallen_machine_empire_01"
+# 	initializer = "rg_fallen_machine"
+# 
+# 	weight_modifier = {
+# 		base = 1
+# 		modifier = {
+# 			factor = 100000
+# 			has_origin = rg_origin_scion
+# 		}
+# 	}
+# 
+# 	possible = {
+# 		host_has_dlc = "Synthetic Dawn Story Pack"
+# 	}
+# 
+# 	create_country_effect = {
+# 		create_species = {
+# 			name = 纳米构造体
+# 			class = RG_MACHINE
+# 			portrait = "rg_machine_maid"
+# 			traits = {
+# 				trait = trait_machine_unit
+# 				trait = rg_machine_maid_trait
+# 				trait = trait_robot_mass_produced
+# 				trait = ramdom_trait
+# 			}
+# 			extra_trait_points = 3
+# 			allow_negative_traits = no
+# 			namelist = MACHINE3
+# 			effect = {
+# 				save_event_target_as = rg_fallen_maid_species
+# 			}
+# 		}
+# 		create_country = {
+# 			name = 德萨努-纳迪沙协议
+# 			type = fallen_empire
+# 			flag = {
+# 				icon = {
+# 					category = "special"
+# 					file = "gray_goo.dds"
+# 				}
+# 				background = {
+# 					category = "backgrounds"
+# 					file = "sinus.dds"
+# 				}
+# 				colors = {
+# 					"grey"
+# 					"dark_grey"
+# 					"null"
+# 					"null"
+# 				}
+# 			}
+# 			ignore_initial_colony_error = yes
+# 			authority = auth_machine_intelligence
+# 			civics = {
+# 				civic = civic_machine_remnants
+# 				civic = civic_custodian_directives
+# 			}
+# 			species = last_created_species
+# 			ethos = {
+# 				ethic = ethic_gestalt_consciousness
+# 			}
+# 			origin = "origin_fallen_empire"
+# 			effect = {
+# 				save_global_event_target_as = rg_fe_country
+# 				set_country_flag = rg_fallen_empire_machine
+# 				add_resource = {
+# 					minerals = 10000
+# 					energy = 10000
+# 					food = 1000
+# 					influence = 500
+# 				}
+# 				if = {
+# 					limit = { host_has_dlc = "Apocalypse" }
+# 					give_technology = {
+# 						tech = tech_colossus
+# 						message = no
+# 					}
+# 				}
+# 				# must initialize global designs here
+# 				add_global_ship_design = "NAME_Gray_Omega"
+# 				add_global_ship_design = "NAME_Gray_Alpha"
+# 				add_global_ship_design = "NAME_Gray_Beta"
+# 				add_global_ship_design = "NAME_Gray_Gamma"
+# 				add_global_ship_design = "NAME_Gray_Theta"
+# 				add_global_ship_design = "NAME_Gray_Tau"
+# 				add_global_ship_design = "NAME_Gray_Sigma"
+# 				add_global_ship_design = "NAME_Gray_FE_Starbase"
+# 				if = {
+# 					limit = {
+# 						NOT = {
+# 							exist = event_target:rg_gray_country_leader
+# 						}
+# 					}
+# 					rg_gray_country_leader_init = yes
+# 					set_leader = last_created_leader
+# 				}
+# 				else = {
+# 					set_leader = last_created_leader
+# 				}
+# 				ruler = {
+# 					add_skill = 9
+# 				}
+# 			}
+# 		}
+# 	}
+# }

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"
 }
 

common/global_ship_designs/RG_fallen_empire_ship_designs.txt

@@ -0,0 +1,607 @@
+#############################
+### Fallen Machine Empire ###
+#############################
+
+# Planet Destroyer
+ship_design = {
+	name = "NAME_Gray_Omega"
+	ship_size = colossus
+	section = {
+		template = "SHIP_COLOSSUS_SECTION"
+		slot = "ship"
+
+		component = {
+			slot = "PLANET_KILLER_GUN_01"
+			template = "RG_PLANET_KILLER"
+		}
+		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"
+		}
+	}
+	required_component="SENSOR_4"
+	required_component="JUMP_DRIVE_1"
+	required_component="COLOSSUS_DARK_MATTER_REACTOR"
+	required_component="COLOSSUS_SHIP_THRUSTER_5"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+# Massive Ship
+ship_design = {
+	name = "NAME_Gray_Alpha"
+	ship_size = massive_ship_fallen_empire
+	section = {
+		template = "fallen_empire_massive_warship_key"
+		slot = "mid"
+
+		component = {
+			slot = "TITANIC_01"
+			template = "GRAY_BEAM_STATIC_EX"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_01"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_02"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_03"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		component = {
+			slot = "STRIKE_CRAFT_04"
+			template = "RG_FIGHTER_HANGAR_BEAM"
+		}
+		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 = "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 = "MEDIUM_GUN_04"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		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 = "LARGE_UTILITY_13"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_14"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_15"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_16"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_17"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_18"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_19"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "LARGE_UTILITY_20"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "AUX_UTILITY_1"
+			template = "SHIELD_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_2"
+			template = "SHIELD_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_3"
+			template = "SHIELD_BOOSTER"
+		}
+	}
+	required_component="SENSOR_4"
+	required_component="JUMP_DRIVE_1"
+	required_component="COMBAT_COMPUTER_ARTILLERY_SAPIENT"
+	required_component="TITAN_DARK_MATTER_REACTOR"
+	required_component="TITAN_SHIP_THRUSTER_5"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+# Large Ship
+ship_design = {
+	name = "NAME_Gray_Beta"
+	ship_size = large_ship_fallen_empire
+	section = {
+		template = "fallen_empire_large_warship_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 = "EXTRA_LARGE_01"
+			template = "GRAY_BEAM_STATIC_X"
+		}
+		component = {
+			slot = "EXTRA_LARGE_02"
+			template = "GRAY_BEAM_STATIC_X"
+		}
+		component = {
+			slot = "LARGE_GUN_01"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_02"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		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 = "MEDIUM_GUN_04"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		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 = "AUX_UTILITY_1"
+			template = "SHIELD_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_2"
+			template = "SHIELD_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_3"
+			template = "SHIELD_BOOSTER"
+		}
+	}
+	required_component="SENSOR_4"
+	required_component="JUMP_DRIVE_1"
+	required_component="COMBAT_COMPUTER_LINE_SAPIENT"
+	required_component="BATTLESHIP_DARK_MATTER_REACTOR"
+	required_component="BATTLESHIP_SHIP_THRUSTER_5"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+# Small Ship
+ship_design = {
+	name = "NAME_Gray_Gamma"
+	ship_size = small_ship_fallen_empire
+	section = {
+		template = "fallen_empire_warship_small_key"
+		slot = "mid"
+
+		component = {
+			slot = "LARGE_GUN_01"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_02"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "SMALL_GUN_01"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "SMALL_GUN_02"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "SMALL_GUN_03"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "SMALL_GUN_04"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		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 = "MEDIUM_UTILITY_1"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "MEDIUM_UTILITY_2"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "MEDIUM_UTILITY_3"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "MEDIUM_UTILITY_4"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "MEDIUM_UTILITY_5"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "MEDIUM_UTILITY_6"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "AUX_UTILITY_1"
+			template = "SHIELD_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_2"
+			template = "SHIELD_BOOSTER"
+		}
+	}
+	required_component="SENSOR_4"
+	required_component="JUMP_DRIVE_1"
+	required_component="COMBAT_COMPUTER_PICKET_SAPIENT"
+	required_component="DESTROYER_DARK_MATTER_REACTOR"
+	required_component="DESTROYER_SHIP_THRUSTER_5"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+# Defense Platform
+ship_design = {
+	name = "NAME_Gray_Sigma"
+	ship_size = military_station_small_fallen_empire
+	section = {
+		template = "fallen_empire_station_small_key"
+		slot = "mid"
+
+		component = {
+			slot = "LARGE_GUN_01"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_02"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+		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 = "MEDIUM_GUN_04"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_05"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "PD_01"
+			template = "RG_FLAK_BATTERY"
+		}
+		component = {
+			slot = "PD_02"
+			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 = "AUX_UTILITY_1"
+			template = "SHIELD_BOOSTER"
+		}
+		component = {
+			slot = "AUX_UTILITY_2"
+			template = "SHIELD_BOOSTER"
+		}
+	}
+	required_component="SENSOR_4"
+	required_component="COMBAT_COMPUTER_PLATFORM_SAPIENT"
+	required_component="PLATFORM_DARK_MATTER_REACTOR"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+# Construction Ship
+ship_design = {
+	name = "NAME_Gray_Theta"
+	ship_size = constructor
+	section = {
+		template = "DEFAULT_CONSTRUCTION_SECTION"
+		slot = "mid"
+
+		component = {
+			slot = "SMALL_UTILITY_1"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "SMALL_UTILITY_2"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+	}
+	required_component="JUMP_DRIVE_1"
+	required_component="SHIP_THRUSTER_5"
+	required_component="SENSOR_4"
+	required_component="CORVETTE_DARK_MATTER_REACTOR"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+
+# Colony Ship
+ship_design = {
+	name = "NAME_Gray_Tau"
+	ship_size = colonizer
+	section = {
+		template = "DEFAULT_COLONIZATION_SECTION"
+		slot = "mid"
+
+		component = {
+			slot = "SMALL_UTILITY_1"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "SMALL_UTILITY_2"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+		component = {
+			slot = "SMALL_UTILITY_3"
+			template = "LARGE_GRAY_MIX_ARMOR"
+		}
+	}
+	required_component="JUMP_DRIVE_1"
+	required_component="SHIP_THRUSTER_5"
+	required_component="SENSOR_4"
+	required_component="CORVETTE_DARK_MATTER_REACTOR"
+
+	# For special buildable
+	is_special_buildable = yes
+	allow_buildable_trigger = is_fallen_empire_machine
+}
+
+# Awakened Fallen Empire Starbase
+ship_design = {
+	name = "NAME_Gray_FE_Starbase"
+	ship_size = starbase_fe_outpost
+	section = {
+		template = "station_generic_01_key"
+		slot = "mid"
+
+		component = {
+			slot = "SMALL_GUN_01"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "SMALL_GUN_02"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "SMALL_GUN_03"
+			template = "SMALL_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_01"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "MEDIUM_GUN_02"
+			template = "MEDIUM_GRAY_WEAPON_LANCE"
+		}
+		component = {
+			slot = "LARGE_GUN_01"
+			template = "LARGE_GRAY_WEAPON_LANCE"
+		}
+	}
+	required_component="SENSOR_2"
+}

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"
@@ -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 = "RG_FUSION_NANO_REACTOR_M"
+	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"
@@ -683,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"
@@ -1275,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"
@@ -1347,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"
 }
 
@@ -1411,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"
 }
 
@@ -1455,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"
 }
 
@@ -1511,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"
 }
 
@@ -1575,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"
 }
 
@@ -1659,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"
 }
 
@@ -1703,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"
@@ -2041,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"
 }
 
@@ -2101,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"
 }
 
@@ -2165,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"
 }
 
@@ -2249,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"
 }

common/global_ship_designs/RG_ship_designs_starbase.txt

@@ -1,6 +1,6 @@
 # 星环基地 1
 ship_design = {
-	name = "RG_RG_ORBITAL_RING_TIER_1_STARBASE"
+	name = "RG_ORBITAL_RING_TIER_1_STARBASE"
 	ship_size = RG_orbital_ring_tier_1
 	section = {
 		template = "RG_ORBITAL_RING_TIER_1_STARBASE_SECTION"
@@ -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"

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"
+}
+

common/governments/civics/!_RG_origins.txt

@@ -8,7 +8,43 @@ origin_rg_gray = {
 	non_colonizable_planet_class_neighbor = yes
 	description = "origin_tooltip_rg_gray_effects"
 	advanced_start = yes
+	max_once_global = yes
 	random_weight = {
 		base = 0
 	}
+	playable = {
+		host_has_dlc = "Distant Stars Story Pack"
+	}
 }
+
+rg_origin_scion = {
+	is_origin = yes
+	icon = "gfx/interface/icons/origins/origins_scion_1.dds"
+	picture = GFX_origin_rg_scion
+	advanced_start = yes
+	max_once_global = yes
+
+	playable = {
+		host_has_dlc = Federations
+	}
+
+	# possible = {
+	# 	ethics = {
+	# 		NOR = {
+	# 			value = ethic_gestalt_consciousness
+	# 			#value = ethic_xenophobe
+	# 			value = ethic_fanatic_xenophobe
+	# 		}
+	# 	}
+	# 	civics = {
+	# 		NOT = { value = civic_pompous_purists }
+	# 	}
+	# }
+
+	description = "origin_tooltip_rg_scion_effects"
+	flags = { custom_start_screen }
+
+	random_weight = {
+		base = 0
+	}
+}

common/leader_classes/RG_leader_classes.txt

@@ -0,0 +1,103 @@
+# example_class = {
+#	name = <name_key>
+# 	name_plural = <name_plural_key>
+# 	description = <description_key>
+#
+#	#all the following default to no
+#	can_lead_army = yes/no			# Applies skill_<class_id>_army scaled by level to armies
+#	can_lead_navy = yes/no			# Applies skill_<class_id>_navy scaled by level to fleets
+#	can_govern_planet = yes/no		# Applies skill_<class_id>_planet_governor scaled by level to governed planet
+									# Applies skill_<class_id>_sector_governor scaled by level to governed sector, if governing the sector capital
+									# Applies skill_<class_id>_background_planet_governor scaled by level togoverned planet, if governing their homeworld
+#	can_be_envoy = yes/no
+# 	can_research_tech = yes/no
+# 	can_research_special_projects = yes/no
+# 	can_crew_science_ship = yes/no
+# 	can_research_anomalies = yes/no
+# 	can_research_archaeology_site = yes/no
+# 	can_survey = yes/no
+# 	can_boost_cloaking_detection = yes/no
+# 	can_explore_rifts = yes/no
+# 	can_conduct_active_reconnaissance = yes/no
+# 	can_govern_planet = yes/no
+# 	can_have_traits = yes/no	# defaults to yes, if no this class will not gain LEADER_ASSIGNED_MONTHLY_EXPERIENCE when assigned
+#	can_rule_empire = yes/no	# defaults to yes
+#	recruitable = yes/no		# defaults to yes
+# 	max_trait_points = <num>
+#	leader_capacity = <num>		# maximum number of leader of this type before you get maluses, 0 means no cap
+#	replaces_old_class = "old_class"	# used for backwards compatibility. When "old_class" appears in an old save, it is converted to this class at loading
+#										# can appear multiple times
+#
+# 	resources = { #upkeep
+# 		category = leader_scientists/etc
+# 		cost = {
+# 			...
+# 		}
+# 	}
+#
+# 	ai_weight = {			# used to determine which type of leader the AI prefers (frex: commanders for warlike leaders, and governor for pacifists)
+# 		base = <num>
+#		modifier = {}
+# 	}
+#
+#	ai_location_weight = {	# used to evaluate a specific leader for an assignment to a specific location (right now only used for fleet),
+#							# scope is the leader, from is the leader location (can be a planet, a fleet, an army etc)
+#							# if the score is 0 or less, the leader will not be assigned to that location
+#		base = <num>
+#		modifier = {}
+#	}
+#
+# 	minimum_ai_target = <num>
+#
+# 	leader_background_job_weight = {
+# 		job_name = <weight>
+# 		# etc
+# 	}
+# }
+#
+# icon = 1 # 1-based index in the icon file. might be replaced by an icon name later
+#
+# paragon_background_selector = <name of an asset_selector>, used to display a background behind paragon portraits
+#
+#
+# How the AI assigns leaders now:
+#
+# Step 1: Sort all possible location using the NDefines::NAI::LOCATION_WEIGHT_* values (all of them are multipliers except the galactic community which is a flat value)
+# Step 2: Sort all available leaders by skill
+# Step 3: for each leader in order, calculate a location weight based on the ai_location_weight of their class
+# Step 4: Assign the highest leader/location pair based on the weight
+# Step 5: if no leader was assigned, see if hiring a leader is possible repeating the same steps
+
+# rg_nanite_leader = {
+# 	name = rg_nanite_leader
+# 	name_plural = rg_nanite_leader_plural
+# 	description = rg_nanite_leader_description
+# 
+# 	can_lead_army = yes
+# 	can_lead_navy = yes
+# 	can_govern_planet = yes
+# 	can_be_envoy = yes
+# 	can_research_tech = yes
+# 	can_research_special_projects = yes
+# 	can_crew_science_ship = yes
+# 	can_research_anomalies = yes
+# 	can_research_archaeology_site = yes
+# 	can_survey = yes
+# 	can_boost_cloaking_detection = yes
+# 	can_explore_rifts = yes
+# 	can_conduct_active_reconnaissance = yes
+# 	can_govern_planet = yes
+# 	can_have_traits = yes
+# 	can_rule_empire = yes
+# 	recruitable = no
+# 	max_trait_points = 3
+# 	leader_capacity = 3
+# 
+# 	ai_weight = {
+# 		modifier = {
+# 			factor = 0
+# 		}
+# 	}
+# 	icon = 4
+# 	paragon_background_selector = "paragon_background_selector"
+# }

common/on_actions/RG_on_actions.txt

@@ -38,6 +38,7 @@ on_game_start_country = {
 	events = {
 		# rg_cluster.8
 		rg_event.1
+		rg_origin.1
 		rg_event.19
 	}
 }
@@ -51,19 +52,15 @@ on_monthly_pulse_country = {
 		# rg_event.22 #小灰复活检测
 		# rg_event.23 #月检移除L星门认知防止收容失效
 		# rg_skill.9
+		rg_planet.5025	# Virtual Machine pop creation
+		rg_planet.5030	# Virtual Machine pop destruction
 	}
 }
 
 on_yearly_pulse_country = {
 	events = {
 		rg_event.17
-		rg_event.18
 		rg_event.20
-	}
-}
-
-on_yearly_pulse = {
-	events = {
 		rg_story.20
 	}
 }
@@ -113,45 +110,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 +148,107 @@ 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 planet has been colonized.
+# Scope = Planet
+on_colonized = {
+	events = {
+		rg_planet.2026	# Virtual Machine pop creation
+		rg_planet.2031	# Virtual Machine pop destruction
+	}
+}
+
+#A building construction has been completed.
+# This = Planet
+on_building_complete = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A building construction has been completed, which is an upgrade of previous building.
+# This = Planet
+on_building_upgraded = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A building construction has demolished.
+# This = Planet
+on_building_demolished = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+# A building repair has finished
+# This = Planet
+on_building_repaired = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+#A district construction has been completed.
+# This = Planet
+on_district_complete = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A building construction has finished, replacing another building.
+# This = Planet
+on_building_replaced = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A building construction has been downgraded and replaced.
+# This = Planet
+on_building_downgraded = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}
+
+# A district construction has demolished.
+# This = Planet
+on_district_demolished = {
+	events = {
+		rg_planet.2026 # Virtual Machine pop creation
+		rg_planet.2031 # Virtual Machine pop destruction
+	}
+}

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 = {
+}

common/planet_classes/RG_gray_planet_classes.txt

@@ -0,0 +1,41 @@
+pc_rg_grayhabitat = {
+	habitat = yes
+	entity = "grey_tempesttw_orbital_habitat_entity"
+	entity_scale = @planet_standard_scale
+	icon = GFX_planet_type_habitat
+	enable_tilt = no
+	fixed_entity_scale = yes
+	place_entity_on_planet_plane = no
+	entity_face_object = no #disable rotation towards sun or planet we orbit around
+	atmosphere_color		= hsv { 0.0 0.0 1.0 }
+	atmosphere_intensity	= 1.0
+	atmosphere_width		= 0.5
+	show_city = no
+	city_color_lut = "gfx/portraits/misc/colorcorrection_continental.dds"
+	extra_orbit_size = 0
+	extra_planet_count = 0
+	chance_of_ring = 0.0
+	planet_size = 30
+	moon_size = 1
+	colonizable = yes
+	district_set = machine_world
+#	ideal = yes
+	starting_planet = no
+	orbit_lines = no
+	has_colonization_influence_cost = no			# applies when within own borders
+
+	is_artificial_planet = yes
+	default_planet_selection = yes
+
+	modifier = {
+		planet_colony_development_speed_mult = 2.0 # Habitats should be fast to colonize
+		pop_environment_tolerance = 1
+		planet_structures_cost_mult = -2
+		planet_buildings_cost_mult = -2
+		planet_building_build_speed_mult = 10
+		planet_crime_add = -1000
+		pop_resettlement_cost_mult = 10
+	}
+
+	carry_cap_per_free_district = @carry_cap_low
+}

common/script_values/rg_script_values.txt

@@ -0,0 +1,14 @@
+rg_count_maid = {
+	base = 0
+	complex_trigger_modifier = {
+		trigger = count_traits
+		trigger_scope = pop
+		parameters = {
+			limit = {
+				has_trait = rg_machine_maid_trait
+			}
+		}
+		mode = add
+	}
+	# max = 20
+}

common/scripted_effects/RG_combat_skill_effects.txt

@@ -5,7 +5,7 @@ RG_leader_trait_tempest_incoming_random_kill_effect = {
 			any_ground_combat_$SIDE_A$ = {
 				exists = leader
 				leader = {
-					has_trait = RG_leader_trait_general_gray_skill
+					has_trait = RG_leader_trait_admiral_nanorebuild_gray
 				}
 			}
 		}
@@ -279,3 +279,21 @@ 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
+	}
+}
+
+RG_leader_trait_general_tempest_incoming_counter_init_effect = {
+	set_variable = {
+		which = rg_general_skill_combat_daypassed_variable
+		value = 1
+	}
+	set_variable = {
+		which = rg_general_skill_combat_killed_variable
+		value = 0
+	}
+}

common/scripted_effects/RG_fallen_empire_effects.txt

@@ -0,0 +1,607 @@
+rg_create_fallen_empire_species_effect = {
+	create_species = {
+		name = 纳米构造体
+		class = RG_MACHINE
+		portrait = "rg_machine_maid"
+		traits = {
+			trait = trait_machine_unit
+			trait = trait_robot_domestic_protocols
+			trait = rg_machine_maid_trait
+			trait = trait_auto_mod_robotic
+			trait = trait_robot_streamlined_protocols
+			trait = trait_robot_luxurious
+			trait = ramdom_trait
+		}
+		extra_trait_points = 3
+		allow_negative_traits = no
+		namelist = MACHINE3
+		effect = {
+			save_event_target_as = rg_fallen_maid_species
+		}
+	}
+}
+
+rg_create_fallen_empire_country_effect = {
+	create_country = {
+		name = 德萨努-纳迪沙协议
+		type = fallen_empire
+		flag = {
+			icon = {
+				category = "special"
+				file = "gray_goo.dds"
+			}
+			background = {
+				category = "backgrounds"
+				file = "sinus.dds"
+			}
+			colors = {
+				"grey"
+				"dark_grey"
+				"null"
+				"null"
+			}
+		}
+		ignore_initial_colony_error = yes
+		authority = auth_machine_intelligence
+		civics = {
+			civic = civic_machine_remnants
+			civic = civic_custodian_directives
+		}
+		species = last_created_species
+		ethos = {
+			ethic = ethic_gestalt_consciousness
+		}
+		origin = "origin_fallen_empire"
+		effect = {
+			set_built_species = last_created_species
+			save_global_event_target_as = rg_scion_fe
+			set_country_flag = rg_fallen_empire_machine
+			add_resource = {
+				minerals = 10000
+				energy = 10000
+				food = 1000
+				influence = 500
+			}
+			if = {
+				limit = { host_has_dlc = "Apocalypse" }
+				give_technology = {
+					tech = tech_colossus
+					message = no
+				}
+			}
+			# must initialize global designs here
+			add_global_ship_design = "NAME_Gray_Omega"
+			add_global_ship_design = "NAME_Gray_Alpha"
+			add_global_ship_design = "NAME_Gray_Beta"
+			add_global_ship_design = "NAME_Gray_Gamma"
+			add_global_ship_design = "NAME_Gray_Theta"
+			add_global_ship_design = "NAME_Gray_Tau"
+			add_global_ship_design = "NAME_Gray_Sigma"
+			add_global_ship_design = "NAME_Gray_FE_Starbase"
+			set_graphical_culture = fallen_machine_empire_01
+
+			add_modifier = {
+				modifier = fe_ship_cost_modifier
+				days = -1
+			}
+
+			if = {
+				limit = {
+					NOT = {
+						exist = event_target:rg_gray_country_leader
+					}
+				}
+				rg_gray_country_leader_init = yes
+				set_leader = last_created_leader
+			}
+			else = {
+				set_leader = last_created_leader
+			}
+			ruler = {
+				add_skill = 9
+			}
+		}
+	}
+}
+
+rg_create_fallen_empire_reinforcements = {
+	create_fleet = {
+		effect = {
+			set_owner = prev.owner
+			while = {
+				count = 4
+				rg_create_fallen_empire_large_ship = yes
+			}
+			while = {
+				count = 8
+				rg_create_fallen_empire_small_ship = yes
+			}
+			random_list = {
+				25 = {
+					set_location = {
+						target = prev
+						distance = 30
+						angle = random
+					}
+				}
+				25 = {
+					set_location = {
+						target = prev
+						distance = 45
+						angle = random
+					}
+				}
+				25 = {
+					set_location = {
+						target = prev
+						distance = 60
+						angle = random
+					}
+				}
+				25 = {
+					set_location = {
+						target = prev
+						distance = 75
+						angle = random
+					}
+				}
+			}
+		}
+	}
+}
+
+rg_create_fallen_empire_fleet = {
+	owner = {
+		create_leader = {
+			class = commander
+			species = owner_main_species
+			name = random
+			skill = 10
+			leader_age_min = 25
+			leader_age_max = 45
+		}
+	}
+	create_fleet = {
+		effect = {
+			set_owner = prev.owner
+			while = {
+				count = 8
+				rg_create_fallen_empire_large_ship = yes
+			}
+			while = {
+				count = 18
+				rg_create_fallen_empire_small_ship = yes
+			}
+			random_list = {
+				25 = {
+					set_location = {
+						target = prev
+						distance = 30
+						angle = random
+					}
+				}
+				25 = {
+					set_location = {
+						target = prev
+						distance = 45
+						angle = random
+					}
+				}
+				25 = {
+					set_location = {
+						target = prev
+						distance = 60
+						angle = random
+					}
+				}
+				25 = {
+					set_location = {
+						target = prev
+						distance = 75
+						angle = random
+					}
+				}
+			}
+		}
+	}
+	last_created_fleet = { assign_leader = last_created_leader }
+}
+
+rg_create_fallen_empire_starting_navy = {
+	rg_create_fallen_empire_fleet = yes
+	rg_create_fallen_empire_fleet = yes
+	random = {
+		chance = 33
+		rg_create_fallen_empire_fleet = yes
+	}
+	if = {
+		limit = {
+			host_has_dlc = "Apocalypse"
+		}
+		random = {
+			chance = 10
+			create_fleet = {
+				effect = {
+					set_owner = prev.owner
+					rg_create_fallen_empire_colossus = yes
+					set_location = {
+						target = prev
+						distance = 30
+						angle = random
+					}
+				}
+			}
+		}
+	}
+	random = {
+		chance = 25
+		create_fleet = {
+			effect = {
+				set_owner = prev.owner
+				rg_create_fallen_empire_titan = yes
+				set_location = {
+					target = prev
+					distance = 20
+					angle = random
+				}
+			}
+		}
+	}
+	create_fleet = {
+		effect = {
+			set_owner = prev.owner
+			rg_create_fallen_empire_construction_ship = yes
+			set_location = {
+				target = prev
+				distance = 60
+				angle = random
+			}
+		}
+	}
+	create_fleet = {
+		effect = {
+			set_owner = prev.owner
+			rg_create_fallen_empire_construction_ship = yes
+			set_location = {
+				target = prev
+				distance = 80
+				angle = random
+			}
+		}
+	}
+	create_fleet = {
+		effect = {
+			set_owner = prev.owner
+			rg_create_fallen_empire_construction_ship = yes
+			set_location = {
+				target = prev
+				distance = 100
+				angle = random
+			}
+		}
+	}
+}
+
+rg_create_fallen_empire_platform = {
+	if = {
+		limit = {
+			owner = { has_authority = auth_machine_intelligence }
+		}
+		create_ship = {
+			name = random
+			design = "NAME_Gray_Sigma"
+			graphical_culture = owner
+		}
+	}
+}
+
+rg_create_fallen_empire_colossus = {
+	if = {
+		limit = {
+			owner = { has_authority = auth_machine_intelligence }
+		}
+		create_ship = {
+			name = random
+			design = "NAME_Gray_Omega"
+			graphical_culture = owner
+		}
+	}
+}
+
+rg_create_fallen_empire_titan = {
+	if = {
+		limit = {
+			owner = { has_authority = auth_machine_intelligence }
+		}
+		create_ship = {
+			name = random
+			design = "NAME_Gray_Alpha"
+			graphical_culture = owner
+		}
+	}
+}
+
+rg_create_fallen_empire_large_ship = {
+	if = {
+		limit = {
+			owner = { has_authority = auth_machine_intelligence }
+		}
+		create_ship = {
+			name = random
+			design = "NAME_Gray_Beta"
+			graphical_culture = owner
+		}
+	}
+}
+
+rg_create_fallen_empire_small_ship = {
+	if = {
+		limit = {
+			owner = { has_authority = auth_machine_intelligence }
+		}
+		create_ship = {
+			name = random
+			design = "NAME_Gray_Gamma"
+			graphical_culture = owner
+		}
+	}
+}
+
+rg_create_fallen_empire_construction_ship = {
+	if = {
+		limit = {
+			owner = { has_authority = auth_machine_intelligence }
+		}
+		create_ship = {
+			name = random
+			design = "NAME_Gray_Theta"
+			graphical_culture = owner
+		}
+	}
+}
+
+rg_create_fe_citadel = {
+	create_starbase = {
+		size = "starbase_citadel"
+
+		module = "shipyard"
+		module = "anchorage"
+		module = "anchorage"
+		module = "hangar_bay"
+		module = "gun_battery"
+		module = "gun_battery"
+
+		building = "crew_quarters"
+		building = "command_center"
+		building = "target_uplink_computer"
+		building = "dark_matter_listening_post"
+
+		effect = {
+			set_owner = event_target:rg_scion_fe
+			while = {
+				count = 4
+				rg_create_fallen_empire_platform = yes
+			}
+		}
+	}
+}
+
+#scope = scion
+rg_create_scion_wormhole_link = {
+	capital_scope = {
+		solar_system = { save_event_target_as = home_system }
+	}
+	event_target:rg_scion_master = {
+		random_system_within_border = { save_event_target_as = fe_target_system }
+	}
+	event_target:home_system = {
+		event_target:fe_target_system = {
+			prev = { # done this way to ensure we don't spawn "orphan wormholes (wormholes that aren't linked to anything)
+				spawn_natural_wormhole = {
+					bypass_type = wormhole
+					random_pos = no
+					orbit_angle = 360
+				}
+			}
+			spawn_natural_wormhole = {
+				bypass_type = wormhole
+				random_pos = no
+				orbit_angle = 270
+			}
+			link_wormholes = prev
+		}
+	}
+	set_country_flag = encountered_first_wormhole
+	add_seen_bypass_type = wormhole
+}
+
+rg_lcluster_spawn_effect_scion = {
+	set_global_flag = rg_origin_scion_l_cluster
+	set_spawn_system_batch = begin
+	no_scope = {
+		# makes system positions originate from galactic core
+		spawn_system = {
+			min_distance >= 550
+			max_distance <= 560
+			min_orientation_angle = 44
+			max_orientation_angle = 46
+			initializer = rg_cluster_init_01
+			hyperlane = no
+		}
+		random_system = {
+			limit = {
+				has_star_flag = lcluster1
+			}
+			save_global_event_target_as = lcluster1
+			spawn_system = {
+				min_distance >= 29
+				max_distance <= 31
+				min_orientation_angle = 24
+				max_orientation_angle = 66
+				initializer = rg_cluster_init_02
+			}
+			spawn_system = {
+				min_distance >= 29
+				max_distance <= 31
+				min_orientation_angle = 114
+				max_orientation_angle = 156
+				initializer = rg_cluster_init_03
+			}
+			spawn_system = {
+				min_distance >= 30
+				max_distance <= 60
+				min_orientation_angle = 340
+				max_orientation_angle = 20
+				initializer = rg_cluster_init_01b
+			}
+		}
+		random_system = {
+			limit = {
+				has_star_flag = lcluster2
+			}
+			save_global_event_target_as = lcluster2
+			spawn_system = {
+				min_distance >= 30
+				max_distance <= 60
+				min_orientation_angle = 0
+				max_orientation_angle = 40
+				initializer = rg_cluster_init_02b
+			}
+		}
+		random_system = {
+			limit = {
+				has_star_flag = lcluster3
+			}
+			save_global_event_target_as = lcluster3
+			spawn_system = {
+				min_distance >= 20
+				max_distance <= 30
+				min_orientation_angle = 24
+				max_orientation_angle = 66
+				initializer = rg_fallen_machine
+			}
+			spawn_system = {
+				min_distance >= 10
+				max_distance <= 50
+				min_orientation_angle = 250
+				max_orientation_angle = 290
+				initializer = rg_cluster_init_03b
+			}
+		}
+		random_system = {
+			limit = {
+				has_star_flag = lcluster4
+			}
+			save_global_event_target_as = lcluster4
+			spawn_system = {
+				min_distance >= 5
+				max_distance <= 10
+				min_orientation_angle = 250
+				max_orientation_angle = 290
+				initializer = rg_cluster_init_05
+			}
+			spawn_system = {
+				min_distance >= 30
+				max_distance <= 60
+				min_orientation_angle = 20
+				max_orientation_angle = 160
+				initializer = rg_cluster_init_04b
+			}
+		}
+	}
+	random_system = {
+		limit = {
+			has_star_flag = lcluster5
+		}
+		save_global_event_target_as = lcluster5
+	}
+	random_system = {
+		limit = {
+			has_star_flag = lcluster1b
+		}
+		save_global_event_target_as = lcluster1b
+	}
+	random_system = {
+		limit = {
+			has_star_flag = lcluster2b
+		}
+		save_global_event_target_as = lcluster2b
+	}
+	random_system = {
+		limit = {
+			has_star_flag = lcluster3b
+		}
+		save_global_event_target_as = lcluster3b
+	}
+	random_system = {
+		limit = {
+			has_star_flag = lcluster4b
+		}
+		save_global_event_target_as = lcluster4b
+	}
+	# clear all hyperlanes to and within the cluster
+	every_system = {
+		limit = {
+			has_star_flag = lcluster
+		}
+		isolate_system = yes
+	}
+	# add hyperlanes
+	event_target:lcluster5 = {
+		add_hyperlane = {
+			from = event_target:lcluster5
+			to = event_target:lcluster4
+		}
+	}
+	event_target:lcluster4 = {
+		add_hyperlane = {
+			from = event_target:lcluster4
+			to = event_target:lcluster3
+		}
+		add_hyperlane = {
+			from = event_target:lcluster4
+			to = event_target:lcluster2
+		}
+		add_hyperlane = {
+			from = event_target:lcluster4
+			to = event_target:lcluster4b
+		}
+	}
+	event_target:lcluster3 = {
+		add_hyperlane = {
+			from = event_target:lcluster3
+			to = event_target:lcluster1
+		}
+		add_hyperlane = {
+			from = event_target:lcluster3
+			to = event_target:lcluster3b
+		}
+	}
+	event_target:lcluster2 = {
+		add_hyperlane = {
+			from = event_target:lcluster2
+			to = event_target:lcluster1
+		}
+		add_hyperlane = {
+			from = event_target:lcluster2
+			to = event_target:lcluster3
+		}
+		add_hyperlane = {
+			from = event_target:lcluster2
+			to = event_target:lcluster2b
+		}
+	}
+	event_target:lcluster1 = {
+		add_hyperlane = {
+			from = event_target:lcluster1
+			to = event_target:lcluster1b
+		}
+	}
+	event_target:lcluster1b = {
+		add_hyperlane = {
+			from = event_target:lcluster1b
+			to = event_target:lcluster2b
+		}
+	}
+	set_spawn_system_batch = end
+}

common/scripted_effects/RG_gray_goo_effects.txt

@@ -65,7 +65,10 @@ rg_global_gray_location_check = {
 	}
 	else_if = {
 		limit = {
-			has_country_flag = gray_governor_active
+			OR = {
+				has_country_flag = gray_official_active
+				has_country_flag = gray_governor_active #旧版flag
+			}
 		}
 		if = {
 			limit = {
@@ -123,6 +126,18 @@ rg_global_gray_location_check = {
 			}
 		}
 	}
+	else_if = {
+		limit = {
+			has_country_flag = rg_habitat_enabled
+		}
+		if = {
+			limit = {exists = event_target:rg_gray_habitat_target}
+			event_target:rg_gray_habitat_target = {
+				save_global_event_target_as = global_gray_location
+			}
+		}
+
+	}
 	else = {
 		capital_scope = {
 			save_global_event_target_as = global_gray_location
@@ -134,7 +149,10 @@ rg_global_gray_location_check = {
 rg_create_gray_governor = {
 	if = {
 		limit = {
-			has_country_flag = gray_governor_active
+			OR = {
+				has_country_flag = gray_official_active
+				has_country_flag = gray_governor_active #旧版flag
+			}
 		}
 	}
 	else = {
@@ -175,6 +193,7 @@ rg_create_gray_governor = {
 			}
 			remove_army = yes
 		}
+
 		#存储当前领袖等级
 		every_owned_leader = {
 			if = {
@@ -225,12 +244,14 @@ rg_create_gray_governor = {
 			rg_gray_govener_init = yes
 		}
 		#设置总督已启用标识
-		set_country_flag = gray_governor_active
+		set_country_flag = gray_official_active #新版flag
+		set_country_flag = gray_governor_active #旧版flag
 		#更新灰风形态
 		remove_country_flag = gray_warship_active
 		remove_country_flag = rg_kac_grayfleet_active
 		remove_country_flag = gray_constship_active
 		remove_country_flag = gray_army_active
+		remove_country_flag = gray_habitat_active
 		#等级导入，把存储的领袖等级赋予到领袖身上
 		random_owned_leader = {
 			limit = {
@@ -293,50 +314,14 @@ rg_create_gray_warship = {
 			}
 		}
 		else = {
-			rg_gray_admiral_init = yes
+			rg_gray_commander_init = yes
 		}
 		set_country_flag = gray_warship_active
 		if = {
 			limit = {
 				has_country_flag = rg_gray_level_2
 			}
-			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_mod1 = yes
 		}
 		else_if = {
 			limit = {
@@ -345,123 +330,16 @@ rg_create_gray_warship = {
 					has_country_flag = gray_warship_is_juggernaut
 				}
 			}
-			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_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_mod2 = yes
 		}
 		else_if = {
 			limit = {
 				has_country_flag = gray_warship_is_juggernaut
 			}
-			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"
-						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_mod3 = yes
 		}
 		else = {
-			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
-						}
-					}
-				}
-			}
+			rg_warship_init_mod0 = yes
 		}
 		every_owned_army = {
 			limit = {
@@ -485,9 +363,12 @@ rg_create_gray_warship = {
 				destroy_template = yes
 			}
 		}
+
 		remove_country_flag = gray_constship_active
-		remove_country_flag = gray_governor_active
+		remove_country_flag = gray_governor_active #旧版flag
+		remove_country_flag = gray_official_active
 		remove_country_flag = gray_army_active
+		remove_country_flag = gray_habitat_active
 		random_owned_leader = {
 			limit = {
 				has_leader_flag = gray_admiral
@@ -501,7 +382,7 @@ rg_create_gray_warship = {
 rg_create_gray_army = {
 	if = {
 		limit = {
-			has_leader_flag = gray_army_active
+			has_country_flag = gray_army_active
 		}
 	}
 	else = {
@@ -548,7 +429,7 @@ rg_create_gray_army = {
 			}
 		}
 		else = {
-			rg_gray_general_init = yes
+			rg_gray_commander_init = yes
 		}
 		create_ship_design = {
 			design = "NAME_RG_armed_transport_ship"
@@ -596,10 +477,13 @@ rg_create_gray_army = {
 				destroy_template = yes
 			}
 		}
+
 		remove_country_flag = gray_warship_active
 		remove_country_flag = rg_kac_grayfleet_active
-		remove_country_flag = gray_governor_active
+		remove_country_flag = gray_governor_active #旧版flag
+		remove_country_flag = gray_official_active
 		remove_country_flag = gray_constship_active
+		remove_country_flag = gray_habitat_active
 		remove_ship_design = last_created_design
 		random_owned_leader = {
 			limit = {
@@ -716,10 +600,13 @@ rg_create_gray_const = {
 			}
 			remove_army = yes
 		}
+
 		remove_country_flag = gray_army_active
 		remove_country_flag = gray_warship_active
 		remove_country_flag = rg_kac_grayfleet_active
-		remove_country_flag = gray_governor_active
+		remove_country_flag = gray_governor_active #旧版flag
+		remove_country_flag = gray_official_active
+		remove_country_flag = gray_habitat_active
 		random_owned_leader = {
 			limit = {
 				has_leader_flag = gray_scientist
@@ -728,3 +615,88 @@ rg_create_gray_const = {
 		}
 	}
 }
+
+
+rg_juggernaut_habitat_init = {
+	if = {
+		limit = {
+			has_country_flag = rg_habitat_enabled
+		}
+	}
+	else = {
+		optimize_memory
+		rg_global_gray_location_check = yes
+		set_country_flag = rg_habitat_enabled
+		event_target:global_gray_location = {
+			solar_system = {
+				spawn_planet = {
+					class = pc_rg_grayhabitat
+					location = event_target:global_gray_location
+					orbit_location = yes
+					orbit_angle = 225
+					orbit_distance = 360
+					orbit_angle_offset = 45
+					orbit_distance_offset = 9.899
+					size = 30
+					has_ring = no
+			
+					init_effect = {
+						set_planet_entity = {
+							entity = "grey_tempesttw_orbital_habitat_entity"
+						}
+						set_surveyed = {
+							surveyed = yes
+							surveyor = FROM
+						}
+						set_all_comms_surveyed = yes
+						clear_blockers = yes
+		
+						set_owner = root
+						set_controller = root
+						create_colony = {
+							owner = root
+							species = owner_main_species
+							ethos = owner
+						}
+						set_name = "NAME_rg_gray_habitat_base"
+						
+						if = {
+							OR = {
+								has_country_flag = gray_official_active
+								has_country_flag = gray_governor_active #旧版flag
+							}
+							assign_leader = event_target:gray_governor
+						}
+						
+						add_building = building_ancient_control_center
+						add_building = building_nourishment_center
+						add_building = building_ancient_palace
+						add_building = building_affluence_center
+						add_building = building_dimensional_fabricator
+			
+						while = {
+							count = 5
+							create_pop = {
+								species = owner_main_species
+							}
+						}
+			
+						set_planet_flag = megastructure
+						set_planet_flag = habitat
+						set_planet_flag = advanced_habitat
+						set_planet_flag = advanced_habitat_2
+						set_planet_flag = rg_gray_habitat
+						save_global_event_target_as = rg_gray_habitat_target
+					}
+				}
+			}
+		}
+	}
+}
+
+rg_clear_harbitat = {
+	remove_country_flag = rg_habitat_enabled
+	event_target:rg_gray_habitat_target = {
+		remove_planet = yes
+	}
+}

common/scripted_effects/RG_gray_leader_init_effects.txt

@@ -1,47 +1,14 @@
-# 避免代码复用原则：
-# 如果你需要在不同的地方重复调用同一套代码，你应当把他们封装在这样的函数里。
-# 避免需要修改代码时需要重复修改n次，或是发生修改了A处忘记修改B处导致bug发生的问题。
-# 当然，这种分块需要到什么程度，我也不知道
-#灰风
-################################
-# 舰R 灰风领袖好感度设定块部分：采样时间戳：2023/6/1 8：17
-# 仅用于留档比对不进行改动
-# wg_affection_wg_gray_system_launch = {
-# 	if = {
-# 		limit = { has_leader_flag = gray_leader }
-# 	set_leader_flag = has_wg_affection
-# 	set_leader_flag = has_wg_affection_wg_gray
-# 	set_leader_flag = wg_affection_auto_change_no
-# 	add_trait_no_notify = leader_trait_wg_gray_affection
-# 	set_variable = { which = affection value = owner.wg_gray_affection }
-# 	set_variable = { which = wg_leader_affection_to_lv2 value = @wg_gray_affection_to_lv2 }
-# 	set_variable = { which = wg_leader_affection_to_lv3 value = @wg_gray_affection_to_lv3 }
-# 	set_variable = { which = wg_leader_affection_to_lv4 value = @wg_gray_affection_to_lv4 }
-# 	set_variable = { which = wg_leader_affection_to_lv5 value = @wg_gray_affection_to_lv5 }
-# 	set_variable = { which = wg_leader_affection_reduce value = @wg_gray_affection_reduce }
-# 	set_variable = { which = wg_leader_affection_increase value = @wg_gray_affection_increase }
-# 	}
-# 
-# }
-# wg_affection_wg_gray_system_check = {
-# 	if = {
-# 		limit = {
-# 			has_leader_flag = has_wg_affection_wg_gray
-# 		}
-# 		set_variable = { which = affection value = owner.wg_gray_affection }
-# 	}
-# }
-################################
 rg_gray_govener_init = {
 	event_target:rg_gray_country = {
 		create_leader = {
-			class = governor
-			species = root
+			class = official
+			species = event_target:gray_species
 			name = "NAME_Gray"
 			gender = female
 			immortal = yes
 			event_leader = yes
 			skip_background_generation = yes
+			randomize_traits = no
 			custom_catch_phrase = gray_catch_phrase
 			custom_description = gray_backstory
 			background_ethic = ethic_gestalt_consciousness
@@ -49,9 +16,11 @@ rg_gray_govener_init = {
 			skill = 10
 			set_age = 18
 			traits = {
+				0 = RG_leader_trait_governor_gray
 			}
 			effect = {
 				save_global_event_target_as = gray_governor
+				save_global_event_target_as = gray_official
 				set_leader_flag = gray_governor
 				set_leader_flag = legendary_leader
 				set_leader_flag = immune_to_negative_traits
@@ -64,20 +33,18 @@ rg_gray_govener_init = {
 				}
 				if = {
 					limit = {
-						owner = {
 							OR = {
 								has_global_flag = has_wsg_mod
 								has_global_flag = kdc_event_mod_active
 							}
-						}
 					}
-					set_leader_flag = "gray_leader"					#某个mod新旧flag混用，我不说是谁。嗯嘿嘿
+					set_leader_flag = "gray_leader"
 					set_leader_flag = gray_leader
 					add_trait_no_notify = leader_trait_governor_gray
 					add_trait_no_notify = RG_leader_trait_ruler_gray
-					add_trait_no_notify = subclass_governor_economist
-					add_trait_no_notify = leader_trait_urbanist_3
-					add_trait_no_notify = leader_trait_scrapper_2
+					add_trait_no_notify = subclass_official_governor
+					add_trait_no_notify = trait_ruler_architectural_sense_3
+					add_trait_no_notify = leader_trait_distribution_lines_2
 					if = {
 						limit = {
 							owner = {
@@ -92,9 +59,9 @@ rg_gray_govener_init = {
 				else = {
 					add_trait_no_notify = RG_leader_trait_governor_gray
 					add_trait_no_notify = RG_leader_trait_ruler_gray
-					add_trait_no_notify = subclass_governor_economis
-					add_trait_no_notify = leader_trait_urbanist_3
-					add_trait_no_notify = leader_trait_scrapper_2
+					add_trait_no_notify = subclass_official_governor
+					add_trait_no_notify = trait_ruler_architectural_sense_3
+					add_trait_no_notify = leader_trait_distribution_lines_2
 				}
 			}
 		}
@@ -118,18 +85,26 @@ rg_gray_govener_init = {
 					}
 				}
 			}
-			leader_event = {
-				id = wg_affection.8
-				days = 1
-			}
 			if = {
 				limit = {
-					owner = {
-						has_country_flag = gray_encountered_the_loop
-					}
+					has_leader_flag = has_wg_affection_wg_gray
 				}
-				add_trait_no_notify = leader_trait_governor_wg_the_loop
+				if = {
+					limit = {
+						owner = { has_country_flag = married_gray }
+					}
+					set_leader_flag = married
+				}
+				set_variable = { which = affection value = owner.wg_gray_affection }
 			}
+			# if = {
+			# 	limit = {
+			# 		owner = {
+			# 			has_country_flag = gray_encountered_the_loop
+			# 		}
+			# 	}
+			# 	add_trait_no_notify = leader_trait_governor_wg_the_loop
+			# }
 			set_gray_portrait = yes
 			# add_special_leader_affection_trait = { LEADER = gray LEADER_CLASS = governor MARRIED_FLAG = married_gray }
 		}
@@ -137,18 +112,19 @@ rg_gray_govener_init = {
 			rg_set_gray_portrait = yes
 		}
 	}
-	set_global_flag = rg_kac_leader
+	
 }
 
-rg_gray_admiral_init = {
+rg_gray_commander_init = {
 	event_target:rg_gray_country = {
 		create_leader = {
-			class = admiral
-			species = root
+			class = commander
+			species = event_target:gray_species
 			name = "NAME_Gray"
 			immortal = yes
 			event_leader = yes
 			skip_background_generation = yes
+			randomize_traits = no
 			custom_catch_phrase = gray_catch_phrase
 			custom_description = gray_backstory
 			background_ethic = ethic_gestalt_consciousness
@@ -157,11 +133,13 @@ rg_gray_admiral_init = {
 			skill = 10
 			set_age = 18
 			traits = {
-				trait = RG_leader_trait_admiral_gray
+				0 = RG_leader_trait_admiral_gray
 			}
 			effect = {
 				save_global_event_target_as = gray_leader_admiral
 				set_leader_flag = gray_admiral
+				save_global_event_target_as = gray_leader_general
+				set_leader_flag = gray_general
 				set_leader_flag = legendary_leader
 				set_leader_flag = immune_to_negative_traits
 				if = {
@@ -172,12 +150,10 @@ rg_gray_admiral_init = {
 				}
 				if = {
 					limit = {
-						owner = {
 							OR = {
 								has_global_flag = has_wsg_mod
 								has_global_flag = kdc_event_mod_active
 							}
-						}
 					}
 					set_leader_flag = "gray_leader"					# "gray_leader"==rg_gray_leader
 					set_leader_flag = gray_leader
@@ -196,11 +172,13 @@ 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
+				# add_trait_no_notify = RG_leader_trait_general_gray_skill
 				# 缺少特质RG_leader_trait_admiral_gray将导致小灰改造项目无法完成
-				add_trait_no_notify = subclass_admiral_aggressor
+				add_trait_no_notify = subclass_commander_councilor
 				add_trait_no_notify = leader_trait_carrier_specialization
-				add_trait_no_notify = leader_trait_artillerist_2
 				add_trait_no_notify = leader_trait_juryrigger_2
+				add_trait_no_notify = leader_trait_reinforcer_2
 			}
 		}
 		last_created_leader = {
@@ -223,111 +201,27 @@ rg_gray_admiral_init = {
 					}
 				}
 			}
-			leader_event = {
-				id = wg_affection.8
-				days = 1
-			}
-			add_trait_no_notify = leader_trait_admiral_wg_gray_affection
 			if = {
 				limit = {
-					owner = {
-						has_country_flag = gray_encountered_the_loop
-					}
-				}
-				add_trait_no_notify = leader_trait_admiral_wg_the_loop
-			}
-			set_gray_portrait = yes
-			# add_special_leader_affection_trait = { LEADER = gray LEADER_CLASS = governor MARRIED_FLAG = married_gray }
-		}
-		else = {
-			rg_set_gray_portrait = yes
-		}
-	}
-	set_global_flag = rg_kac_leader
-}
-
-rg_gray_general_init = {
-	event_target:rg_gray_country = {
-		create_leader = {
-			class = general
-			species = root
-			name = "NAME_Gray"
-			immortal = yes
-			event_leader = yes
-			skip_background_generation = yes
-			custom_catch_phrase = gray_catch_phrase
-			custom_description = gray_backstory
-			background_ethic = ethic_gestalt_consciousness
-			hide_age = yes
-			gender = female
-			skill = 10
-			set_age = 18
-			traits = {
-				trait = RG_leader_trait_general_gray
-				trait = RG_leader_trait_general_gray_skill
-				trait = subclass_general_marshall
-				trait = leader_trait_heavy_hitter_2
-				trait = leader_trait_reinforcer_2
-			}
-			effect = {
-				save_global_event_target_as = gray_leader_general
-				set_leader_flag = rg_gray_leader
-				set_leader_flag = gray_general
-				set_leader_flag = legendary_leader
-				set_leader_flag = immune_to_negative_traits
-				if = {
-					limit = {
-						has_global_flag = has_wsg_mod
-					}
-					set_leader_flag = not_has_wg_affection_normal
+					has_leader_flag = has_wg_affection_wg_gray
 				}
 				if = {
 					limit = {
-						owner = {
-							OR = {
-								has_global_flag = has_wsg_mod
-								has_global_flag = kdc_event_mod_active
-							}
-						}
+						owner = { has_country_flag = married_gray }
 					}
-					set_leader_flag = "gray_leader"					# "gray_leader"==rg_gray_leader
-					set_leader_flag = gray_leader
+					set_leader_flag = married
 				}
-			}
-		}
-		last_created_leader = {
-			set_owner = event_target:gray_owner
-		}
-	}
-	last_created_leader = {
-		set_leader_flag = has_gained_level_trait
-	}
-	random_owned_leader = {
-		limit = {
-			has_leader_flag = gray_general
-		}
-		if = {
-			limit = {
-				owner = {
-					OR = {
-						has_global_flag = has_wsg_mod
-						has_global_flag = kdc_event_mod_active
-					}
-				}
-			}
-			leader_event = {
-				id = wg_affection.8
-				days = 1
+				set_variable = { which = affection value = owner.wg_gray_affection }
 			}
 			# add_trait_no_notify = leader_trait_admiral_wg_gray_affection
-			if = {
-				limit = {
-					owner = {
-						has_country_flag = gray_encountered_the_loop
-					}
-				}
-				add_trait_no_notify = leader_trait_admiral_wg_the_loop
-			}
+			# if = {
+			# 	limit = {
+			# 		owner = {
+			# 			has_country_flag = gray_encountered_the_loop
+			# 		}
+			# 	}
+			# 	add_trait_no_notify = leader_trait_admiral_wg_the_loop
+			# }
 			set_gray_portrait = yes
 			# add_special_leader_affection_trait = { LEADER = gray LEADER_CLASS = governor MARRIED_FLAG = married_gray }
 		}
@@ -335,26 +229,243 @@ rg_gray_general_init = {
 			rg_set_gray_portrait = yes
 		}
 	}
-	set_variable = {
-		which = rg_general_skill_combat_daypassed_variable
-		value = 1
-	}
-	set_variable = {
-		which = rg_general_skill_combat_killed_variable
-		value = 0
-	}
-	set_global_flag = rg_kac_leader
+	RG_leader_trait_admiral_nanorebuild_gray_counter_init_effect = yes
+	RG_leader_trait_general_tempest_incoming_counter_init_effect = yes
 }
+# 
+# rg_gray_admiral_init = {
+# 	event_target:rg_gray_country = {
+# 		create_leader = {
+# 			class = admiral
+# 			species = root
+# 			name = "NAME_Gray"
+# 			immortal = yes
+# 			event_leader = yes
+# 			skip_background_generation = yes
+# 			custom_catch_phrase = gray_catch_phrase
+# 			custom_description = gray_backstory
+# 			background_ethic = ethic_gestalt_consciousness
+# 			hide_age = yes
+# 			gender = female
+# 			skill = 10
+# 			set_age = 18
+# 			traits = {
+# 				trait = RG_leader_trait_admiral_gray
+# 			}
+# 			effect = {
+# 				save_global_event_target_as = gray_leader_admiral
+# 				set_leader_flag = gray_admiral
+# 				set_leader_flag = legendary_leader
+# 				set_leader_flag = immune_to_negative_traits
+# 				if = {
+# 					limit = {
+# 						has_global_flag = has_wsg_mod
+# 					}
+# 					set_leader_flag = not_has_wg_affection_normal
+# 				}
+# 				if = {
+# 					limit = {
+# 						owner = {
+# 							OR = {
+# 								has_global_flag = has_wsg_mod
+# 								has_global_flag = kdc_event_mod_active
+# 							}
+# 						}
+# 					}
+# 					set_leader_flag = "gray_leader"					# "gray_leader"==rg_gray_leader
+# 					set_leader_flag = gray_leader
+# 					add_trait_no_notify = gray_admiral
+# 					if = {
+# 						limit = {
+# 							owner = {
+# 								has_country_flag = origin_gray_weaken
+# 								has_country_flag = origin_gray_country
+# 							}
+# 						}
+# 						remove_trait = gray_admiral
+# 						add_trait_no_notify = leader_trait_admiral_gray_weak
+# 						# 缺少特质leader_trait_admiral_gray_weak将导致KDC故事包远星之歌起源研究纳米星球特殊项目无法完成
+# 					}
+# 				}
+# 				set_leader_flag = rg_gray_leader
+# 				add_trait_no_notify = RG_leader_trait_admiral_gray
+# 				add_trait_no_notify = RG_leader_trait_admiral_nanorebuild_gray
+# 				# 缺少特质RG_leader_trait_admiral_gray将导致小灰改造项目无法完成
+# 				add_trait_no_notify = subclass_admiral_aggressor
+# 				add_trait_no_notify = leader_trait_carrier_specialization
+# 				add_trait_no_notify = leader_trait_artillerist_2
+# 				add_trait_no_notify = leader_trait_juryrigger_2
+# 			}
+# 		}
+# 		last_created_leader = {
+# 			set_owner = event_target:gray_owner
+# 		}
+# 	}
+# 	last_created_leader = {
+# 		set_leader_flag = has_gained_level_trait
+# 	}
+# 	random_owned_leader = {
+# 		limit = {
+# 			has_leader_flag = gray_admiral
+# 		}
+# 		if = {
+# 			limit = {
+# 				owner = {
+# 					OR = {
+# 						has_global_flag = has_wsg_mod
+# 						has_global_flag = kdc_event_mod_active
+# 					}
+# 				}
+# 			}
+# 			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 = {
+# 				limit = {
+# 					owner = {
+# 						has_country_flag = gray_encountered_the_loop
+# 					}
+# 				}
+# 				add_trait_no_notify = leader_trait_admiral_wg_the_loop
+# 			}
+# 			set_gray_portrait = yes
+# 			# add_special_leader_affection_trait = { LEADER = gray LEADER_CLASS = governor MARRIED_FLAG = married_gray }
+# 		}
+# 		else = {
+# 			rg_set_gray_portrait = yes
+# 		}
+# 	}
+# 	RG_leader_trait_admiral_nanorebuild_gray_counter_init_effect = yes
+# }
+# 
+# rg_gray_general_init = {
+# 	event_target:rg_gray_country = {
+# 		create_leader = {
+# 			class = general
+# 			species = root
+# 			name = "NAME_Gray"
+# 			immortal = yes
+# 			event_leader = yes
+# 			skip_background_generation = yes
+# 			custom_catch_phrase = gray_catch_phrase
+# 			custom_description = gray_backstory
+# 			background_ethic = ethic_gestalt_consciousness
+# 			hide_age = yes
+# 			gender = female
+# 			skill = 10
+# 			set_age = 18
+# 			traits = {
+# 				trait = RG_leader_trait_general_gray
+# 				trait = RG_leader_trait_general_gray_skill
+# 				trait = subclass_general_marshall
+# 				trait = leader_trait_heavy_hitter_2
+# 				trait = leader_trait_reinforcer_2
+# 			}
+# 			effect = {
+# 				save_global_event_target_as = gray_leader_general
+# 				set_leader_flag = rg_gray_leader
+# 				set_leader_flag = gray_general
+# 				set_leader_flag = legendary_leader
+# 				set_leader_flag = immune_to_negative_traits
+# 				if = {
+# 					limit = {
+# 						has_global_flag = has_wsg_mod
+# 					}
+# 					set_leader_flag = not_has_wg_affection_normal
+# 				}
+# 				if = {
+# 					limit = {
+# 						owner = {
+# 							OR = {
+# 								has_global_flag = has_wsg_mod
+# 								has_global_flag = kdc_event_mod_active
+# 							}
+# 						}
+# 					}
+# 					set_leader_flag = "gray_leader"					# "gray_leader"==rg_gray_leader
+# 					set_leader_flag = gray_leader
+# 				}
+# 			}
+# 		}
+# 		last_created_leader = {
+# 			set_owner = event_target:gray_owner
+# 		}
+# 	}
+# 	last_created_leader = {
+# 		set_leader_flag = has_gained_level_trait
+# 	}
+# 	random_owned_leader = {
+# 		limit = {
+# 			has_leader_flag = gray_general
+# 		}
+# 		if = {
+# 			limit = {
+# 				owner = {
+# 					OR = {
+# 						has_global_flag = has_wsg_mod
+# 						has_global_flag = kdc_event_mod_active
+# 					}
+# 				}
+# 			}
+# 			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 = {
+# 				limit = {
+# 					owner = {
+# 						has_country_flag = gray_encountered_the_loop
+# 					}
+# 				}
+# 				add_trait_no_notify = leader_trait_admiral_wg_the_loop
+# 			}
+# 			set_gray_portrait = yes
+# 			# add_special_leader_affection_trait = { LEADER = gray LEADER_CLASS = governor MARRIED_FLAG = married_gray }
+# 		}
+# 		else = {
+# 			rg_set_gray_portrait = yes
+# 		}
+# 	}
+# 	set_variable = {
+# 		which = rg_general_skill_combat_daypassed_variable
+# 		value = 1
+# 	}
+# 	set_variable = {
+# 		which = rg_general_skill_combat_killed_variable
+# 		value = 0
+# 	}
+# 	
+# }
 
 rg_gray_scientist_init = {
 	event_target:rg_gray_country = {
 		create_leader = {
 			class = scientist
-			species = root
+			species = event_target:gray_species
 			name = "NAME_Gray"
 			immortal = yes
 			event_leader = yes
 			skip_background_generation = yes
+			randomize_traits = no
 			custom_catch_phrase = gray_catch_phrase
 			custom_description = gray_backstory
 			background_ethic = ethic_gestalt_consciousness
@@ -363,10 +474,10 @@ rg_gray_scientist_init = {
 			skill = 10
 			set_age = 18
 			traits = {
-				trait = RG_leader_trait_scientist_gray
-				trait = subclass_scientist_explorer
-				trait = leader_trait_engineering_focus_2
-				trait = leader_trait_salvager_3
+				0 = RG_leader_trait_scientist_gray
+				1 = subclass_scientist_explorer
+				2 = leader_trait_engineering_focus_2
+				3 = leader_trait_salvager_3
 			}
 			effect = {
 				save_global_event_target_as = gray_leader_scientist
@@ -382,11 +493,9 @@ rg_gray_scientist_init = {
 				}
 				if = {
 					limit = {
-						owner = {
-							OR = {
-								has_global_flag = has_wsg_mod
-								has_global_flag = kdc_event_mod_active
-							}
+						OR = {
+							has_global_flag = has_wsg_mod
+							has_global_flag = kdc_event_mod_active
 						}
 					}
 					set_leader_flag = "gray_leader"					# "gray_leader"==rg_gray_leader
@@ -407,26 +516,32 @@ rg_gray_scientist_init = {
 		}
 		if = {
 			limit = {
-				owner = {
-					OR = {
-						has_global_flag = has_wsg_mod
-						has_global_flag = kdc_event_mod_active
-					}
+				OR = {
+					has_global_flag = has_wsg_mod
+					has_global_flag = kdc_event_mod_active
 				}
 			}
-			leader_event = {
-				id = wg_affection.8
-				days = 1
-			}
-			add_trait_no_notify = leader_trait_admiral_wg_gray_affection
 			if = {
 				limit = {
-					owner = {
-						has_country_flag = gray_encountered_the_loop
-					}
+					has_leader_flag = has_wg_affection_wg_gray
 				}
-				add_trait_no_notify = leader_trait_admiral_wg_the_loop
+				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 = {
+			# 	limit = {
+			# 		owner = {
+			# 			has_country_flag = gray_encountered_the_loop
+			# 		}
+			# 	}
+			# 	add_trait_no_notify = leader_trait_admiral_wg_the_loop
+			# }
 			set_gray_portrait = yes
 			# add_special_leader_affection_trait = { LEADER = gray LEADER_CLASS = governor MARRIED_FLAG = married_gray }
 		}
@@ -434,19 +549,20 @@ 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
+		class = official
+		species = event_target:gray_species
 		name = "NAME_Gray"
 		gender = female
 		immortal = yes
 		event_leader = yes
 		skip_background_generation = yes
+		randomize_traits = no
 		custom_catch_phrase = gray_catch_phrase
 		custom_description = gray_backstory
 		background_ethic = ethic_gestalt_consciousness
@@ -454,8 +570,8 @@ rg_gray_country_leader_init = {
 		skill = 10
 		set_age = 18
 		traits = {
-			trait = rg_leader_trait_governor_gray
-			trait = RG_leader_trait_ruler_gray
+			0 = RG_leader_trait_governor_gray
+			1 = RG_leader_trait_ruler_gray
 		}
 		effect = {
 			save_global_event_target_as = rg_gray_country_leader
@@ -466,11 +582,9 @@ rg_gray_country_leader_init = {
 			# set_leader_flag = rg_gray_leader
 			if = {
 				limit = {
-					owner = {
-						OR = {
-							has_global_flag = has_wsg_mod
-							has_global_flag = kdc_event_mod_active
-						}
+					OR = {
+						has_global_flag = has_wsg_mod
+						has_global_flag = kdc_event_mod_active
 					}
 				}
 				# 暂时和小灰网络断开连接
@@ -478,16 +592,16 @@ rg_gray_country_leader_init = {
 				# set_leader_flag = gray_leader
 				add_trait_no_notify = leader_trait_governor_gray
 				add_trait_no_notify = RG_leader_trait_ruler_gray
-				add_trait_no_notify = subclass_governor_economist
-				add_trait_no_notify = leader_trait_urbanist_3
-				add_trait_no_notify = leader_trait_scrapper_2
+				add_trait_no_notify = subclass_official_governor
+				add_trait_no_notify = trait_ruler_architectural_sense_3
+				add_trait_no_notify = leader_trait_distribution_lines_2
 			}
 			else = {
 				add_trait_no_notify = RG_leader_trait_governor_gray
 				add_trait_no_notify = RG_leader_trait_ruler_gray
-				add_trait_no_notify = subclass_governor_economis
-				add_trait_no_notify = leader_trait_urbanist_3
-				add_trait_no_notify = leader_trait_scrapper_2
+				add_trait_no_notify = subclass_official_governor
+				add_trait_no_notify = trait_ruler_architectural_sense_3
+				add_trait_no_notify = leader_trait_distribution_lines_2
 			}
 		}
 	}

common/scripted_effects/RG_scripted_effects.txt

@@ -1,8 +1,22 @@
 @gray_portrait = Gray
 rg_set_gray_portrait = {
-	change_leader_portrait = @gray_portrait
-	event_target:rg_gray_country_leader = {
+	if = {
+		limit = {
+			has_global_flag = ms_species_enabled
+			event_target:gray_owner = {
+				has_country_flag = mss_enable_gray_maid
+			}
+		}
+		ms_update_gray_portrait = yes
+		event_target:rg_gray_country_leader = {
+			ms_update_gray_portrait = yes
+		}
+	}
+	else = {
 		change_leader_portrait = @gray_portrait
+		event_target:rg_gray_country_leader = {
+			change_leader_portrait = @gray_portrait
+		}
 	}
 }
 
@@ -663,7 +677,7 @@ rg_create_graygoo_roamers_7 = {
 rg_create_dessanu_roamers_1 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -734,7 +748,7 @@ rg_create_dessanu_roamers_1 = {
 rg_create_dessanu_roamers_2 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -805,7 +819,7 @@ rg_create_dessanu_roamers_2 = {
 rg_create_dessanu_roamers_3 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -876,7 +890,7 @@ rg_create_dessanu_roamers_3 = {
 rg_create_dessanu_roamers_4 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -947,7 +961,7 @@ rg_create_dessanu_roamers_4 = {
 rg_create_dessanu_roamers_5 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -1018,7 +1032,7 @@ rg_create_dessanu_roamers_5 = {
 rg_create_dessanu_roamers_6 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -1089,7 +1103,7 @@ rg_create_dessanu_roamers_6 = {
 rg_create_dessanu_roamers_7 = {
 	event_target:graygoo_country = {
 		create_leader = {
-			class = admiral
+			class = commander
 			species = owner_main_species
 			name = random
 			skill = 3
@@ -2189,6 +2203,7 @@ rg_gray_country_init = {
 		# 下一阶段的事件再建立通讯
 		# establish_communications_no_message = root
 		save_global_event_target_as = rg_gray_country
+		save_global_event_target_as = gray_country
 		# 创建看板娘用于第一次接触
 		rg_gray_country_leader_init = yes
 		set_leader = last_created_leader
@@ -2543,3 +2558,83 @@ rg_lcluster_spawn_effect = {
 		days = -1
 	}
 }
+RG_gray_mod1_effect = {
+	custom_tooltip = rg_levelup_2.tooltip
+	if = {
+		limit = {
+			has_global_flag = rg_skip_gray_mod_situation
+		}
+		enable_special_project = {
+			name = RG_GRAY_MOD1
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	else = {
+		start_situation = {
+			type = situation_rg_gray_mod1
+			target = this
+		}
+	}
+	add_resource = {
+		energy = -15000
+		alloys = -15000
+	}
+}
+RG_gray_mod1_effect_project = {
+	custom_tooltip = rg_levelup_2.tooltip
+	enable_special_project = {
+		name = RG_GRAY_MOD1
+		location = event_target:gray_owner_capital_starbase
+		owner = event_target:gray_owner
+	}
+}
+RG_gray_mod2_effect = {
+	custom_tooltip = rg_levelup_2.tooltip
+	if = {
+		limit = {
+			has_global_flag = rg_skip_gray_mod_situation
+		}
+		enable_special_project = {
+			name = RG_GRAY_MOD2
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	else = {
+		start_situation = {
+			type = situation_rg_gray_mod2
+			target = this
+		}
+	}
+	add_resource = {
+		energy = -150000
+		alloys = -150000
+	}
+}
+RG_gray_mod3_effect = {
+	custom_tooltip = rg_levelup_2.tooltip
+	enable_special_project = {
+		name = RG_GRAY_MOD3
+		location = event_target:gray_owner_capital_starbase
+		owner = event_target:gray_owner
+	}
+	add_resource = {
+		energy = -40000
+		alloys = -40000
+	}
+}
+rg_gray_ship_design_reset_init = {
+	create_ship_design = {
+		design = "NAME_Gray_Warship_rg"
+	}
+	add_ship_design = last_created_design
+	create_ship_design = {
+		design = "NAME_gray_capitalship"
+	}
+	add_ship_design = last_created_design
+	create_ship_design = {
+		design = "NAME_gray_juggernautship"
+	}
+	add_ship_design = last_created_design
+}

common/scripted_effects/RG_special_effects.txt

@@ -1,20 +1,14 @@
 rg_storyline_trigger = {
 	# 初始化故事事件触发
-	random_list = {
-		50 = {
-			country_event = {
-				id = rg_story.2
-				days = 3600
-				random = 12800
-			}
-		}
-		50 = {
-			country_event = {
-				id = rg_story.8
-				days = 3600
-				random = 12800
-			}
-		}
+	country_event = {
+		id = rg_story.2
+		days = 3600
+		random = 12800
+	}
+	country_event = {
+		id = rg_story.8
+		days = 3600
+		random = 12800
 	}
 	if = {
 		limit = {
@@ -92,6 +86,64 @@ rg_create_gray_paperwork_testship_1 = {
 	}
 }
 
+rg_create_gray_mod1_testship_1 = {
+	create_fleet = {
+		name = "NAME_RG_TESTSHIP"
+		settings = {
+			can_disband = yes
+			can_upgrade = no
+			can_change_composition = no
+			can_change_leader = no
+			uses_naval_capacity = no
+			spawn_debris = no
+		}
+		effect = {
+			set_owner = root
+			create_ship = {
+				name = "NAME_RG_TESTSHIP"
+				design = "RG_aircruiser_Interdictor"
+				prefix = no
+				upgradable = no
+			}
+			set_location = {
+				target = root.capital_scope
+				distance = 0
+				angle = random
+			}
+			set_fleet_flag = rg_test_ship_fleet
+		}
+	}
+}
+
+rg_create_gray_mod1_testship_2 = {
+	create_fleet = {
+		name = "NAME_RG_TESTSHIP"
+		settings = {
+			can_disband = yes
+			can_upgrade = no
+			can_change_composition = no
+			can_change_leader = no
+			uses_naval_capacity = no
+			spawn_debris = no
+		}
+		effect = {
+			set_owner = root
+			create_ship = {
+				name = "NAME_RG_TESTSHIP"
+				design = "RG_Buff_interdictor"
+				prefix = no
+				upgradable = no
+			}
+			set_location = {
+				target = root.capital_scope
+				distance = 0
+				angle = random
+			}
+			set_fleet_flag = rg_test_ship_fleet
+		}
+	}
+}
+
 rg_create_fake_dragon_species = {
 	create_species = {
 		name = RG_SIMULATION_DRAGON_SPECIES
@@ -114,7 +166,7 @@ rg_create_fake_dragon = {
 			}
 		}
 		create_leader = {
-			class = admiral
+			class = commander
 			species = root
 			name = "Name_rg_fake_dragon"
 			event_leader = yes
@@ -127,15 +179,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
@@ -240,3 +283,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
+			}
+		}
+	}
+}

common/scripted_effects/rg_gray_warship_init_effects.txt

@@ -0,0 +1,177 @@
+#普通的母舰
+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"
+				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 = {
+				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
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
+			}
+			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
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
+			}
+			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
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
+			}
+			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
+				}
+			}
+		}
+	}
+}

common/scripted_triggers/!_rg_scripted_trigger_overwrite.txt

@@ -0,0 +1,8 @@
+has_budding_trait = {
+	OR = {
+		has_trait = trait_plantoid_budding
+		has_trait = trait_lithoid_budding
+		has_trait = trait_advanced_budding
+		has_trait = rg_machine_maid_trait
+	}
+}

common/scripted_triggers/RG_scripted_triggers.txt

@@ -1,5 +1,3 @@
-#星球无法自动建造
-#scope (planet)
 RG_planet_can_auto_build = {
 	OR = {
 		AND = {
@@ -24,4 +22,4 @@ RG_planet_can_auto_build = {
 		has_deposit = d_trade_value_10
 		has_planet_flag = RG_work_bees_built
 	}
-}
+}

common/scripted_triggers/rg_leader_scripted_triggers.txt

@@ -0,0 +1,125 @@
+RG_gray_mod1_trigger = {
+	event_target:gray_leader_admiral = {
+		has_skill >= 10
+	}
+	NOR = {
+		has_country_flag = rg_gray_level_2
+		has_country_flag = rg_gray_level_3
+		has_special_project = RG_GRAY_MOD1
+		any_situation = {
+			is_situation_type = situation_rg_gray_mod1
+		}
+	}
+}
+
+RG_gray_mod1_allow_trigger = {
+	hidden_trigger = {
+		event_target:gray_warship = {
+			num_ships > 0
+		}
+	}
+	custom_tooltip = {
+		fail_text = graygoo.500.allow.a
+		event_target:gray_warship = {
+			is_in_combat = no
+		}
+	}
+	custom_tooltip = {
+		fail_text = graygoo.500.allow.b
+		event_target:gray_warship = {
+			NOT = {
+				has_hp_percentage < 0.97
+			}
+		}
+	}
+	custom_tooltip = {
+		fail_text = requires_rg_graylevel_higherthan_25
+		event_target:gray_leader_admiral = {
+			has_skill >= 10
+		}
+	}
+	resource_stockpile_compare = {
+		resource = energy
+		value >= 15000
+	}
+	resource_stockpile_compare = {
+		resource = alloys
+		value >= 15000
+	}
+}
+
+RG_gray_mod2_trigger = {
+	AND = {
+		event_target:gray_leader_admiral = {
+			has_skill >= 10
+		}
+		has_country_flag = rg_gray_level_2
+	}
+	NOR = {
+		has_country_flag = rg_gray_level_3
+		has_special_project = RG_GRAY_MOD2
+		any_situation = {
+			is_situation_type = situation_rg_gray_mod2
+		}
+	}
+}
+RG_gray_mod2_allow_trigger = {
+	hidden_trigger = {
+		# To prevent exploit
+		event_target:gray_warship = {
+			num_ships > 0
+		}
+	}
+	custom_tooltip = {
+		fail_text = graygoo.500.allow.a
+		event_target:gray_warship = {
+			is_in_combat = no
+		}
+	}
+	custom_tooltip = {
+		fail_text = graygoo.500.allow.b
+		event_target:gray_warship = {
+			NOT = {
+				has_hp_percentage < 0.97
+			}
+		}
+	}
+	OR = {
+		custom_tooltip = {
+			fail_text = requires_rg_graylevel_higherthan_50
+			has_technology = tech_juggernaut
+		}
+		custom_tooltip = {
+			fail_text = requires_rg_graylevel_higherthan_20
+			event_target:gray_leader_admiral = {
+				has_skill >= 20
+			}
+		}
+	}
+	resource_stockpile_compare = {
+		resource = energy
+		value >= 150000
+	}
+	resource_stockpile_compare = {
+		resource = alloys
+		value >= 150000
+	}
+}
+RG_gray_mod3_trigger = {
+	NOR = {
+		has_country_flag = gray_reforming
+		has_country_flag = rg_juggernaut_fired
+	}
+	has_country_flag = rg_gray_level_3
+}
+RG_gray_mod3_allow_trigger = {
+	resource_stockpile_compare = {
+		resource = energy
+		value >= 150000
+	}
+	resource_stockpile_compare = {
+		resource = alloys
+		value >= 150000
+	}
+	has_technology = tech_juggernaut
+}

common/section_templates/RG_gray_goo_section.txt

@@ -43,12 +43,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #战列2
@@ -95,12 +89,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #泰坦3
@@ -122,12 +110,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }
 
 #线列4
@@ -149,12 +131,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #雷装5
@@ -201,12 +177,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #近防6
@@ -237,53 +207,47 @@ ship_section_template = {
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_05"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_01"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_06"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_02"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_07"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_03"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_08"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_04"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_09"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_05"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_10"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_06"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_11"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_07"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	component_slot = {
-		name = "PD_12"
-		template = "point_defence_turret"
+		name = "MEDIUM_GUN_08"
+		template = "medium_turret"
 		locatorname = "turret_01"
 	}
 	large_utility_slots = 6
-	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 120
-		}
-	}
+	aux_utility_slots = 3
 }
 
 #光环7
@@ -304,13 +268,7 @@ ship_section_template = {
 		locatorname = "turret_01"
 	}
 	large_utility_slots = 6
-	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 120
-		}
-	}
+	aux_utility_slots = 3
 }
 
 #巨像8
@@ -326,13 +284,7 @@ ship_section_template = {
 		locatorname = "boope"
 	}
 	large_utility_slots = 6
-	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 120
-		}
-	}
+	aux_utility_slots = 3
 }
 
 #武库舰9
@@ -669,12 +621,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #航战10
@@ -716,12 +662,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #雷巡11
@@ -768,12 +708,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 #撞击舰12
@@ -799,13 +733,7 @@ ship_section_template = {
 		locatorname = "xl_gun_01"
 	}
 	large_utility_slots = 12
-	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
+	aux_utility_slots = 3
 }
 
 ship_section_template = {
@@ -926,12 +854,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 12
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }
 
 ship_section_template = {
@@ -1082,12 +1004,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 10
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }
 
 ship_section_template = {
@@ -1153,12 +1069,6 @@ ship_section_template = {
 		locatorname = "root"
 	}
 	aux_utility_slots = 1
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }
 
 ship_section_template = {
@@ -1204,12 +1114,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 4
 	aux_utility_slots = 1
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 240
-		}
-	}
 }
 
 ship_section_template = {
@@ -1265,10 +1169,4 @@ ship_section_template = {
 	}
 	large_utility_slots = 12
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 480
-		}
-	}
 }

common/section_templates/RG_gray_ship_section.txt

@@ -160,12 +160,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 12
 	aux_utility_slots = 3
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 960
-		}
-	}
 }
 
 ship_section_template = {
@@ -627,12 +621,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 48
 	aux_utility_slots = 8
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }
 
 ship_section_template = {
@@ -1094,12 +1082,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 48
 	aux_utility_slots = 8
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }
 
 ship_section_template = {
@@ -1108,12 +1090,6 @@ ship_section_template = {
 	fits_on_slot = behind
 	entity = "grey_tempesttw_thinktank_phase_03_entity"
 	icon = "GFX_ship_part_core_mid"
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }
 
 ship_section_template = {
@@ -1122,10 +1098,4 @@ ship_section_template = {
 	fits_on_slot = behind
 	entity = "grey_tempesttw_thinktank_phase_03_entity"
 	icon = "GFX_ship_part_core_mid"
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
 }

common/section_templates/RG_special_ship_section.txt

@@ -57,12 +57,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 90
-		}
-	}
 }
 
 ship_section_template = {
@@ -124,12 +118,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 90
-		}
-	}
 }
 
 ship_section_template = {
@@ -185,12 +173,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 90
-		}
-	}
 }
 
 ship_section_template = {
@@ -248,12 +230,6 @@ ship_section_template = {
 	}
 	large_utility_slots = 6
 	aux_utility_slots = 2
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 90
-		}
-	}
 }
 
 # Baby Dragon
@@ -694,10 +670,67 @@ ship_section_template = {
 	}
 	large_utility_slots = 48
 	aux_utility_slots = 8
-	resources = {
-		category = ship_sections
-		cost = {
-			alloys = 114514
-		}
-	}
+}
+
+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
+}
+
+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
 }

common/ship_sizes/RG_ship_sizes.txt

@@ -30,7 +30,7 @@ RG_graygoo_mothership = {
 	modifier = {
 		ship_evasion_add = 50
 		ship_armor_add = 25600
-		ship_shield_add = 25600
+		# ship_shield_add = 25600
 	}
 	ship_modifier = {
 		ship_disengage_chance_reduction = 8
@@ -50,6 +50,9 @@ RG_graygoo_mothership = {
 	is_space_station = no
 	icon = ship_size_military_16
 	base_buildtime = @titan_build_time
+
+	use_shipnames_from = titan
+
 	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
@@ -68,15 +71,12 @@ RG_graygoo_mothership = {
 	required_component_set = "sensor_components"
 	required_component_set = "science_cloaking_components"
 	required_component_set = "ship_aura_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @battleship_upkeep_energy
-			alloys = @battleship_upkeep_alloys
-		}
-	}
-	min_upgrade_cost = {
-		alloys = 8
+		cost = {
+			nanites = 30000
+	    }
 	}
 }
 
@@ -90,7 +90,7 @@ RG_graygoo_capitalship = {
 	modifier = {
 		ship_evasion_add = 100
 		ship_armor_add = 128000
-		ship_shield_add = 128000
+		# ship_shield_add = 128000
 		ship_weapon_damage = 2
 		ship_cloaking_detection_add = 5
 	}
@@ -115,17 +115,22 @@ RG_graygoo_capitalship = {
 	is_space_station = no
 	icon = ship_size_military_16
 	base_buildtime = @titan_build_time
+
+	use_shipnames_from = juggernaut
 	can_have_federation_design = yes
-	enable_default_design = no	#if yes, countries will have an auto-generated design at start
+	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 = colossus
 	combat_disengage_chance = 1.25
 	class = shipclass_military
 	construction_type = starbase_shipyard
+	possible_construction = {
+		always = no
+	}
 	combat_size_multiplier = 4
 	prerequisites = {
-		"tech_object_gray_6"
+		"tech_gray_juggernaut_8"
 	}
 	required_component_set = "power_core"
 	required_component_set = "ftl_components"
@@ -136,15 +141,130 @@ RG_graygoo_capitalship = {
 	required_component_set = "ship_aura_components"
 	required_component_set = "ship_aura_components"
 	required_component_set = "ship_aura_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @battleship_upkeep_energy
-			alloys = @battleship_upkeep_alloys
+		cost = {
+			nanites = 150000
+	    }
+	}
+}
+
+RG_gray_juggernaut = {
+	max_speed = 100
+	entity = "grey_tempesttw_juggernaut_entity"
+	acceleration = 0.2
+	rotation_speed = 0.15
+	collision_radius = @juggernaut_collision_radius
+	modifier = {
+		ship_evasion_add = 100
+		ship_armor_add = 108000
+		# ship_shield_add = 108000
+		ship_weapon_damage = 2
+		starbase_shipyard_capacity_add = 12
+		ship_cloaking_detection_add = 5
+	}
+	ship_modifier = {
+		ship_disengage_chance_reduction = 8
+		ships_upkeep_mult = -1
+		ship_shield_hardening_add = 2
+		ship_armor_hardening_add = 2
+	}
+	max_hitpoints = 108000
+	base_buildtime = @juggernaut_build_time
+
+	use_shipnames_from = juggernaut
+	combat_size_multiplier = 5
+	size_multiplier = 32
+	fleet_slot_size = 32
+	section_slots = {
+		"core" = {
+			locator = "part1"
+		}
+		"behind" = {
+			locator = "part2"
 		}
 	}
-	min_upgrade_cost = {
-		alloys = 8
+	num_target_locators = 16
+	can_have_federation_design = no
+	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
+	icon_frame = 7	#probably unused, but mobile starbases are special
+	icon = ship_size_military_64
+	ship_class_icon_frame = 35
+	default_behavior = colossus
+	is_designable = yes
+	prerequisites = {
+		"tech_gray_juggernaut_8"
+	}
+	class = shipclass_starbase
+	construction_type = starbase_shipyard
+	potential_construction = {
+		OR = {
+			is_scope_type = starbase
+			AND = {
+				is_scope_type = megastructure
+				OR = {
+					is_megastructure_type = mega_shipyard_3
+					is_megastructure_type = mega_shipyard_restored
+				}
+			}
+		}
+	}
+
+	possible_construction = {
+		custom_tooltip = {
+			fail_text = starbase_citadel_trigger
+			OR = {
+				AND = {
+					is_scope_type = megastructure
+					OR = {
+						is_megastructure_type = mega_shipyard_3
+						is_megastructure_type = mega_shipyard_restored
+					}
+				}
+				AND = {
+					is_scope_type = starbase
+					has_starbase_size >= starbase_citadel
+				}
+			}
+		}
+		custom_tooltip = {
+			fail_text = starbase_colossal_yards_trigger
+			OR = {
+				AND = {
+					is_scope_type = megastructure
+					OR = {
+						is_megastructure_type = mega_shipyard_3
+						is_megastructure_type = mega_shipyard_restored
+					}
+				}
+				AND = {
+					is_scope_type = starbase
+					has_starbase_building = colossus_yards
+				}
+			}
+		}
+	}
+	required_component_set = "power_core"
+	required_component_set = "sensor_components"
+	required_component_set = "combat_computers"
+	required_component_set = "ftl_components"
+	required_component_set = "thruster_components"
+	required_component_set = "science_cloaking_components"
+	required_component_set = "ship_aura_components"
+	required_component_set = "ship_aura_components"
+	required_component_set = "ship_aura_components"
+	required_component_set = "ship_aura_components"
+
+	empire_limit = 1
+
+	components_add_to_cost = no
+	resources = {
+		category = ships
+		cost = {
+			nanites = 150000
+	    }
 	}
 }
 
@@ -152,12 +272,12 @@ RG_armed_constructor_ship = {
 	max_speed = 150
 	acceleration = 0.1
 	rotation_speed = 0.2
-	max_hitpoints = 20000
+	max_hitpoints = 2000
 	entity = "grey_tempesttw_constructor_entity"
 	modifier = {
 		ship_evasion_add = 10
-		ship_armor_add = 12800
-		ship_shield_add = 12800
+		ship_armor_add = 1280
+		# ship_shield_add = 12800
 	}
 	ship_modifier = {
 		ship_hyperlane_range_add = 3
@@ -173,6 +293,10 @@ RG_armed_constructor_ship = {
 			locator = "part1"
 		}
 	}
+
+	use_shipnames_from = constructor
+	icon = ship_size_constructor
+	base_buildtime = @construction_build_time
 	num_target_locators = 2
 	is_space_station = no
 	combat_disengage_chance = 2
@@ -189,18 +313,25 @@ RG_armed_constructor_ship = {
 	required_component_set = "sensor_components"
 	required_component_set = "combat_computers"
 	required_component_set = "science_cloaking_components"
+
+	resources = {
+		category = ships
+		cost = {
+			nanites = 1000
+	    }
+	}
 }
 
 RG_armed_science_ship = {
 	max_speed = 200
 	acceleration = 0.35
 	rotation_speed = 0.2
-	max_hitpoints = 12000
+	max_hitpoints = 1200
 	entity = "grey_tempesttw_science_entity"
 	modifier = {
 		ship_evasion_add = 100
-		ship_armor_add = 12000
-		ship_shield_add = 12000
+		ship_armor_add = 1200
+		# ship_shield_add = 12000
 	}
 	ship_modifier = {
 		ship_hyperlane_range_add = 3
@@ -216,6 +347,10 @@ RG_armed_science_ship = {
 			locator = "part1"
 		}
 	}
+
+	use_shipnames_from = science
+	icon = ship_size_science
+	base_buildtime = @science_build_time
 	num_target_locators = 2
 	is_space_station = no
 	combat_size_multiplier = 1
@@ -233,6 +368,13 @@ RG_armed_science_ship = {
 	required_component_set = "combat_computers"
 	required_component_set = "science_cloaking_components"
 	required_component_set = "ship_aura_components"
+
+	resources = {
+		category = ships
+		cost = {
+			nanites = 1000
+	    }
+	}
 }
 
 # Gray Goo Interdictor
@@ -248,7 +390,7 @@ RG_graygoo_interdictor = {
 		ships_upkeep_mult = -1
 		ship_piracy_suppression_add = 4
 		ship_armor_add = 2800
-		ship_shield_add = 2800
+		# ship_shield_add = 2800
 	}
 	max_hitpoints = 5000
 	size_multiplier = 8
@@ -262,6 +404,8 @@ RG_graygoo_interdictor = {
 	is_space_station = no
 	icon = ship_size_military_4
 	base_buildtime = @battleship_build_time
+
+	use_shipnames_from = battleship
 	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
@@ -278,15 +422,73 @@ RG_graygoo_interdictor = {
 	required_component_set = "combat_computers"
 	required_component_set = "thruster_components"
 	required_component_set = "sensor_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @battleship_upkeep_energy
-			alloys = @battleship_upkeep_alloys
+		cost = {
+			nanites = 3000
+	    }
+	}
+}
+
+# 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"
 		}
 	}
-	min_upgrade_cost = {
-		alloys = 8
+	num_target_locators = 2
+	is_space_station = no
+	icon = ship_size_military_2
+	base_buildtime = @destroyer_build_time
+
+	use_shipnames_from = destroyer
+	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"
+	components_add_to_cost = no
+	resources = {
+		category = ships
+		cost = {
+			nanites = 1000
+	    }
 	}
 }
 
@@ -303,7 +505,7 @@ RG_graygoo_icebreaker_interdictor = {
 		ships_upkeep_mult = -1
 		ship_piracy_suppression_add = 4
 		ship_armor_add = 4800
-		ship_shield_add = 4800
+		# ship_shield_add = 4800
 	}
 	max_hitpoints = 10000
 	size_multiplier = 8
@@ -317,6 +519,7 @@ RG_graygoo_icebreaker_interdictor = {
 	is_space_station = no
 	icon = ship_size_military_4
 	base_buildtime = @battleship_build_time
+	use_shipnames_from = battleship
 	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
@@ -334,15 +537,12 @@ RG_graygoo_icebreaker_interdictor = {
 	required_component_set = "thruster_components"
 	required_component_set = "sensor_components"
 	required_component_set = "science_cloaking_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @battleship_upkeep_energy
-			alloys = @battleship_upkeep_alloys
-		}
-	}
-	min_upgrade_cost = {
-		alloys = 8
+		cost = {
+			nanites = 6000
+	    }
 	}
 }
 
@@ -359,9 +559,9 @@ RG_graygoo_Arsenal = {
 		ships_upkeep_mult = -1
 		ship_piracy_suppression_add = 4
 		ship_armor_add = 2800
-		ship_shield_add = 2800
+		# ship_shield_add = 2800
 	}
-	max_hitpoints = 5000
+	max_hitpoints = 3000
 	size_multiplier = 8
 	fleet_slot_size = 4
 	section_slots = {
@@ -373,6 +573,7 @@ RG_graygoo_Arsenal = {
 	is_space_station = no
 	icon = ship_size_military_4
 	base_buildtime = @battleship_build_time
+	use_shipnames_from = battleship
 	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
@@ -389,15 +590,12 @@ RG_graygoo_Arsenal = {
 	required_component_set = "combat_computers"
 	required_component_set = "thruster_components"
 	required_component_set = "sensor_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @battleship_upkeep_energy
-			alloys = @battleship_upkeep_alloys
-		}
-	}
-	min_upgrade_cost = {
-		alloys = 8
+		cost = {
+			nanites = 6000
+	    }
 	}
 }
 
@@ -413,7 +611,7 @@ RG_graygoo_Buff = {
 		ships_upkeep_mult = -1
 		ship_piracy_suppression_add = 4
 		ship_armor_add = 12800
-		ship_shield_add = 12800
+		# ship_shield_add = 12800
 	}
 	max_hitpoints = 20000
 	size_multiplier = 8
@@ -427,6 +625,7 @@ RG_graygoo_Buff = {
 	is_space_station = no
 	icon = ship_size_military_4
 	base_buildtime = @battleship_build_time
+	use_shipnames_from = colossus
 	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
@@ -445,75 +644,13 @@ RG_graygoo_Buff = {
 	required_component_set = "sensor_components"
 	required_component_set = "ship_aura_components"
 	required_component_set = "science_cloaking_components"
+	components_add_to_cost = no
 	resources = {
 		category = ships
-		upkeep = {
-			energy = @battleship_upkeep_energy
-			alloys = @battleship_upkeep_alloys
-		}
+		cost = {
+			nanites = 8000
+	    }
 	}
-	min_upgrade_cost = {
-		alloys = 8
-	}
-}
-
-RG_gray_juggernaut = {
-	max_speed = 100
-	entity = "grey_tempesttw_juggernaut_entity"
-	acceleration = 0.2
-	rotation_speed = 0.15
-	collision_radius = @juggernaut_collision_radius
-	modifier = {
-		ship_evasion_add = 100
-		ship_armor_add = 108000
-		ship_shield_add = 108000
-		ship_weapon_damage = 2
-		starbase_shipyard_capacity_add = 12
-		ship_cloaking_detection_add = 5
-	}
-	ship_modifier = {
-		ship_disengage_chance_reduction = 8
-		ships_upkeep_mult = -1
-		ship_shield_hardening_add = 2
-		ship_armor_hardening_add = 2
-	}
-	max_hitpoints = 108000
-	base_buildtime = @juggernaut_build_time
-	combat_size_multiplier = 5
-	size_multiplier = 32
-	fleet_slot_size = 32
-	section_slots = {
-		"core" = {
-			locator = "part1"
-		}
-		"behind" = {
-			locator = "part2"
-		}
-	}
-	num_target_locators = 16
-	can_have_federation_design = no
-	enable_default_design = no	#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
-	icon_frame = 7	#probably unused, but mobile starbases are special
-	icon = ship_size_military_64
-	ship_class_icon_frame = 35
-	default_behavior = colossus
-	is_designable = yes
-	prerequisites = {
-		"tech_object_gray_6"
-	}
-	class = shipclass_starbase
-	construction_type = starbase_shipyard
-	required_component_set = "power_core"
-	required_component_set = "sensor_components"
-	required_component_set = "combat_computers"
-	required_component_set = "ftl_components"
-	required_component_set = "thruster_components"
-	required_component_set = "science_cloaking_components"
-	required_component_set = "ship_aura_components"
-	required_component_set = "ship_aura_components"
-	required_component_set = "ship_aura_components"
-	required_component_set = "ship_aura_components"
 }
 
 # Armed Transport
@@ -521,12 +658,12 @@ RG_armed_transport_ship = {
 	max_speed = 150
 	acceleration = 0.1
 	rotation_speed = 0.2
-	max_hitpoints = 20000
+	max_hitpoints = 2000
 	entity = "grey_tempesttw_colonizer_entity"
 	modifier = {
 		ship_evasion_add = 10
-		ship_armor_add = 12800
-		ship_shield_add = 12800
+		ship_armor_add = 1280
+		# ship_shield_add = 12800
 	}
 	ship_modifier = {
 		ship_hyperlane_range_add = 3
@@ -547,6 +684,8 @@ RG_armed_transport_ship = {
 	icon = ship_size_transport
 	is_designable = no
 	class = shipclass_transport
+
+	use_shipnames_from = transport
 	required_component_set = "power_core"
 	required_component_set = "ftl_components"
 	required_component_set = "sensor_components"
@@ -554,12 +693,6 @@ RG_armed_transport_ship = {
 	required_component_set = "combat_computers"
 	required_component_set = "science_cloaking_components"
 	components_add_to_cost = no
-	resources = {
-		category = ships
-		cost = {
-			food = @salvagecostmedium
-		}
-	}
 }
 
 # Armed Colonizer
@@ -567,12 +700,12 @@ RG_armed_colony_ship = {
 	max_speed = 150
 	acceleration = 0.1
 	rotation_speed = 0.2
-	max_hitpoints = 20000
+	max_hitpoints = 2000
 	entity = "grey_tempesttw_colonizer_entity"
 	modifier = {
 		ship_evasion_add = 10
-		ship_armor_add = 12800
-		ship_shield_add = 12800
+		ship_armor_add = 1280
+		# ship_shield_add = 12800
 	}
 	ship_modifier = {
 		ship_hyperlane_range_add = 3
@@ -591,9 +724,12 @@ RG_armed_colony_ship = {
 	num_target_locators = 2
 	is_space_station = no
 	icon = ship_size_colonizer
+	base_buildtime = @colony_build_time
 	is_civilian = yes
 	is_designable = no
 	class = shipclass_colonizer
+
+	use_shipnames_from = colonizer
 	required_component_set = "ftl_components"
 	required_component_set = "sensor_components"
 	required_component_set = "thruster_components"
@@ -601,8 +737,8 @@ RG_armed_colony_ship = {
 	resources = {
 		category = ships
 		cost = {
-			food = @salvagecostmedium
-		}
+			nanites = 1000
+	    }
 	}
 }
 
@@ -613,7 +749,7 @@ RG_orbital_ring_tier_1 = {
 	modifier = {
 		ship_evasion_mult = -1
 		ship_armor_add = 125000
-		ship_shield_add = 125000
+		# ship_shield_add = 125000
 		starbase_defense_platform_capacity_add = 12
 		starbase_module_capacity_add = 12
 		starbase_building_capacity_add = 12
@@ -680,4 +816,4 @@ RG_orbital_ring_tier_1 = {
 	icon_frame = 7
 	scales_with_planet = yes
 	graphical_culture = yes
-}
+}

common/ship_sizes/z_RG_graygoo_ships.txt

@@ -15,7 +15,7 @@ graygoo_mothership = {
 	modifier = {
 		ship_evasion_add = 50
 		ship_armor_add = 25600
-		ship_shield_add = 25600
+		# ship_shield_add = 25600
 	}
 	ship_modifier = {
 		ship_disengage_chance_reduction = 8
@@ -46,8 +46,8 @@ graygoo_mothership = {
 	resources = {
 		category = ships
 		cost = {
-			nanites = @salvagecostlargerare
-		}
+			nanites = 30000
+	    }
 	}
 }
 
@@ -64,7 +64,7 @@ graygoo_interdictor = {
 		ships_upkeep_mult = -1
 		ship_piracy_suppression_add = 4
 		ship_armor_add = 2800
-		ship_shield_add = 2800
+		# ship_shield_add = 2800
 	}
 	max_hitpoints = 5000
 	size_multiplier = 8
@@ -88,8 +88,8 @@ graygoo_interdictor = {
 	resources = {
 		category = ships
 		cost = {
-			nanites = @salvagecostmediumrare
-		}
+			nanites = 3000
+	    }
 	}
 }
 
@@ -103,8 +103,8 @@ graygoo_factory = {
 	modifier = {
 		ship_cloaking_detection_add = 5
 		ship_evasion_add = 50
-		ship_armor_add = 1024000
-		ship_shield_add = 1024000
+		ship_armor_add = 2048000
+		# ship_shield_add = 1024000
 	}
 	ship_modifier = {
 		ship_shield_hardening_add = 5
@@ -132,8 +132,8 @@ graygoo_factory = {
 	resources = {
 		category = ships
 		cost = {
-			nanites = @salvagecostlargerare
-		}
+			nanites = 30000
+	    }
 	}
 }
 
@@ -180,8 +180,7 @@ nanite_space_dragon_baby = {
 	resources = {
 		category = ships
 		cost = {
-			alloys = @salvagecostmedium
-			nanites = @salvagecostmediumrare
-		}
+			nanites = 30000
+	    }
 	}
 }

common/situations/rg_gray_situations.txt

@@ -0,0 +1,549 @@
+situation_rg_gray_mod1 = {
+	picture = GFX_evt_planet_beam
+	complete_icon_frame = GFX_situation_outcome_frame_green
+	complete_icon = GFX_situation_outcome_positive
+	on_progress_complete = {
+		custom_tooltip = situation_rg_gray_mod1_finish_tooltip
+		hidden_effect = {
+			owner = {
+				country_event = {
+					id = rg_story.29
+				}
+			}
+		}
+		destroy_situation = this 
+	}
+
+	on_start = {
+		owner = {
+			country_event = {
+				id = rg_event.9
+			}
+		}
+	}
+
+	on_monthly = {
+		events = {
+		}
+	}
+
+	stages = {
+		situation_rg_gray_mod1_stage_1 = {
+			icon = GFX_situation_stage_1
+			icon_background = GFX_situation_stage_frame_green
+			end = 16.5
+			custom_tooltip = situation_rg_gray_mod1_stage_1_tooltip
+			on_first_enter = {
+				event_target:gray_warship = {
+					set_event_locked = yes
+				}
+				owner = {
+					country_event = {
+						id = rg_story.23
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod1_stage_2 = {
+			icon = GFX_situation_stage_2
+			icon_background = GFX_situation_stage_frame_green
+			end = 33
+			custom_tooltip = situation_rg_gray_mod1_stage_2_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.24
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod1_stage_3 = {
+			icon = GFX_situation_stage_3
+			icon_background = GFX_situation_stage_frame_green
+			end = 50
+			custom_tooltip = situation_rg_gray_mod1_stage_3_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.25
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod1_stage_4 = {
+			icon = GFX_situation_stage_4
+			icon_background = GFX_situation_stage_frame_green
+			end = 66
+			custom_tooltip = situation_rg_gray_mod1_stage_4_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.26
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod1_stage_5 = {
+			icon = GFX_situation_stage_5
+			icon_background = GFX_situation_stage_frame_green
+			end = 82.5
+			custom_tooltip = situation_rg_gray_mod1_stage_5_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.27
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod1_stage_6 = {
+			icon = GFX_situation_stage_6
+			icon_background = GFX_situation_stage_frame_red
+			end = 100
+			custom_tooltip = situation_rg_gray_mod1_stage_6_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.28
+					}
+				}
+				event_target:gray_warship = {
+					set_event_locked = no
+				}
+			}
+		}
+	}
+	approach = {
+		name = situation_rg_gray_mod1_approach_1
+		icon = GFX_situation_approach_research
+		icon_background = GFX_situation_approach_bg_green
+		default = yes
+		on_select = {
+			if = {
+				limit = {
+					NOT = {
+						has_situation_flag = rg_stage6_locked
+					}
+					has_situation_flag = locked
+				}
+				set_situation_locked = no
+				remove_situation_flag = locked
+			}
+			event_target:gray_warship = {
+				set_event_locked = yes
+			}
+			custom_tooltip = situation_rg_gray_mod1_approach_1_tooltip
+		}
+		triggered_modifier = {
+			potential = {
+				has_situation_flag = situation_rg_gray_mod1_stage_5_booster
+			}
+			modifier = {
+				country_physics_research_produces_mult = -1
+			}
+		}
+		triggered_modifier = {
+			potential = {
+				has_situation_flag = situation_rg_gray_mod1_stage_2_booster
+			}
+			modifier = {
+				country_engineering_research_produces_mult = -1
+			}
+		}
+	}
+	approach = {
+		name = situation_rg_gray_mod1_approach_2
+		icon = GFX_situation_approach_research
+		icon_background = GFX_situation_approach_bg_yellow
+		on_select = {
+			custom_tooltip = situation_rg_gray_mod1_approach_2_tooltip
+			set_situation_locked = yes
+			set_situation_flag = locked
+			event_target:gray_warship = {
+				set_event_locked = no
+			}
+		}
+	}
+	approach = {
+		name = situation_rg_gray_mod1_approach_3
+		icon = GFX_situation_approach_research
+		icon_background = GFX_situation_approach_bg_red
+		on_select = {
+			custom_tooltip = situation_rg_gray_mod1_approach_3_tooltip
+			abort_situation = this
+			event_target:gray_warship = {
+				set_event_locked = no
+			}
+		}
+	}
+	monthly_progress = {
+		base = 0.5
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod1_stage_1_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod1_stage_1_booster
+		}
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod1_stage_2_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod1_stage_2_booster
+		}
+		modifier = {
+			subtract = 0.1
+			desc = situation_rg_gray_mod1_stage_3_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod1_stage_3_booster
+		}
+		modifier = {
+			subtract = 0.1
+			desc = situation_rg_gray_mod1_stage_3_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod1_stage_4_booster
+		}
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod1_stage_5_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod1_stage_5_booster
+		}
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod1_stage_6_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod1_stage_6_booster
+		}
+	}
+	abort_trigger = {
+		OR = {
+			NOT = { exists = event_target:gray_warship }
+			owner = {
+				NOT = {
+					has_country_flag = gray_warship_active
+				}
+			}
+		}
+	}
+	on_abort = {
+		owner = {
+			country_event = {
+				id = rg_event.10
+			}
+		}
+		destroy_situation = this 
+	}	
+}
+
+situation_rg_gray_mod2 = {
+	picture = GFX_evt_planet_beam
+	complete_icon_frame = GFX_situation_outcome_frame_green
+	complete_icon = GFX_situation_outcome_positive
+	on_progress_complete = {
+		custom_tooltip = situation_rg_gray_mod1_finish_tooltip
+		hidden_effect = {
+			owner = {
+				country_event = {
+					id = rg_story.29
+				}
+			}
+		}
+		destroy_situation = this 
+	}
+
+	on_start = {
+		owner = {
+			country_event = {
+				id = rg_event.9
+			}
+		}
+	}
+
+	on_monthly = {
+		events = {
+		}
+	}
+
+	stages = {
+		situation_rg_gray_mod2_stage_1 = {
+			icon = GFX_situation_stage_1
+			icon_background = GFX_situation_stage_frame_green
+			end = 8.4
+			custom_tooltip = situation_rg_gray_mod2_stage_1_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.30
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_2 = {
+			icon = GFX_situation_stage_2
+			icon_background = GFX_situation_stage_frame_green
+			end = 16.8
+			custom_tooltip = situation_rg_gray_mod2_stage_2_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.31
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_3 = {
+			icon = GFX_situation_stage_3
+			icon_background = GFX_situation_stage_frame_green
+			end = 25.2
+			custom_tooltip = situation_rg_gray_mod2_stage_3_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.32
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_4 = {
+			icon = GFX_situation_stage_4
+			icon_background = GFX_situation_stage_frame_green
+			end = 33.6
+			custom_tooltip = situation_rg_gray_mod2_stage_4_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.33
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_5 = {
+			icon = GFX_situation_stage_5
+			icon_background = GFX_situation_stage_frame_green
+			end = 42
+			custom_tooltip = situation_rg_gray_mod2_stage_5_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.34
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_6 = {
+			icon = GFX_situation_stage_6
+			icon_background = GFX_situation_stage_frame_green
+			end = 50.4
+			custom_tooltip = situation_rg_gray_mod2_stage_6_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.35
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_7 = {
+			icon = GFX_situation_stage_1
+			icon_background = GFX_situation_stage_frame_green
+			end = 58.8
+			custom_tooltip = situation_rg_gray_mod2_stage_7_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.36
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_8 = {
+			icon = GFX_situation_stage_2
+			icon_background = GFX_situation_stage_frame_green
+			end = 67.2
+			custom_tooltip = situation_rg_gray_mod2_stage_8_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.37
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_9 = {
+			icon = GFX_situation_stage_3
+			icon_background = GFX_situation_stage_frame_green
+			end = 75.6
+			custom_tooltip = situation_rg_gray_mod2_stage_9_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.38
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_10 = {
+			icon = GFX_situation_stage_4
+			icon_background = GFX_situation_stage_frame_green
+			end = 84
+			custom_tooltip = situation_rg_gray_mod2_stage_10_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.39
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_11 = {
+			icon = GFX_situation_stage_5
+			icon_background = GFX_situation_stage_frame_green
+			end = 92.4
+			custom_tooltip = situation_rg_gray_mod2_stage_11_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.40
+					}
+				}
+			}
+		}
+		situation_rg_gray_mod2_stage_12 = {
+			icon = GFX_situation_stage_6
+			icon_background = GFX_situation_stage_frame_red
+			end = 100
+			custom_tooltip = situation_rg_gray_mod2_stage_12_tooltip
+			on_first_enter = {
+				owner = {
+					country_event = {
+						id = rg_story.41
+					}
+				}
+				event_target:gray_warship = {
+					set_event_locked = no
+				}
+			}
+		}
+	}
+	approach = {
+		name = situation_rg_gray_mod1_approach_1
+		icon = GFX_situation_approach_research
+		icon_background = GFX_situation_approach_bg_green
+		default = yes
+		on_select = {
+			if = {
+				limit = {
+					NOT = {
+						has_situation_flag = rg_stage6_locked
+					}
+					has_situation_flag = locked
+				}
+				set_situation_locked = no
+				remove_situation_flag = locked
+			}
+			event_target:gray_warship = {
+				set_event_locked = yes
+			}
+			custom_tooltip = situation_rg_gray_mod1_approach_1_tooltip
+		}
+		triggered_modifier = {
+			potential = {
+				has_situation_flag = situation_rg_gray_mod1_stage_5_booster
+			}
+			modifier = {
+				country_physics_research_produces_mult = -1
+			}
+		}
+		triggered_modifier = {
+			potential = {
+				has_situation_flag = situation_rg_gray_mod1_stage_2_booster
+			}
+			modifier = {
+				country_engineering_research_produces_mult = -1
+			}
+		}
+	}
+	approach = {
+		name = situation_rg_gray_mod1_approach_2
+		icon = GFX_situation_approach_research
+		icon_background = GFX_situation_approach_bg_yellow
+		on_select = {
+			custom_tooltip = situation_rg_gray_mod1_approach_2_tooltip
+			set_situation_locked = yes
+			set_situation_flag = locked
+			event_target:gray_warship = {
+				set_event_locked = no
+			}
+		}
+	}
+	approach = {
+		name = situation_rg_gray_mod1_approach_3
+		icon = GFX_situation_approach_research
+		icon_background = GFX_situation_approach_bg_red
+		on_select = {
+			custom_tooltip = situation_rg_gray_mod1_approach_3_tooltip
+			abort_situation = this
+			event_target:gray_warship = {
+				set_event_locked = no
+			}
+		}
+	}
+	monthly_progress = {
+		base = 0.5
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod2_stage_1_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_1_booster
+		}
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_2_booster
+		}
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod2_stage_1_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_4_booster
+		}
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod2_stage_3_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_5_booster
+		}
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod2_stage_3_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_6_booster
+		}
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_7_booster
+		}
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_8_booster
+		}
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod2_stage_3_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_9_booster
+		}
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_10_booster
+		}
+		modifier = {
+			add = 0.1
+			desc = situation_rg_gray_mod2_stage_2_booster_tooltip
+			has_situation_flag = situation_rg_gray_mod2_stage_11_booster
+		}
+	}
+	abort_trigger = {
+
+	}
+	on_abort = {
+		owner = {
+			country_event = {
+				id = rg_event.10
+			}
+		}
+		destroy_situation = this 
+	}	
+}

common/solar_system_initializers/RG_fallen_empire_initializers.txt

@@ -0,0 +1,907 @@
+# Home System - Machine
+
+rg_fallen_machine = {
+	usage = fallen_empire_init
+	name = 芬里尔III
+	class = "rl_standard_stars"
+
+	flags = {
+		lcluster
+		lcluster4
+		ring_world_built
+	}
+
+	planet = {
+		class = star
+		orbit_distance = 0
+		orbit_angle = 0
+	}
+
+	change_orbit = 45
+
+	planet = {
+		class = "pc_ringworld_tech"
+		name = 外环
+		orbit_angle = -30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_seam"
+		name = 泡芙碗
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_habitable"
+		name = 菠萝包工厂
+		orbit_angle = 30
+		orbit_distance = 0
+		deposit_blockers = none
+		modifiers = none
+
+		init_effect = {
+
+			create_cluster = {
+				id = fe_mach_cluster
+				radius = 80
+				center = this.solar_system
+			}
+
+			rg_create_fallen_empire_species_effect = yes
+			rg_create_fallen_empire_country_effect = yes
+
+			set_planet_flag = fallen_empire_world
+			prevent_anomaly = yes
+			set_owner = event_target:rg_scion_fe
+			set_controller = event_target:rg_scion_fe
+			set_capital = yes
+
+			add_building = building_ancient_control_center
+			add_building = building_nourishment_center
+			add_building = building_nourishment_center
+			add_building = building_nourishment_center
+			add_building = building_nourishment_center
+			add_building = building_ancient_palace
+			add_building = building_affluence_center
+			add_building = building_affluence_center
+			add_building = building_affluence_center
+			add_building = building_affluence_center
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+
+			while = {
+				count = 5
+				add_district = district_rw_science
+			}
+			while = {
+				count = 5
+				add_district = district_rw_nexus
+			}
+			while = {
+				count = 105
+				create_pop = {
+					species = owner_main_species
+				}
+			}
+
+			while = {
+				count = 94
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
+			}
+
+			rg_create_fallen_empire_starting_navy = yes
+
+			while = {
+				count = 40
+				create_army = {
+					name = random
+					owner = event_target:rg_scion_fe
+					type = "gray_army"
+				}
+			}
+		}
+	}
+
+	init_effect = {
+		spawn_megastructure = {
+			type = "ring_world_ruined"
+			orbit_angle = -90
+			orbit_distance = 45
+		}
+		# rg_create_fe_citadel = yes
+	}
+
+	planet = {
+		class = "pc_ringworld_tech"
+		name = 中环
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_seam"
+		name = 烤面包机
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_habitable"
+		name = 可颂工厂
+		orbit_angle = 30
+		orbit_distance = 0
+		deposit_blockers = none
+		modifiers = none
+
+		init_effect = {
+
+			set_planet_flag = fallen_empire_world
+			prevent_anomaly = yes
+			set_owner = event_target:rg_scion_fe
+
+			add_building = building_ancient_control_center
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+
+			while = {
+				count = 5
+				add_district = district_rw_nexus
+			}
+			while = {
+				count = 50
+				create_pop = {
+					species = owner_main_species
+				}
+			}
+			while = {
+				count = 20
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
+			}
+			while = {
+				count = 20
+				create_army = {
+					name = random
+					owner = event_target:rg_scion_fe
+					type = "gray_army"
+				}
+			}
+		}
+	}
+
+	planet = {
+		class = "pc_ringworld_tech"
+		name = 内环
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_seam"
+		name = 奶油核心
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_habitable"
+		name = 糖霜工厂
+		orbit_angle = 30
+		orbit_distance = 0
+		deposit_blockers = none
+		modifiers = none
+
+		init_effect = {
+			set_planet_flag = fallen_empire_world
+			prevent_anomaly = yes
+			set_owner = event_target:rg_scion_fe
+
+			add_building = building_ancient_control_center
+			add_building = building_class_4_singularity
+			add_building = building_class_4_singularity
+			add_building = building_class_4_singularity
+			add_building = building_class_4_singularity
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+
+			while = {
+				count = 5
+				add_district = district_rw_generator
+			}
+			while = {
+				count = 22
+				create_pop = {
+					species = owner_main_species
+				}
+			}
+			while = {
+				count = 10
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
+			}
+			while = {
+				count = 10
+				create_army = {
+					name = random
+					owner = event_target:rg_scion_fe
+					type = "gray_army"
+				}
+			}
+		}
+	}
+
+	# spawn_megastructure = {
+	# 	type = lgate_base
+	# 	orbit_angle = 225
+	# 	orbit_distance = 30
+	# }
+}
+
+
+rg_fallen_machine_1 = {
+	usage = fallen_empire_init
+	name = 芬里尔III
+	class = "rl_standard_stars"
+
+	flags = {
+		ring_world_built
+	}
+
+	planet = {
+		class = star
+		orbit_distance = 0
+		orbit_angle = 0
+	}
+
+	change_orbit = 45
+
+	planet = {
+		class = "pc_ringworld_tech"
+		name = 外环
+		orbit_angle = -30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_seam"
+		name = 泡芙碗
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_habitable"
+		name = 菠萝包工厂
+		orbit_angle = 30
+		orbit_distance = 0
+		deposit_blockers = none
+		modifiers = none
+
+		init_effect = {
+
+			create_cluster = {
+				id = fe_mach_cluster
+				radius = 80
+				center = this.solar_system
+			}
+
+			rg_create_fallen_empire_species_effect = yes
+			rg_create_fallen_empire_country_effect = yes
+
+			set_planet_flag = fallen_empire_world
+			prevent_anomaly = yes
+			set_owner = event_target:rg_scion_fe
+			set_controller = event_target:rg_scion_fe
+			set_capital = yes
+
+			add_building = building_ancient_control_center
+			add_building = building_nourishment_center
+			add_building = building_nourishment_center
+			add_building = building_nourishment_center
+			add_building = building_nourishment_center
+			add_building = building_ancient_palace
+			add_building = building_affluence_center
+			add_building = building_affluence_center
+			add_building = building_affluence_center
+			add_building = building_affluence_center
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+
+			while = {
+				count = 5
+				add_district = district_rw_science
+			}
+			while = {
+				count = 5
+				add_district = district_rw_nexus
+			}
+			while = {
+				count = 105
+				create_pop = {
+					species = owner_main_species
+				}
+			}
+
+			while = {
+				count = 94
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
+			}
+
+			rg_create_fallen_empire_starting_navy = yes
+
+			while = {
+				count = 40
+				create_army = {
+					name = random
+					owner = event_target:rg_scion_fe
+					type = "gray_army"
+				}
+			}
+		}
+	}
+
+	init_effect = {
+		spawn_megastructure = {
+			type = "ring_world_ruined"
+			orbit_angle = -90
+			orbit_distance = 45
+		}
+		# rg_create_fe_citadel = yes
+		set_star_flag = lgate
+		spawn_megastructure = {
+			type = lgate_base
+			orbit_angle = 225
+			orbit_distance = 30
+		}
+	
+		rg_create_fe_citadel = yes
+	}
+
+	planet = {
+		class = "pc_ringworld_tech"
+		name = 中环
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_seam"
+		name = 烤面包机
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_habitable"
+		name = 可颂工厂
+		orbit_angle = 30
+		orbit_distance = 0
+		deposit_blockers = none
+		modifiers = none
+
+		init_effect = {
+
+			set_planet_flag = fallen_empire_world
+			prevent_anomaly = yes
+			set_owner = event_target:rg_scion_fe
+
+			add_building = building_ancient_control_center
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+			add_building = building_dimensional_fabricator
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+
+			while = {
+				count = 5
+				add_district = district_rw_nexus
+			}
+			while = {
+				count = 50
+				create_pop = {
+					species = owner_main_species
+				}
+			}
+			while = {
+				count = 20
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
+			}
+			while = {
+				count = 20
+				create_army = {
+					name = random
+					owner = event_target:rg_scion_fe
+					type = "gray_army"
+				}
+			}
+		}
+	}
+
+	planet = {
+		class = "pc_ringworld_tech"
+		name = 内环
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_seam"
+		name = 奶油核心
+		orbit_angle = 30
+		orbit_distance = 0
+	}
+
+	planet = {
+		class = "pc_ringworld_habitable"
+		name = 糖霜工厂
+		orbit_angle = 30
+		orbit_distance = 0
+		deposit_blockers = none
+		modifiers = none
+
+		init_effect = {
+			set_planet_flag = fallen_empire_world
+			prevent_anomaly = yes
+			set_owner = event_target:rg_scion_fe
+
+			add_building = building_ancient_control_center
+			add_building = building_class_4_singularity
+			add_building = building_class_4_singularity
+			add_building = building_class_4_singularity
+			add_building = building_class_4_singularity
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+			add_building = building_nano_forge
+
+			while = {
+				count = 5
+				add_district = district_rw_generator
+			}
+			while = {
+				count = 22
+				create_pop = {
+					species = owner_main_species
+				}
+			}
+			while = {
+				count = 10
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
+			}
+			while = {
+				count = 10
+				create_army = {
+					name = random
+					owner = event_target:rg_scion_fe
+					type = "gray_army"
+				}
+			}
+		}
+	}
+
+	init_effect = {
+		spawn_system = {
+			min_distance >= 10
+			max_distance <= 50
+			initializer = rg_fallen_machine_01b
+		}
+	}
+
+}
+
+# EXTRAS
+rg_fallen_machine_01b = {
+	class = "rl_trinary_stars"
+
+	asteroid_belt = {
+		type = rocky_asteroid_belt
+		radius = 140
+	}
+	init_effect = {
+		rg_create_fe_citadel = yes
+	}
+
+	planet = {
+		count = 1
+		class = star
+		orbit_distance = 25
+		orbit_angle = 0
+		size = {
+			min = 20
+			max = 30
+		}
+		has_ring = no
+	}
+	planet = {
+		count = 1
+		class = star
+		orbit_distance = {
+			min = 0
+			max = 20
+		}
+		orbit_angle = 120
+		size = {
+			min = 25
+			max = 30
+		}
+		has_ring = no
+	}
+	planet = {
+		count = 1
+		class = star
+		orbit_distance = {
+			min = 0
+			max = 20
+		}
+		orbit_angle = 120
+		size = {
+			min = 25
+			max = 30
+		}
+		has_ring = no
+	}
+	change_orbit = 92
+	planet = {
+		count = {
+			min = 3
+			max = 6
+		}
+		class = pc_asteroid
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		count = 1
+		class = pc_asteroid
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+		init_effect = {
+			set_deposit = d_rare_crystals_2
+		}
+	}
+	change_orbit = -60
+	planet = {
+		class = pc_gray_goo
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_broken
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	change_orbit = 80
+	planet = {
+		class = pc_shattered
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_shattered
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+
+	init_effect = {
+		spawn_system = {
+			min_distance >= 10
+			max_distance <= 50
+			initializer = rg_fallen_machine_02b
+		}
+
+		add_hyperlane = {
+			from = this
+			to = prev
+		}
+	}
+
+	
+}
+
+rg_fallen_machine_02b = {
+	class = "rl_standard_stars"
+
+	asteroid_belt = {
+		type = rocky_asteroid_belt
+		radius = 135
+	}
+
+	init_effect = {
+		rg_create_fe_citadel = yes
+	}
+
+	planet = {
+		count = 1
+		class = star
+		orbit_distance = 0
+		orbit_angle = 0
+		size = {
+			min = 30
+			max = 35
+		}
+		has_ring = no
+	}
+	change_orbit = 135
+	planet = {
+		count = {
+			min = 3
+			max = 6
+		}
+		class = pc_asteroid
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	change_orbit = -80
+	planet = {
+		class = pc_gray_goo
+		orbit_distance = 30
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	change_orbit = 90
+	planet = {
+		class = pc_shattered
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_broken
+		orbit_distance = 30
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+
+	init_effect = {
+		spawn_system = {
+			min_distance >= 10
+			max_distance <= 50
+			initializer = rg_fallen_machine_03b
+		}
+
+		add_hyperlane = {
+			from = this
+			to = prev
+		}
+	}
+}
+
+rg_fallen_machine_03b = {
+	class = "rl_standard_stars"
+
+	asteroid_belt = {
+		type = rocky_asteroid_belt
+		radius = 120
+	}
+
+	init_effect = {
+		rg_create_fe_citadel = yes
+	}
+
+	planet = {
+		count = 1
+		class = star
+		orbit_distance = 0
+		orbit_angle = 1
+		size = {
+			min = 20
+			max = 30
+		}
+		has_ring = no
+	}
+	change_orbit = 120
+	planet = {
+		count = {
+			min = 3
+			max = 5
+		}
+		class = pc_asteroid
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		count = 1
+		class = pc_asteroid
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+		init_effect = {
+			set_deposit = d_volatile_motes_2
+		}
+	}
+	change_orbit = -70
+	planet = {
+		class = pc_shattered
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_broken
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	change_orbit = 70
+	planet = {
+		class = pc_gray_goo
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_gas_giant
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_gray_goo
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+
+	init_effect = {
+		spawn_system = {
+			min_distance >= 10
+			max_distance <= 50
+			initializer = rg_fallen_machine_04b
+		}
+
+		add_hyperlane = {
+			from = this
+			to = prev
+		}
+	}
+}
+
+rg_fallen_machine_04b = {
+	class = "rl_standard_stars"
+
+	init_effect = {
+		rg_create_fe_citadel = yes
+	}
+
+	planet = {
+		count = 1
+		class = star
+		orbit_distance = 0
+		orbit_angle = 1
+		size = {
+			min = 20
+			max = 30
+		}
+		has_ring = no
+	}
+	change_orbit = 50
+	planet = {
+		class = pc_broken
+		orbit_distance = 0
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_shattered
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_shattered
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_gray_goo
+		orbit_distance = 30
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+	}
+	planet = {
+		class = pc_barren_cold
+		orbit_distance = 25
+		orbit_angle = {
+			min = 90
+			max = 270
+		}
+		change_orbit = @base_moon_distance
+		moon = {
+			class = "pc_frozen"
+			orbit_angle = {
+				min = 90
+				max = 270
+			}
+		}
+	}
+
+	init_effect = {
+		add_hyperlane = {
+			from = this
+			to = prev
+		}
+	}
+}
+

common/solar_system_initializers/RG_initializers.txt

@@ -498,7 +498,6 @@ rg_cluster_init_04 = {
 		flags = {
 			start_rg_cluster_gatebuilders
 			ignore_startup_effect
-			rw_spec_empire
 		}
 		init_effect = {
 			prevent_anomaly = yes

common/special_projects/!_RG_projects_distant_stars.txt

@@ -22,6 +22,7 @@ special_project = {
 						has_global_flag = l_cluster_origin						# l-cluster plus
 						has_global_flag = rg_origin_l_cluster						# 遥远约定
 						has_global_flag = gray_origin_activate						# 远星之歌
+						has_global_flag = rg_origin_scion_l_cluster					# 未来追迹
 					}
 				}
 				country_event = {
@@ -62,7 +63,7 @@ special_project = {
 	event_scope = ship_event
 	requirements = {
 		shipclass_military = 1
-		leader = admiral
+		leader = commander
 		has_trait = RG_leader_trait_admiral_gray
 	}
 	on_start = {
@@ -117,7 +118,7 @@ special_project = {
 		}
 	}
 	on_success = {
-		fleet = {
+		event_target:gray_warship = {
 			set_event_locked = no
 		}
 		owner = {
@@ -138,7 +139,7 @@ special_project = {
 	event_scope = ship_event
 	requirements = {
 		shipclass_military = 1
-		leader = admiral
+		leader = commander
 		has_trait = RG_leader_trait_admiral_gray
 	}
 	on_start = {

common/special_projects/RG_story_special_projects.txt

@@ -35,3 +35,84 @@ special_project = {
 		}
 	}
 }
+
+special_project = {
+	key = "rg_gray_mod2_stage1_project"
+	cost = 2000
+	#days_to_research = 300
+	tech_department = physics_research
+	icon = "gfx/interface/icons/situation_log/situation_log_main_quest.dds"
+	picture = GFX_evt_l-gateway
+	event_scope = country_event
+	requirements = {
+	}
+	on_start = {
+		owner = {
+			random_situation = {
+				limit = {
+					is_situation_type = situation_rg_gray_mod2
+				}
+				set_situation_locked = yes
+				set_situation_flag = locked
+				set_situation_flag = rg_stage6_locked
+			}
+		}
+	}
+	on_cancel = {
+		owner = {
+		}
+	}
+	on_success = {
+		owner = {
+			random_situation = {
+				limit = {
+					is_situation_type = situation_rg_gray_mod2
+				}
+				set_situation_flag = situation_rg_gray_mod2_stage_1_booster
+				remove_situation_flag = rg_stage6_locked
+				set_situation_locked = no
+				remove_situation_flag = locked
+			}
+		}
+	}
+}
+special_project = {
+	key = "rg_gray_mod2_stage4_project"
+	cost = 2000
+	#days_to_research = 300
+	tech_department = engineering_research
+	icon = "gfx/interface/icons/situation_log/situation_log_main_quest.dds"
+	picture = GFX_evt_l-gateway
+	event_scope = country_event
+	requirements = {
+	}
+	on_start = {
+		owner = {
+			random_situation = {
+				limit = {
+					is_situation_type = situation_rg_gray_mod2
+				}
+				set_situation_locked = yes
+				set_situation_flag = locked
+				set_situation_flag = rg_stage6_locked
+			}
+		}
+	}
+	on_cancel = {
+		owner = {
+		}
+	}
+	on_success = {
+		owner = {
+			random_situation = {
+				limit = {
+					is_situation_type = situation_rg_gray_mod2
+				}
+				set_situation_flag = situation_rg_gray_mod2_stage_4_booster
+				remove_situation_flag = rg_stage6_locked
+				set_situation_locked = no
+				remove_situation_flag = locked
+			}
+		}
+	}
+}

common/species_archetypes/RG_species_archetypes.txt

@@ -0,0 +1,21 @@
+# species_trait_points: base number of species trait points available for this species class
+# species_max_traits: maximum number of traits that species of this class can have (doesn't count those with cost == 0)
+
+#EXAMPLE OF MODDED SPECIES ARCHETYPE
+#Will be able to use traits valid for BIOLOGICAL, ROBOT and BIOLOGICAL2
+#Has the exact same trait points as BIOLOGICAL
+#BIOLOGICAL2 = {
+#	inherit_trait_points_from = BIOLOGICAL
+#	inherit_traits_from = { BIOLOGICAL ROBOT }
+
+#	robotic: is this archetype's species robotic? Governs various things:
+#		- does the species count as robotic (for is_robotic = yes, and various hardcoded checks)
+#		- notably can the species grow, or is just assembled?
+#	uses_modifiers: should modifiers be generated for this archetype at all?
+#}
+
+RG_MACHINE = {
+	species_trait_points = 10
+	species_max_traits = 6
+	robotic = yes
+}

common/species_classes/rg_species_classes.txt

@@ -0,0 +1,57 @@
+
+# The Portraits defined here are generally not available to the character creator, but will instead appear in AI empires across the galaxy.
+# 'graphical_culture' is connected to the looks used for ships and cities; see "common/graphical_culture/".
+# These may be overwitten in an "extendable" manner, meaning (for example) you can create a second "HUM" with extra portraits in it.
+
+# playable = yes/no/trigger (default: yes)		if this species class can is playable
+# randomized = yes/no/trigger (default: yes)	if this species class is randomized
+# custom_portraits = {}
+#	randomized = yes/no/trigger (default: yes)	to specify if portraits are randomized
+#	playable = yes/no/trigger (default: yes)	to specify if portraits are playable
+#	portraits = list portrait keys
+# species_trait_points							base number of species trait points available for this species class
+# species_max_traits							maximum number of traits that species of this class can have (doesn't count those with cost == 0)
+# possible										ethics/government requirements; see common/governments/readme_requirements.txt
+# gender = yes/no (default: yes)				whether the species has a gender
+# portrait_modding yes/no (default: yes)		whether the portrait can be modified with e.g. genemodding or robomodding
+GRAY_SPECIES = {
+	archetype = OTHER
+
+	playable = { always = no }
+	randomized = no
+
+	gender = female
+
+	portraits = {
+		"Gray"
+	}
+
+	move_pop_sound_effect = "moving_pop_confirmation"
+}
+
+RG_MACHINE = {
+	archetype = MACHINE
+
+	playable = no
+	randomized = no
+	# possible = { always = yes }
+	# possible_secondary = { always = no text = SECONDARY_SPECIES_CLASS_INVALID }
+
+	gender = no
+	use_climate_preference = no
+	portrait_modding = yes
+
+	leader_age_min = 2
+	leader_age_max = 10
+
+	custom_portraits = { # use custom_portraits instead of portraits so we can put them after the custom_portraits above
+		portraits = {
+			"rg_machine_maid"
+		}
+	}
+
+	graphical_culture = mammalian_01
+	move_pop_sound_effect = "robot_pops_move"
+
+	resources = {}
+}

common/static_modifiers/RG_static_modifiers.txt

@@ -47,3 +47,77 @@ gray_affection_warship_lv5 = {
 	ship_ftl_jumpdrive_range_mult = 0.5
 	force_disparity_fire_rate_mult = 3
 }
+
+skill_rg_nanite_leader_navy = {
+	ship_weapon_range_mult = 0.05
+	ship_hull_mult = 0.05
+	ship_fire_rate_mult = 0.1
+}
+
+skill_rg_nanite_leader_army = {
+	army_damage_mult = 0.1
+	army_morale_damage_mult = 0.1
+	army_health = 0.1
+	army_morale = 0.1
+}
+
+skill_rg_nanite_leader = {
+	custom_tooltip = skill_official_delegate_tt
+	science_ship_survey_speed = 0.10
+	ship_archaeological_site_clues_add = 1
+	ship_astral_rift_clues_add = 1
+}
+
+skill_rg_nanite_leader_planet_governor = {
+	custom_tooltip = skill_official_planet_governor_tt
+	planet_jobs_energy_produces_mult = @planet_job_mult
+	planet_jobs_minerals_produces_mult = @planet_job_mult
+	planet_jobs_food_produces_mult = @planet_job_mult
+	planet_jobs_alloys_produces_mult = @planet_job_mult
+	planet_jobs_consumer_goods_produces_mult = @planet_job_mult
+	planet_jobs_exotic_gases_produces_mult = @planet_job_mult
+	planet_jobs_rare_crystals_produces_mult = @planet_job_mult
+	planet_jobs_volatile_motes_produces_mult = @planet_job_mult
+
+	# planet_jobs_ruler_produces_mult = @negative_planet_job_mult
+	# planet_jobs_specialist_produces_mult = @negative_planet_job_mult
+	planet_jobs_worker_produces_mult = @planet_job_mult
+	planet_jobs_slave_produces_mult = @planet_job_mult
+	job_soldier_or_warrior_add = 1
+	planet_crime_add = -1
+
+	planet_jobs_physics_research_produces_mult = @planet_job_mult
+	planet_jobs_society_research_produces_mult = @planet_job_mult
+	planet_jobs_engineering_research_produces_mult = @planet_job_mult
+	species_empire_size_mult = @planet_empire_size
+}
+
+skill_rg_nanite_leader_sector_governor = {
+	custom_tooltip = skill_official_sector_governor_tt
+	planet_jobs_energy_produces_mult = @sector_job_mult
+	planet_jobs_minerals_produces_mult = @sector_job_mult
+	planet_jobs_food_produces_mult = @sector_job_mult
+	planet_jobs_alloys_produces_mult = @sector_job_mult
+	planet_jobs_consumer_goods_produces_mult = @sector_job_mult
+	planet_jobs_exotic_gases_produces_mult = @sector_job_mult
+	planet_jobs_rare_crystals_produces_mult = @sector_job_mult
+	planet_jobs_volatile_motes_produces_mult = @sector_job_mult
+
+	# planet_jobs_ruler_produces_mult = @negative_sector_job_mult
+	# planet_jobs_specialist_produces_mult = @negative_sector_job_mult
+	planet_jobs_worker_produces_mult = @sector_job_mult
+	planet_jobs_slave_produces_mult = @sector_job_mult
+	job_soldier_or_warrior_add = 0.5
+	planet_crime_add = -0.5
+
+	planet_jobs_physics_research_produces_mult = @sector_job_mult
+	planet_jobs_society_research_produces_mult = @sector_job_mult
+	planet_jobs_engineering_research_produces_mult = @sector_job_mult
+	species_empire_size_mult = @sector_empire_size
+}
+
+skill_rg_nanite_leader_background_planet_governor = {
+	planet_amenities_add = 2
+	planet_stability_add = 0.5
+	planet_jobs_upkeep_mult = -0.01
+}

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"
@@ -188,6 +299,35 @@ tech_gray_army_7 = {
 	}
 }
 
+tech_gray_juggernaut_8 = {
+	area = engineering
+	cost = 5000
+	tier = 5
+	is_rare = yes
+	category = {
+		voidcraft
+	}
+	ai_update_type = military
+	weight = @tier2weight3
+	is_reverse_engineerable = no
+	prerequisites = {
+		"tech_gray_matter_remix_2"
+		"tech_juggernaut"
+		"tech_mega_engineering"
+	}
+	ai_weight = {
+		factor = 0		#weapons are good
+		modifier = {
+			factor = 1.25
+			has_ethic = ethic_militarist
+		}
+		modifier = {
+			factor = 1.5
+			has_ethic = ethic_fanatic_militarist
+		}
+	}
+}
+
 tech_gray_repair_system_1 = {
 	area = engineering
 	cost = 5000
@@ -229,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
@@ -261,6 +385,23 @@ tech_object_gray_6 = {
 	}
 }
 
+
+tech_gray_machine = {
+	area = society
+	cost = 2000
+	tier = 5
+	is_rare = yes
+	category = {
+		biology
+	}
+	weight = 0
+	## unlock 
+	ai_weight = {
+		factor = 0
+	}
+}
+
+
 tech_gray_noway = {
 	cost = 2000
 	area = physics

common/traits/!_RG_gray_goo_traits.txt

@@ -1,34 +1,152 @@
 ###################
 # Governor Traits #
 ###################
+# leader_trait_governor_gray = {
+# 	cost = 0
+# 	inline_script = {
+# 		script = trait/icon_psionic
+# 		CLASS = official
+# 		ICON = "GFX_leader_trait_psionic_chosen_one"
+# 		RARITY = paragon
+# 		COUNCIL = no
+# 		TIER = none
+# 	}
+# 	immortal_leaders = yes
+# 	planet_modifier = {
+# 		planet_buildings_cost_mult = -0.4
+# 		planet_building_build_speed_mult = 0.4
+# 		planet_jobs_energy_produces_mult = 0.15
+# 		planet_jobs_minerals_produces_mult = 0.15
+# 		deposit_blockers_cost_mult = -0.4
+# 		planet_clear_blocker_speed_mult = 0.4
+# 	}
+# 	sector_modifier = {
+# 		planet_buildings_cost_mult = -0.2
+# 		planet_building_build_speed_mult = 0.2
+# 		planet_jobs_energy_produces_mult = 0.075
+# 		planet_jobs_minerals_produces_mult = 0.075
+# 		deposit_blockers_cost_mult = -0.2
+# 		planet_clear_blocker_speed_mult = 0.2
+# 	}
+# 	leader_class = { official }
+# 	initial = no
+# 	randomized = no
+# }
+
+# RG_leader_trait_offical_gray = {
+# 	#唯一特质
+# 	cost = 0
+# 	inline_script = {
+# 		script = trait/icon_psionic
+# 		CLASS = leader
+# 		ICON = "GFX_leader_trait_psionic_chosen_one"
+# 		RARITY = paragon
+# 		COUNCIL = no
+# 		TIER = none
+# 	}
+# 	immortal_leaders = yes
+# 		triggered_self_modifier = {
+# 		potential = {
+# 			always = yes
+# 		}
+# 		leader_skill_levels = 1
+# 		mult = trigger:has_skill
+# 	}
+# 	self_modifier = {
+# 		species_leader_exp_gain = 1
+# 	}
+# 	councilor_modifier = {
+# 		all_technology_research_speed = 0.5
+# 	}
+# 	planet_modifier = {
+# 		planet_buildings_cost_mult = -0.4
+# 		planet_building_build_speed_mult = 0.6
+# 		planet_jobs_alloys_produces_mult = 0.25
+# 		planet_jobs_engineering_research_produces_mult = 0.25
+# 		deposit_blockers_cost_mult = -0.4
+# 		planet_clear_blocker_time_mult = -0.6
+# 	}
+# 	sector_modifier = {
+# 		planet_buildings_cost_mult = -0.2
+# 		planet_building_build_speed_mult = 0.2
+# 		planet_jobs_alloys_produces_mult = 0.1
+# 		planet_jobs_engineering_research_produces_mult = 0.1
+# 		deposit_blockers_cost_mult = -0.2
+# 		planet_clear_blocker_time_mult = -0.2
+# 		starbase_shipyard_build_cost_mult = -0.25
+# 		starbase_shipyard_build_speed_mult = -0.3
+# 	}
+# 	fleet_modifier = {
+# 		ship_armor_mult = 3.5
+# 		ship_hull_mult = 3.5
+# 		ships_upkeep_mult = -0.4
+# 		ship_hull_regen_add_perc = 5
+# 		ship_armor_regen_add_perc = 5
+# 	}
+# 	army_modifier = {
+# 		army_collateral_damage_mult = 0.15
+# 		army_disengage_chance_mult = 0.5
+# 		army_health = 0.35
+# 	}
+# 	modifier = {
+# 		ship_archaeological_site_excavation_speed_mult = 0.5
+# 		science_ship_survey_speed = 1
+# 		# ship_windup_mult = -1
+# 		# ship_speed_mult = 0.5
+# 		ship_anomaly_generation_chance_mult = -1
+# 	}
+# 	triggered_modifier = {
+# 		potential = {
+# 			has_astral_planes_dlc = yes
+# 		}
+# 		country_astral_rift_speed_mult = 0.5
+# 	}
+# 	leader_class = { rg_nanite_leader }
+# 	initial = no
+# 	randomized = no
+# }
+
 RG_leader_trait_governor_gray = {
 	#总督特质
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = governor
+		CLASS = official
 		ICON = "GFX_leader_trait_psionic_chosen_one"
 		RARITY = paragon
 		COUNCIL = no
 		TIER = none
 	}
 	immortal_leaders = yes
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
-	modifier = {
+	planet_modifier = {
 		planet_buildings_cost_mult = -0.4
-		planet_building_build_speed_mult = 0.8
-		deposit_blockers_cost_mult = -0.4
-		planet_clear_blocker_time_mult = -0.8
+		planet_building_build_speed_mult = 0.6
 		planet_jobs_alloys_produces_mult = 0.25
 		planet_jobs_engineering_research_produces_mult = 0.25
+		deposit_blockers_cost_mult = -0.4
+		planet_clear_blocker_time_mult = -0.6
+	}
+	sector_modifier = {
+		planet_buildings_cost_mult = -0.2
+		planet_building_build_speed_mult = 0.2
+		planet_jobs_alloys_produces_mult = 0.1
+		planet_jobs_engineering_research_produces_mult = 0.1
+		deposit_blockers_cost_mult = -0.2
+		planet_clear_blocker_time_mult = -0.2
 		starbase_shipyard_build_cost_mult = -0.25
 		starbase_shipyard_build_speed_mult = -0.3
 	}
-	leader_class = {
-		governor
-	}
+	leader_class = { official }
 	initial = no
 	randomized = no
 }
@@ -38,13 +156,13 @@ RG_leader_trait_ruler_gray = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = governor
+		CLASS = leader
 		ICON = "GFX_leader_trait_legendary_spiritualist_two"
 		RARITY = paragon
 		COUNCIL = yes
 		TIER = none
 	}
-	councilor_trait = yes
+	# forced_councilor_trait = yes
 	triggered_self_modifier = {
 		potential = {
 			is_councilor = yes
@@ -55,9 +173,9 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		leader_skill_levels = 1
-		leaders_upkeep_mult = 2
-		mult = owner.rg_gray_level
+		# leader_skill_levels = 1
+		leaders_upkeep_mult = 0.1
+		mult = trigger:has_skill
 	}
 	triggered_self_modifier = {
 		potential = {
@@ -73,9 +191,9 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		leader_skill_levels = 1
-		leaders_upkeep_mult = 3
-		mult = owner.rg_gray_level
+		# leader_skill_levels = 1
+		leaders_upkeep_mult = 0.15
+		mult = trigger:has_skill
 	}
 	triggered_self_modifier = {
 		potential = {
@@ -87,13 +205,13 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		leader_skill_levels = 1
-		leaders_upkeep_mult = 4
-		mult = owner.rg_gray_level
+		# leader_skill_levels = 1
+		leaders_upkeep_mult = 0.2
+		mult = trigger:has_skill
 	}
-	triggered_modifier = {
+	triggered_councilor_modifier = {
 		potential = {
-			is_councilor = yes
+			# is_councilor = yes
 			owner = {
 				check_variable = {
 					which = rg_gray_level
@@ -101,43 +219,43 @@ RG_leader_trait_ruler_gray = {
 				}
 			}
 		}
-		country_energy_produces_mult = -0.02
+		# country_energy_produces_mult = -0.02
+		planet_stability_add = -1
+		mult = trigger:has_skill
+	}
+	triggered_councilor_modifier = {
+		potential = {
+			# is_councilor = yes
+			owner = {
+				check_variable = {
+					which = rg_gray_level
+					value >= 5
+				}
+				check_variable = {
+					which = rg_gray_level
+					value <= 10
+				}
+			}
+		}
+		# country_energy_produces_mult = -0.03
+		planet_stability_add = -1.5
+		mult = trigger:has_skill
+	}
+	triggered_councilor_modifier = {
+		potential = {
+			# is_councilor = yes
+			owner = {
+				check_variable = {
+					which = rg_gray_level
+					value > 10
+				}
+			}
+		}
+		# country_energy_produces_mult = -0.04
 		planet_stability_add = -2
-		mult = owner.rg_gray_level
+		mult = trigger:has_skill
 	}
-	triggered_modifier = {
-		potential = {
-			is_councilor = yes
-			owner = {
-				check_variable = {
-					which = rg_gray_level
-					value >= 5
-				}
-				check_variable = {
-					which = rg_gray_level
-					value <= 10
-				}
-			}
-		}
-		country_energy_produces_mult = -0.03
-		planet_stability_add = -3.5
-		mult = owner.rg_gray_level
-	}
-	triggered_modifier = {
-		potential = {
-			is_councilor = yes
-			owner = {
-				check_variable = {
-					which = rg_gray_level
-					value > 10
-				}
-			}
-		}
-		country_energy_produces_mult = -0.04
-		planet_stability_add = -5
-		mult = owner.rg_gray_level
-	}
-	triggered_modifier = {
+	triggered_councilor_modifier = {
 		potential = {
 			always = yes
 		}
@@ -150,11 +268,9 @@ RG_leader_trait_ruler_gray = {
 		megastructure_build_speed_mult = 0.1
 		country_unity_produces_mult = 0.05
 		country_base_influence_produces_add = 1
-		mult = owner.rg_gray_level
-	}
-	leader_class = {
-		governor
+		mult = trigger:has_skill
 	}
+	leader_class = { official }
 	initial = no
 	randomized = no
 }
@@ -164,26 +280,36 @@ RG_leader_trait_admiral_gray_1 = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = commander
 		ICON = "GFX_leader_trait_psionic_chosen_one"
 		RARITY = paragon
 		COUNCIL = no
 		TIER = none
 	}
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
 	immortal_leaders = yes
-	modifier = {
+	fleet_modifier = {
 		ship_armor_mult = 1
 		ship_hull_mult = 1
 		ships_upkeep_mult = -0.4
 		ship_hull_regen_add_perc = 1
 		ship_armor_regen_add_perc = 1
 	}
-	leader_class = {
-		admiral
+	army_modifier = {
+		army_collateral_damage_mult = 0.05
+		army_disengage_chance_mult = 0.3
+		army_health = 0.15
 	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -193,26 +319,36 @@ RG_leader_trait_admiral_gray_2 = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = commander
 		ICON = "GFX_leader_trait_psionic_chosen_one"
 		RARITY = paragon
 		COUNCIL = no
 		TIER = none
 	}
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
 	immortal_leaders = yes
-	modifier = {
+	fleet_modifier = {
 		ship_armor_mult = 2
 		ship_hull_mult = 2
 		ships_upkeep_mult = -0.4
 		ship_hull_regen_add_perc = 2
 		ship_armor_regen_add_perc = 2
 	}
-	leader_class = {
-		admiral
+	army_modifier = {
+		army_collateral_damage_mult = 0.1
+		army_disengage_chance_mult = 0.4
+		army_health = 0.25
 	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -222,26 +358,67 @@ RG_leader_trait_admiral_gray = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = commander
 		ICON = "GFX_leader_trait_psionic_chosen_one"
 		RARITY = paragon
 		COUNCIL = no
 		TIER = none
 	}
+	triggered_self_modifier = {
+		potential = {
+			always = yes
+		}
+		leader_skill_levels = 1
+		mult = trigger:has_skill
+	}
 	self_modifier = {
 		species_leader_exp_gain = 1
 	}
 	immortal_leaders = yes
-	modifier = {
+	fleet_modifier = {
 		ship_armor_mult = 3.5
 		ship_hull_mult = 3.5
 		ships_upkeep_mult = -0.4
 		ship_hull_regen_add_perc = 5
 		ship_armor_regen_add_perc = 5
 	}
-	leader_class = {
-		admiral
+	army_modifier = {
+		army_collateral_damage_mult = 0.15
+		army_disengage_chance_mult = 0.5
+		army_health = 0.35
 	}
+	leader_class = { commander }
+	initial = no
+	randomized = no
+}
+
+RG_leader_trait_admiral_nanorebuild_gray = {
+	cost = 0
+	inline_script = {
+		script = trait/icon_psionic
+		CLASS = leader
+		ICON = "GFX_leader_trait_nanorebuild"
+		RARITY = paragon
+		COUNCIL = no
+		TIER = none
+	}
+	custom_tooltip_with_modifiers = RG_leader_trait_admiral_nanorebuild_effect
+	fleet_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
+	}
+	triggered_army_modifier = {
+		potential = {
+			always = yes
+		}
+		army_damage_mult = 0.05
+		army_health = 0.05
+		mult = owner.rg_general_skill_combat_daypassed_variable
+	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -257,84 +434,90 @@ RG_leader_trait_scientist_gray = {
 		COUNCIL = no
 		TIER = none
 	}
-	self_modifier = {
-		species_leader_exp_gain = 1
-	}
-	immortal_leaders = yes
-	modifier = {
-		all_technology_research_speed = 0.5
-		ship_archaeological_site_excavation_speed_mult = 0.5
-		science_ship_survey_speed = 1
-		ship_windup_mult = -1
-		ship_speed_mult = 0.5
-		ship_anomaly_generation_chance_mult = -1
-	}
-	leader_class = {
-		scientist
-	}
-	initial = no
-	randomized = no
-}
-
-RG_leader_trait_general_gray = {
-	#将军特质
-	cost = 0
-	inline_script = {
-		script = trait/icon_psionic
-		CLASS = general
-		ICON = "GFX_leader_trait_psionic_chosen_one"
-		RARITY = paragon
-		COUNCIL = no
-		TIER = none
-	}
-	self_modifier = {
-		species_leader_exp_gain = 1
-	}
-	immortal_leaders = yes
-	modifier = {
-		army_collateral_damage_mult = 0.15
-		army_disengage_chance_mult = 0.5
-		army_health = 0.35
-	}
-	leader_class = {
-		general
-	}
-	initial = no
-	randomized = no
-}
-
-RG_leader_trait_general_gray_skill = {
-	destiny_trait = yes
-	inline_script = {
-		script = trait/icon_psionic
-		CLASS = general
-		ICON = "GFX_leader_trait_supreme_warrior"
-		RARITY = paragon
-		COUNCIL = no
-		TIER = none
-	}
-	custom_tooltip_with_modifiers = RG_leader_trait_tempest_incoming_effect
-	triggered_modifier = {
+	triggered_self_modifier = {
 		potential = {
 			always = yes
 		}
-		army_damage_mult = 0.05
-		army_health = 0.05
-		mult = owner.rg_general_skill_combat_daypassed_variable
+		leader_skill_levels = 1
+		mult = trigger:has_skill
 	}
-	leader_class = {
-		general
+	self_modifier = {
+		species_leader_exp_gain = 1
 	}
+	immortal_leaders = yes
+	councilor_modifier = {
+		all_technology_research_speed = 0.5
+	}
+	modifier = {
+		ship_archaeological_site_excavation_speed_mult = 0.5
+		science_ship_survey_speed = 1
+		# ship_windup_mult = -1
+		# ship_speed_mult = 0.5
+		ship_anomaly_generation_chance_mult = -1
+	}
+	leader_class = { scientist }
 	initial = no
 	randomized = no
-	destiny_background_icon = "GFX_leader_background_destiny_1"
 }
 
+# RG_leader_trait_general_gray = {
+# 	#将军特质
+# 	cost = 0
+# 	inline_script = {
+# 		script = trait/icon_psionic
+# 		CLASS = general
+# 		ICON = "GFX_leader_trait_psionic_chosen_one"
+# 		RARITY = paragon
+# 		COUNCIL = no
+# 		TIER = none
+# 	}
+# 	self_modifier = {
+# 		species_leader_exp_gain = 1
+# 	}
+# 	immortal_leaders = yes
+# 	modifier = {
+# 		army_collateral_damage_mult = 0.15
+# 		army_disengage_chance_mult = 0.5
+# 		army_health = 0.35
+# 	}
+# 	leader_class = {
+# 		general
+# 	}
+# 	initial = no
+# 	randomized = no
+# }
+
+# 与舰长技能合并，弃用
+# RG_leader_trait_general_gray_skill = {
+# 	destiny_trait = yes
+# 	inline_script = {
+# 		script = trait/icon_psionic
+# 		CLASS = commander
+# 		ICON = "GFX_leader_trait_supreme_warrior"
+# 		RARITY = paragon
+# 		COUNCIL = no
+# 		TIER = none
+# 	}
+# 	custom_tooltip_with_modifiers = RG_leader_trait_tempest_incoming_effect
+# 	triggered_army_modifier = {
+# 		potential = {
+# 			always = yes
+# 		}
+# 		army_damage_mult = 0.05
+# 		army_health = 0.05
+# 		mult = owner.rg_general_skill_combat_daypassed_variable
+# 	}
+# 	leader_class = { commander }
+# 	initial = no
+# 	randomized = no
+# 	destiny_background_icon = "GFX_leader_background_destiny_1"
+# }
+
 RG_leader_trait_admiral_fake_dragon = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = commander
 		ICON = "GFX_leader_trait_adaptable"
 		RARITY = paragon
 		COUNCIL = no
@@ -344,14 +527,12 @@ RG_leader_trait_admiral_fake_dragon = {
 		# 不知道什么时候专属特质加100%经验率已经变成国际公约力
 		species_leader_exp_gain = 1
 	}
-	modifier = {
+	fleet_modifier = {
 		ship_armor_mult = 0.3
 		ship_hull_mult = 0.2
 		ship_weapon_damage = 0.2
 	}
-	leader_class = {
-		admiral
-	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -360,7 +541,7 @@ RG_leader_trait_admiral_timed_life = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = commander
 		ICON = "GFX_leader_trait_ethereal"
 		RARITY = paragon
 		COUNCIL = no
@@ -394,9 +575,7 @@ RG_leader_trait_admiral_timed_life = {
 		ship_weapon_damage = 10
 		custom_tooltip_with_modifiers = rg_timed_life_millennium
 	}
-	leader_class = {
-		admiral
-	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }
@@ -405,7 +584,7 @@ RG_leader_trait_admiral_born_tobe_dragon = {
 	cost = 0
 	inline_script = {
 		script = trait/icon_psionic
-		CLASS = admiral
+		CLASS = commander
 		ICON = "GFX_leader_trait_ethereal"
 		RARITY = paragon
 		COUNCIL = no
@@ -440,9 +619,7 @@ RG_leader_trait_admiral_born_tobe_dragon = {
 		ship_weapon_damage = 0.01
 		custom_tooltip_with_modifiers = rg_timed_life_millennium_reborn
 	}
-	leader_class = {
-		admiral
-	}
+	leader_class = { commander }
 	initial = no
 	randomized = no
 }

common/traits/!_RG_wg_gray_leader_affection_traits_overwrite.txt

@@ -1,387 +1,387 @@
-leader_trait_wg_gray_affection = {
-	cost = 0
-	inline_script = {
-		script = trait/wg_new_leader_affection_trait
-		LEADER_TYPE = wg_gray
-	}
-	#governor
-	triggered_modifier = {
-		# lv2
-		potential = {
-			leader_class = governor
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv2
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv3
-			}
-		}
-		planet_district_city_build_speed_mult = 0.2
-		planet_district_generator_build_speed_mult = 0.2
-		planet_district_farming_build_speed_mult = 0.2
-		planet_district_mining_build_speed_mult = 0.2
-		planet_districts_minerals_cost_add = -100
-		planet_stability_add = 5
-	}
-	triggered_modifier = {
-		# lv3
-		potential = {
-			leader_class = governor
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv3
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv4
-			}
-		}
-		planet_researchers_physics_research_produces_mult = 0.04
-		planet_researchers_society_research_produces_mult = 0.04
-		planet_researchers_engineering_research_produces_mult = 0.04
-		planet_district_city_build_speed_mult = 0.2
-		planet_district_generator_build_speed_mult = 0.2
-		planet_district_farming_build_speed_mult = 0.2
-		planet_district_mining_build_speed_mult = 0.2
-		planet_districts_minerals_cost_add = -100
-		planet_stability_add = 5
-	}
-	triggered_modifier = {
-		# lv4
-		potential = {
-			leader_class = governor
-			if = {
-				limit = {
-					has_leader_flag = married
-				}
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-				check_variable = {
-					which = affection
-					value < wg_leader_affection_to_lv5
-				}
-			}
-			else = {
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-			}
-		}
-		planet_researchers_physics_research_produces_mult = 0.08
-		planet_researchers_society_research_produces_mult = 0.08
-		planet_researchers_engineering_research_produces_mult = 0.08
-		planet_district_city_build_speed_mult = 0.2
-		planet_district_generator_build_speed_mult = 0.2
-		planet_district_farming_build_speed_mult = 0.2
-		planet_district_mining_build_speed_mult = 0.2
-		planet_districts_minerals_cost_add = -100
-		planet_stability_add = 5
-	}
-	triggered_modifier = {
-		# lv5
-		potential = {
-			leader_class = governor
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv5
-			}
-			has_leader_flag = married
-		}
-		planet_researchers_physics_research_produces_mult = 0.15
-		planet_researchers_society_research_produces_mult = 0.15
-		planet_researchers_engineering_research_produces_mult = 0.15
-		planet_district_city_build_speed_mult = 1
-		planet_district_generator_build_speed_mult = 1
-		planet_district_farming_build_speed_mult = 1
-		planet_district_mining_build_speed_mult = 1
-		planet_districts_minerals_cost_add = -150
-		planet_stability_add = 5
-		terraform_speed_mult = 0.3
-		planet_decision_enact_speed_mult = 0.15
-	}
-	#admiral
-	triggered_modifier = {
-		# lv2
-		potential = {
-			leader_class = admiral
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv2
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv3
-			}
-		}
-		ship_evasion_add = 5
-		ship_tracking_add = 5
-		ship_accuracy_add = 5
-		ship_shield_mult = 0.5
-		ship_hull_mult = 0.5
-		ship_speed_mult = 0.2
-		ship_hull_regen_add_static = 10
-		ship_armor_regen_add_static = 10
-	}
-	triggered_modifier = {
-		# lv3
-		potential = {
-			leader_class = admiral
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv3
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv4
-			}
-		}
-		ship_evasion_add = 5
-		ship_accuracy_add = 5
-		ship_tracking_add = 5
-		ship_shield_mult = 1
-		ship_hull_mult = 1
-		ship_weapon_damage = 0.2
-		ship_fire_rate_mult = 0.2
-		ship_speed_mult = 0.25
-		ship_hull_regen_add_static = 20
-		ship_armor_regen_add_static = 20
-	}
-	triggered_modifier = {
-		# lv4
-		potential = {
-			leader_class = admiral
-			if = {
-				limit = {
-					has_leader_flag = married
-				}
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-				check_variable = {
-					which = affection
-					value < wg_leader_affection_to_lv5
-				}
-			}
-			else = {
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-			}
-		}
-		ship_evasion_add = 10
-		ship_accuracy_add = 10
-		ship_tracking_add = 10
-		ship_shield_mult = 1.5
-		ship_hull_mult = 1.5
-		ship_weapon_damage = 0.4
-		ship_fire_rate_mult = 0.4
-		ship_speed_mult = 0.3
-		ship_hull_regen_add_static = 30
-		ship_armor_regen_add_static = 30
-	}
-	triggered_modifier = {
-		# lv5
-		potential = {
-			leader_class = admiral
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv5
-			}
-			has_leader_flag = married
-		}
-		ship_evasion_add = 15
-		ship_accuracy_add = 15
-		ship_tracking_add = 15
-		ship_shield_mult = 2.5
-		ship_hull_mult = 2.5
-		ship_weapon_damage = 0.7
-		ship_fire_rate_mult = 0.7
-		ship_speed_mult = 0.5
-		ship_hull_regen_add_static = 50
-		ship_armor_regen_add_static = 50
-	}
-	#scientist
-	triggered_modifier = {
-		# lv2
-		potential = {
-			leader_class = scientist
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv2
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv3
-			}
-		}
-		science_ship_survey_speed = 0.1
-		ship_anomaly_research_speed_mult = 0.1
-		ship_disengage_chance_mult = 0.3
-	}
-	triggered_modifier = {
-		# lv3
-		potential = {
-			leader_class = scientist
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv3
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv4
-			}
-		}
-		science_ship_survey_speed = 0.2
-		ship_anomaly_research_speed_mult = 0.25
-		ship_shield_mult = 0.25
-		ship_armor_mult = 0.25
-		ship_disengage_chance_mult = 0.3
-	}
-	triggered_modifier = {
-		# lv4
-		potential = {
-			leader_class = scientist
-			if = {
-				limit = {
-					has_leader_flag = married
-				}
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-				check_variable = {
-					which = affection
-					value < wg_leader_affection_to_lv5
-				}
-			}
-			else = {
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-			}
-		}
-		science_ship_survey_speed = 0.3
-		ship_anomaly_research_speed_mult = 0.35
-		ship_shield_mult = 0.35
-		ship_armor_mult = 0.35
-		ship_disengage_chance_mult = 0.35
-		ship_anomaly_generation_chance_mult = 0.2
-	}
-	triggered_modifier = {
-		# lv5
-		potential = {
-			leader_class = scientist
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv5
-			}
-			has_leader_flag = married
-		}
-		science_ship_survey_speed = 0.5
-		ship_anomaly_research_speed_mult = 0.5
-		ship_shield_mult = 0.5
-		ship_armor_mult = 0.5
-		ship_disengage_chance_mult = 0.5
-		ship_anomaly_generation_chance_mult = 0.5
-	}
-	#general
-	triggered_modifier = {
-		# lv2
-		potential = {
-			leader_class = general
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv2
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv3
-			}
-		}
-		army_experience_gain_mult = 0.1
-		army_morale_damage_mult = 0.1
-		army_disengage_chance_mult = 0.2
-	}
-	triggered_modifier = {
-		# lv3
-		potential = {
-			leader_class = general
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv3
-			}
-			check_variable = {
-				which = affection
-				value < wg_leader_affection_to_lv4
-			}
-		}
-		army_experience_gain_mult = 0.25
-		army_morale_damage_mult = 0.25
-		army_disengage_chance_mult = 0.4
-		armies_upkeep_mult = -0.2
-		army_collateral_damage_mult = -0.15		#"陆军连带伤害"
-	}
-	triggered_modifier = {
-		# lv4
-		potential = {
-			leader_class = general
-			if = {
-				limit = {
-					has_leader_flag = married
-				}
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-				check_variable = {
-					which = affection
-					value < wg_leader_affection_to_lv5
-				}
-			}
-			else = {
-				check_variable = {
-					which = affection
-					value >= wg_leader_affection_to_lv4
-				}
-			}
-		}
-		army_experience_gain_mult = 0.5
-		army_morale_damage_mult = 0.5
-		army_disengage_chance_mult = 0.6
-		armies_upkeep_mult = -0.4
-		army_collateral_damage_mult = -0.3		#"陆军连带伤害"
-	}
-	triggered_modifier = {
-		# lv5
-		potential = {
-			leader_class = general
-			check_variable = {
-				which = affection
-				value >= wg_leader_affection_to_lv5
-			}
-			has_leader_flag = married
-		}
-		army_experience_gain_mult = 0.8
-		army_morale_damage_mult = 0.8
-		army_disengage_chance_mult = 1
-		armies_upkeep_mult = -0.8
-		army_collateral_damage_mult = -0.8		#"陆军连带伤害"
-	}
-	leader_class = {
-		governor
-		admiral
-		scientist
-		general
-	}
-	initial = no
-	randomized = no
-	notify_on_gained = no
-}
+# leader_trait_wg_gray_affection = {
+# 	cost = 0
+# 	inline_script = {
+# 		script = trait/wg_new_leader_affection_trait
+# 		LEADER_TYPE = wg_gray
+# 	}
+# 	#official
+# 	triggered_modifier = {
+# 		# lv2
+# 		potential = {
+# 			leader_class = official
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv2
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv3
+# 			}
+# 		}
+# 		planet_district_city_build_speed_mult = 0.2
+# 		planet_district_generator_build_speed_mult = 0.2
+# 		planet_district_farming_build_speed_mult = 0.2
+# 		planet_district_mining_build_speed_mult = 0.2
+# 		planet_districts_minerals_cost_add = -100
+# 		planet_stability_add = 5
+# 	}
+# 	triggered_modifier = {
+# 		# lv3
+# 		potential = {
+# 			leader_class = official
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv3
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv4
+# 			}
+# 		}
+# 		planet_researchers_physics_research_produces_mult = 0.04
+# 		planet_researchers_society_research_produces_mult = 0.04
+# 		planet_researchers_engineering_research_produces_mult = 0.04
+# 		planet_district_city_build_speed_mult = 0.2
+# 		planet_district_generator_build_speed_mult = 0.2
+# 		planet_district_farming_build_speed_mult = 0.2
+# 		planet_district_mining_build_speed_mult = 0.2
+# 		planet_districts_minerals_cost_add = -100
+# 		planet_stability_add = 5
+# 	}
+# 	triggered_modifier = {
+# 		# lv4
+# 		potential = {
+# 			leader_class = official
+# 			if = {
+# 				limit = {
+# 					has_leader_flag = married
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value < wg_leader_affection_to_lv5
+# 				}
+# 			}
+# 			else = {
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 			}
+# 		}
+# 		planet_researchers_physics_research_produces_mult = 0.08
+# 		planet_researchers_society_research_produces_mult = 0.08
+# 		planet_researchers_engineering_research_produces_mult = 0.08
+# 		planet_district_city_build_speed_mult = 0.2
+# 		planet_district_generator_build_speed_mult = 0.2
+# 		planet_district_farming_build_speed_mult = 0.2
+# 		planet_district_mining_build_speed_mult = 0.2
+# 		planet_districts_minerals_cost_add = -100
+# 		planet_stability_add = 5
+# 	}
+# 	triggered_modifier = {
+# 		# lv5
+# 		potential = {
+# 			leader_class = official
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv5
+# 			}
+# 			has_leader_flag = married
+# 		}
+# 		planet_researchers_physics_research_produces_mult = 0.15
+# 		planet_researchers_society_research_produces_mult = 0.15
+# 		planet_researchers_engineering_research_produces_mult = 0.15
+# 		planet_district_city_build_speed_mult = 1
+# 		planet_district_generator_build_speed_mult = 1
+# 		planet_district_farming_build_speed_mult = 1
+# 		planet_district_mining_build_speed_mult = 1
+# 		planet_districts_minerals_cost_add = -150
+# 		planet_stability_add = 5
+# 		terraform_speed_mult = 0.3
+# 		planet_decision_enact_speed_mult = 0.15
+# 	}
+# 	#admiral
+# 	triggered_modifier = {
+# 		# lv2
+# 		potential = {
+# 			leader_class = admiral
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv2
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv3
+# 			}
+# 		}
+# 		ship_evasion_add = 5
+# 		ship_tracking_add = 5
+# 		ship_accuracy_add = 5
+# 		ship_shield_mult = 0.5
+# 		ship_hull_mult = 0.5
+# 		ship_speed_mult = 0.2
+# 		ship_hull_regen_add_static = 10
+# 		ship_armor_regen_add_static = 10
+# 	}
+# 	triggered_modifier = {
+# 		# lv3
+# 		potential = {
+# 			leader_class = admiral
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv3
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv4
+# 			}
+# 		}
+# 		ship_evasion_add = 5
+# 		ship_accuracy_add = 5
+# 		ship_tracking_add = 5
+# 		ship_shield_mult = 1
+# 		ship_hull_mult = 1
+# 		ship_weapon_damage = 0.2
+# 		ship_fire_rate_mult = 0.2
+# 		ship_speed_mult = 0.25
+# 		ship_hull_regen_add_static = 20
+# 		ship_armor_regen_add_static = 20
+# 	}
+# 	triggered_modifier = {
+# 		# lv4
+# 		potential = {
+# 			leader_class = admiral
+# 			if = {
+# 				limit = {
+# 					has_leader_flag = married
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value < wg_leader_affection_to_lv5
+# 				}
+# 			}
+# 			else = {
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 			}
+# 		}
+# 		ship_evasion_add = 10
+# 		ship_accuracy_add = 10
+# 		ship_tracking_add = 10
+# 		ship_shield_mult = 1.5
+# 		ship_hull_mult = 1.5
+# 		ship_weapon_damage = 0.4
+# 		ship_fire_rate_mult = 0.4
+# 		ship_speed_mult = 0.3
+# 		ship_hull_regen_add_static = 30
+# 		ship_armor_regen_add_static = 30
+# 	}
+# 	triggered_modifier = {
+# 		# lv5
+# 		potential = {
+# 			leader_class = admiral
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv5
+# 			}
+# 			has_leader_flag = married
+# 		}
+# 		ship_evasion_add = 15
+# 		ship_accuracy_add = 15
+# 		ship_tracking_add = 15
+# 		ship_shield_mult = 2.5
+# 		ship_hull_mult = 2.5
+# 		ship_weapon_damage = 0.7
+# 		ship_fire_rate_mult = 0.7
+# 		ship_speed_mult = 0.5
+# 		ship_hull_regen_add_static = 50
+# 		ship_armor_regen_add_static = 50
+# 	}
+# 	#scientist
+# 	triggered_modifier = {
+# 		# lv2
+# 		potential = {
+# 			leader_class = scientist
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv2
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv3
+# 			}
+# 		}
+# 		science_ship_survey_speed = 0.1
+# 		ship_anomaly_research_speed_mult = 0.1
+# 		ship_disengage_chance_mult = 0.3
+# 	}
+# 	triggered_modifier = {
+# 		# lv3
+# 		potential = {
+# 			leader_class = scientist
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv3
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv4
+# 			}
+# 		}
+# 		science_ship_survey_speed = 0.2
+# 		ship_anomaly_research_speed_mult = 0.25
+# 		ship_shield_mult = 0.25
+# 		ship_armor_mult = 0.25
+# 		ship_disengage_chance_mult = 0.3
+# 	}
+# 	triggered_modifier = {
+# 		# lv4
+# 		potential = {
+# 			leader_class = scientist
+# 			if = {
+# 				limit = {
+# 					has_leader_flag = married
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value < wg_leader_affection_to_lv5
+# 				}
+# 			}
+# 			else = {
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 			}
+# 		}
+# 		science_ship_survey_speed = 0.3
+# 		ship_anomaly_research_speed_mult = 0.35
+# 		ship_shield_mult = 0.35
+# 		ship_armor_mult = 0.35
+# 		ship_disengage_chance_mult = 0.35
+# 		ship_anomaly_generation_chance_mult = 0.2
+# 	}
+# 	triggered_modifier = {
+# 		# lv5
+# 		potential = {
+# 			leader_class = scientist
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv5
+# 			}
+# 			has_leader_flag = married
+# 		}
+# 		science_ship_survey_speed = 0.5
+# 		ship_anomaly_research_speed_mult = 0.5
+# 		ship_shield_mult = 0.5
+# 		ship_armor_mult = 0.5
+# 		ship_disengage_chance_mult = 0.5
+# 		ship_anomaly_generation_chance_mult = 0.5
+# 	}
+# 	#general
+# 	triggered_modifier = {
+# 		# lv2
+# 		potential = {
+# 			leader_class = general
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv2
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv3
+# 			}
+# 		}
+# 		army_experience_gain_mult = 0.1
+# 		army_morale_damage_mult = 0.1
+# 		army_disengage_chance_mult = 0.2
+# 	}
+# 	triggered_modifier = {
+# 		# lv3
+# 		potential = {
+# 			leader_class = general
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv3
+# 			}
+# 			check_variable = {
+# 				which = affection
+# 				value < wg_leader_affection_to_lv4
+# 			}
+# 		}
+# 		army_experience_gain_mult = 0.25
+# 		army_morale_damage_mult = 0.25
+# 		army_disengage_chance_mult = 0.4
+# 		armies_upkeep_mult = -0.2
+# 		army_collateral_damage_mult = -0.15		#"陆军连带伤害"
+# 	}
+# 	triggered_modifier = {
+# 		# lv4
+# 		potential = {
+# 			leader_class = general
+# 			if = {
+# 				limit = {
+# 					has_leader_flag = married
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 				check_variable = {
+# 					which = affection
+# 					value < wg_leader_affection_to_lv5
+# 				}
+# 			}
+# 			else = {
+# 				check_variable = {
+# 					which = affection
+# 					value >= wg_leader_affection_to_lv4
+# 				}
+# 			}
+# 		}
+# 		army_experience_gain_mult = 0.5
+# 		army_morale_damage_mult = 0.5
+# 		army_disengage_chance_mult = 0.6
+# 		armies_upkeep_mult = -0.4
+# 		army_collateral_damage_mult = -0.3		#"陆军连带伤害"
+# 	}
+# 	triggered_modifier = {
+# 		# lv5
+# 		potential = {
+# 			leader_class = general
+# 			check_variable = {
+# 				which = affection
+# 				value >= wg_leader_affection_to_lv5
+# 			}
+# 			has_leader_flag = married
+# 		}
+# 		army_experience_gain_mult = 0.8
+# 		army_morale_damage_mult = 0.8
+# 		army_disengage_chance_mult = 1
+# 		armies_upkeep_mult = -0.8
+# 		army_collateral_damage_mult = -0.8		#"陆军连带伤害"
+# 	}
+# 	leader_class = {
+# 		official
+# 		admiral
+# 		scientist
+# 		general
+# 	}
+# 	initial = no
+# 	randomized = no
+# 	notify_on_gained = no
+# }

common/traits/RG_machine_species_trait.txt

@@ -0,0 +1,61 @@
+rg_machine_maid_trait = {
+	cost = {
+		base = 0
+	}
+	custom_tooltip = TRAIT_PLANTOID_BUDDING_EFFECT
+	initial = no
+	species_potential_add = { always = no }
+	species_possible_remove = { always = no }
+	species_possible_merge_add = { always = no }
+	species_possible_merge_remove = { always = no }
+	randomized = no
+	allowed_archetypes = { MACHINE }
+	sorting_priority = 20
+	potential_crossbreeding_chance = 1.0
+
+	opposites = {
+	}
+
+	modifier = {
+		habitability_floor_add = 0.25
+		pop_housing_usage_mult = -0.9
+	}
+
+	assembling_modifier = {
+		planet_pop_assemblers_nanites_upkeep_add = 0.1
+	}
+	
+	# 在灰风主人国家工作提供加成
+	triggered_pop_modifier = {
+		potential = {
+			exists = owner
+			owner = { is_same_value = event_target:gray_owner }
+		}
+		planet_jobs_produces_mult = 1.1
+	}
+
+	ai_weight = {
+		weight = 0
+	}
+	
+	assembly_score = {
+		modifier = {
+			add = 3
+			from.owner = { is_same_value = event_target:gray_owner }
+		}
+		modifier = {
+			mult = 0
+			from.owner = { 
+				NOT = {
+					is_same_value = event_target:gray_owner
+				}
+			}
+		}
+	
+	
+	}
+	
+	slave_cost = {
+		energy = 1000
+	}
+}

descriptor.mod

@@ -8,5 +8,5 @@ tags={
 }
 name="Real Gray"
 picture="thumbnail.png"
-supported_version="3.8.*"
+supported_version="v3.12.*"
 remote_file_id="2136166095"

events/!_RG_gray_goo_events.txt

@@ -212,11 +212,6 @@ country_event = {
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
-	immediate = {
-		event_target:gray_governor = {
-			set_owner = event_target:rg_gray_country
-		}
-	}
 	option = {
 		name = graygoo.405.a
 		hidden_effect = {
@@ -272,15 +267,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 = {
@@ -314,6 +314,7 @@ country_event = {
 			rg_gray_country_init = yes			#创建国家
 		}
 		rg_gray_country_after_init = yes
+		set_country_flag = machine_age_nanites_studied 
 		create_message = {
 			type = MESSAGE_RECRUITED_LEADER
 			localization = "rg_event.2.desc"
@@ -343,7 +344,10 @@ country_event = {
 		is_same_value = event_target:gray_owner
 		NOR = {
 			has_country_flag = gray_constship_active
-			has_country_flag = gray_governor_active
+			OR = {
+				has_country_flag = gray_official_active
+				has_country_flag = gray_governor_active #旧版flag
+			}
 			has_country_flag = gray_warship_active
 			has_country_flag = gray_army_active
 			has_country_flag = gray_reforming
@@ -383,7 +387,10 @@ country_event = {
 			}
 		}
 		is_same_value = event_target:gray_owner
-		has_country_flag = gray_governor_active
+		OR = {
+			has_country_flag = gray_official_active
+			has_country_flag = gray_governor_active #旧版flag
+		}
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -615,9 +622,9 @@ event = {
 					}
 				}
 				AND = {
-					has_country_flag = gray_governor_active
+					has_country_flag = gray_official_active
 					NOT = {
-						exists = event_target:gray_governor
+						exists = event_target:gray_official
 					}
 				}
 				AND = {
@@ -631,7 +638,8 @@ event = {
 	}
 	immediate = {
 		event_target:gray_owner = {
-			remove_country_flag = gray_governor_active			#总督
+			remove_country_flag = gray_official_active #新版flag
+			remove_country_flag = gray_governor_active #旧版flag	#总督
 			remove_country_flag = gray_warship_active			#旗舰
 			remove_country_flag = gray_army_active			#陆军
 			remove_country_flag = gray_constship_active			#科舰
@@ -640,12 +648,8 @@ event = {
 				modifier = "gray_scattered"
 				days = 3600
 			}
-			country_event = {
-				id = graygoo.511
-			}
-			country_event = {
-				id = rg_event.22
-			}
+			country_event = { id = graygoo.511 }
+			country_event = { id = graygoo.512 days = 3600 }
 		}
 	}
 }
@@ -670,11 +674,20 @@ country_event = {
 	desc = "graygoo.512.a.desc"
 	desc = "graygoo.512.b.desc"
 	desc = "graygoo.512.c.desc"
-	diplomatic = yes
+
+	event_window_type = leader_story
+	picture = GFX_evt_gray_gooed_planet
+	picture_event_data = {
+		portrait = event_target:rg_gray_country_leader
+		room = root
+	}
+
 	is_triggered_only = yes
+
 	immediate = {
 		remove_country_flag = gray_reforming
 	}
+
 	option = {
 		name = graygoo.512.a
 	}

events/RG_cluster_events.txt

@@ -123,6 +123,7 @@ country_event = {
 			save_event_target_as = rg_cluster_previous_home_planet
 			solar_system = {
 				save_event_target_as = rg_cluster_previous_home_system
+				set_star_flag = lgate
 				spawn_megastructure = {
 					type = lgate_base
 					orbit_angle = 225

events/RG_combat_skill_events.txt

@@ -1,96 +1,98 @@
 namespace = rg_skill
-#fleet_event = {
-#    id = rg_skill.1
-#    hide_window = yes
-#    is_triggered_only = yes
-#
-#    trigger = {
-#        NOT = { has_global_flag = rg_grayskill_cooldown }
-#        any_owned_fleet = {
-#					exists = leader
-#					leader = { has_leader_flag = gray_leader_admiral }
-#					is_in_combat = yes
-#				}
-#    }
-#
-#    immediate = {
-#		if = {
-#			limit = {
-#				any_owned_fleet = {
-#					exists = leader
-#					leader = { has_leader_flag = gray_leader_admiral }
-#					is_in_combat = yes
-#				}
-#			}
-#			random_owned_fleet = {
-#				if = {
-#					limit = { leader = { has_leader_flag = gray_leader_admiral }}
-#					save_event_target_as = gray_warship_location
-#				}
-#			}
-#			create_fleet = {
-#				name = "NAME_RG_carrier"
-#				settings = { 
-#					can_disband = yes
-#					can_upgrade = no 
-#					can_change_composition = yes 
-#					can_change_leader = no 
-#					uses_naval_capacity = no
-#					spawn_debris = no
-#				}				
-#				effect = {
-#					set_owner = event_target:gray_owner
-#					while = {
-#						count = 4
-#						create_ship = {
-#							name = random
-#							design = "RG_carrier_Interdictor"
-#							graphical_culture = "pirate_01"
-#							prefix = no
-#							upgradable = no
-#						}
-#					}
-#					set_location = {
-#						target = event_target:gray_warship_location
-#						distance = 55
-#						angle = 270
-#					}
-#					set_fleet_flag = RG_carrier_fleet
-#					save_global_event_target_as = RG_carrier_fleet
-#				}
-#			}
-#			
-#			set_timed_global_flag = { 
-#				flag = rg_grayskill_cooldown days = 120
-#			}
-#		}	
-#	}	
-#}
-#fleet_event = {
-#    id = rg_skill.2
-#    hide_window = yes
-#    is_triggered_only = yes
-#
-#    trigger = {
-#        any_owned_fleet = {
-#					has_fleet_flag = RG_carrier_fleet
-#					is_in_combat = no
-#				}
-#    }
-#
-#    immediate = {
-#		if = {
-#			limit = {
-#				any_owned_fleet = {
-#					has_fleet_flag = RG_carrier_fleet
-#					is_in_combat = no
-#				}
-#			}	
-#			event_target:RG_carrier_fleet = { delete_ship = this }	
-#		}
-#	}
-#}
-#自动星系建设
+
+# fleet_event = {
+#     id = rg_skill.1
+#     hide_window = yes
+#     is_triggered_only = yes
+# 
+#     trigger = {
+#         NOT = { has_global_flag = rg_grayskill_cooldown }
+#         any_owned_fleet = {
+# 					exists = leader
+# 					leader = { has_leader_flag = gray_leader_admiral }
+# 					is_in_combat = yes
+# 				}
+#     }
+# 
+#     immediate = {
+# 		if = {
+# 			limit = {
+# 				any_owned_fleet = {
+# 					exists = leader
+# 					leader = { has_leader_flag = gray_leader_admiral }
+# 					is_in_combat = yes
+# 				}
+# 			}
+# 			random_owned_fleet = {
+# 				if = {
+# 					limit = { leader = { has_leader_flag = gray_leader_admiral }}
+# 					save_event_target_as = gray_warship_location
+# 				}
+# 			}
+# 			create_fleet = {
+# 				name = "NAME_RG_carrier"
+# 				settings = { 
+# 					can_disband = yes
+# 					can_upgrade = no 
+# 					can_change_composition = yes 
+# 					can_change_leader = no 
+# 					uses_naval_capacity = no
+# 					spawn_debris = no
+# 				}				
+# 				effect = {
+# 					set_owner = event_target:gray_owner
+# 					while = {
+# 						count = 4
+# 						create_ship = {
+# 							name = random
+# 							design = "RG_carrier_Interdictor"
+# 							graphical_culture = "pirate_01"
+# 							prefix = no
+# 							upgradable = no
+# 						}
+# 					}
+# 					set_location = {
+# 						target = event_target:gray_warship_location
+# 						distance = 55
+# 						angle = 270
+# 					}
+# 					set_fleet_flag = RG_carrier_fleet
+# 					save_global_event_target_as = RG_carrier_fleet
+# 				}
+# 			}
+# 			
+# 			set_timed_global_flag = { 
+# 				flag = rg_grayskill_cooldown days = 120
+# 			}
+# 		}	
+# 	}	
+# }
+
+# fleet_event = {
+#     id = rg_skill.2
+#     hide_window = yes
+#     is_triggered_only = yes
+# 
+#     trigger = {
+#         any_owned_fleet = {
+# 					has_fleet_flag = RG_carrier_fleet
+# 					is_in_combat = no
+# 				}
+#     }
+# 
+#     immediate = {
+# 		if = {
+# 			limit = {
+# 				any_owned_fleet = {
+# 					has_fleet_flag = RG_carrier_fleet
+# 					is_in_combat = no
+# 				}
+# 			}	
+# 			event_target:RG_carrier_fleet = { delete_ship = this }	
+# 		}
+# 	}
+# }
+
 ship_event = {
 	id = rg_skill.3
 	hide_window = yes
@@ -106,11 +108,9 @@ ship_event = {
 		}
 		solar_system = {
 			OR = {
-				#星系无主
 				NOT = {
 					exists = space_owner
 				}
-				#星系为我方但有空间站未建造
 				AND = {
 					space_owner = {
 						is_same_empire = root.controller
@@ -120,7 +120,6 @@ ship_event = {
 					}
 				}
 			}
-			#邻国不能是军孤
 			NOT = {
 				any_neighbor_system = {
 					has_owner = yes
@@ -145,7 +144,6 @@ ship_event = {
 				}
 				solar_system = {
 					NOT = {
-						#星系内不能有敌舰
 						any_fleet_in_system = {
 							exists = controller
 							controller = {
@@ -155,7 +153,6 @@ ship_event = {
 					}
 				}
 			}
-			#创建自动工程船暂存国家
 			RG_const_auto_build_effect_event = yes
 		}
 		else_if = {
@@ -168,8 +165,7 @@ ship_event = {
 				}
 				solar_system = {
 					has_star_flag = lcluster
-					NOT = {
-						#星系内不能有敌舰		
+					NOT = {	
 						any_fleet_in_system = {
 							exists = controller
 							controller = {
@@ -179,7 +175,6 @@ ship_event = {
 					}
 				}
 			}
-			#创建自动工程船暂存国家
 			RG_const_auto_build_effect_event = yes
 		}
 		else_if = {
@@ -190,8 +185,7 @@ ship_event = {
 				}
 				solar_system = {
 					# has_star_flag = lcluster
-					NOT = {
-						#星系内不能有敌舰		
+					NOT = {	
 						any_fleet_in_system = {
 							exists = controller
 							controller = {
@@ -201,10 +195,8 @@ ship_event = {
 					}
 				}
 			}
-			#创建自动工程船暂存国家
 			RG_const_auto_build_effect_event = yes
 		}
-		#循环检查
 		ship_event = {
 			id = rg_skill.3
 			days = 10
@@ -396,7 +388,7 @@ planet_event = {
 				exists = leader
 				leader = {
 					#leader
-					has_trait = RG_leader_trait_general_gray_skill
+					has_trait = RG_leader_trait_admiral_nanorebuild_gray
 					owner = {
 						#country
 						save_event_target_as = attacking_general_country
@@ -460,7 +452,7 @@ country_event = {
 						exists = leader
 						leader = {
 							OR = {
-								has_trait = RG_leader_trait_general_gray_skill
+								has_trait = RG_leader_trait_admiral_nanorebuild_gray
 							}
 						}
 					}
@@ -555,7 +547,7 @@ country_event = {
 			exists = leader
 			leader = {
 				OR = {
-					has_trait = RG_leader_trait_general_gray_skill
+					has_trait = RG_leader_trait_admiral_nanorebuild_gray
 				}
 			}
 			if = {
@@ -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
+			}
+		}
+	}
+}

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"
@@ -175,7 +191,7 @@ country_event = {
 	desc = "graygoo.501.b.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_admiral
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -213,7 +229,7 @@ country_event = {
 	desc = "graygoo.501.c.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_general
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -251,7 +267,7 @@ country_event = {
 	desc = "rg_const.501.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_scientist
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -289,7 +305,7 @@ country_event = {
 	desc = "graygoo.502.a.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -326,7 +342,7 @@ country_event = {
 	desc = "graygoo.502.c.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_general
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -363,7 +379,7 @@ country_event = {
 	desc = "RG_graygoo.502.d.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -400,7 +416,7 @@ country_event = {
 	desc = "RG_graygoo.502.e.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -437,7 +453,81 @@ country_event = {
 	desc = "rg_const.502.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_scientist
+		room = "ethic_spaceship_room"
+	}
+	is_triggered_only = yes
+	immediate = {
+		set_country_flag = gray_diplomacy_engaged
+	}
+	after = {
+		hidden_effect = {
+			remove_country_flag = gray_diplomacy_engaged
+		}
+	}
+	option = {
+		name = OK
+	}
+	option = {
+		name = graygoo.500.d
+		tag = hire_leader
+		default_hide_option = yes
+	}
+	option = {
+		name = graygoo.500.prepage
+		tag = dismiss_leader
+		hidden_effect = {
+			country_event = {
+				id = rg_grayleader.1
+			}
+		}
+	}
+}
+
+country_event = {
+	id = rg_grayleader_dialog.5026
+	title = "graygoo.500.title"
+	desc = "RG_graygoo.502.f.response"
+	event_window_type = leader_recruit
+	picture_event_data = {
+		portrait = event_target:gray_leader_admiral
+		room = "ethic_spaceship_room"
+	}
+	is_triggered_only = yes
+	immediate = {
+		set_country_flag = gray_diplomacy_engaged
+	}
+	after = {
+		hidden_effect = {
+			remove_country_flag = gray_diplomacy_engaged
+		}
+	}
+	option = {
+		name = OK
+	}
+	option = {
+		name = graygoo.500.d
+		tag = hire_leader
+		default_hide_option = yes
+	}
+	option = {
+		name = graygoo.500.prepage
+		tag = dismiss_leader
+		hidden_effect = {
+			country_event = {
+				id = rg_grayleader.1
+			}
+		}
+	}
+}
+
+country_event = {
+	id = rg_grayleader_dialog.5027
+	title = "graygoo.500.title"
+	desc = "RG_graygoo.502.g.response"
+	event_window_type = leader_recruit
+	picture_event_data = {
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -474,7 +564,7 @@ country_event = {
 	desc = "graygoo.503.a.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -511,7 +601,7 @@ country_event = {
 	desc = "graygoo.503.b.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -548,7 +638,7 @@ country_event = {
 	desc = "rg_const.503.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_scientist
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -585,7 +675,7 @@ country_event = {
 	desc = "graygoo.505.a.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -622,7 +712,7 @@ country_event = {
 	desc = "graygoo.505.b.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -659,7 +749,7 @@ country_event = {
 	desc = "graygoo.505.c.response"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_general
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes

events/RG_gray_leader_event.txt

@@ -35,7 +35,8 @@ country_event = {
 				is_same_value = event_target:gray_owner
 				NOR = {
 					has_country_flag = gray_constship_active
-					has_country_flag = gray_governor_active
+					has_country_flag = gray_official_active
+					has_country_flag = gray_governor_active #旧版flag
 					has_country_flag = gray_warship_active
 					has_country_flag = gray_army_active
 					has_country_flag = gray_reforming
@@ -60,7 +61,10 @@ country_event = {
 					}
 				}
 				is_same_value = event_target:gray_owner
-				has_country_flag = gray_governor_active
+				OR = {
+					has_country_flag = gray_official_active
+					has_country_flag = gray_governor_active #旧版flag
+				}
 				NOR = {
 					has_country_flag = gray_reforming
 					has_country_flag = gray_diplomacy_engaged
@@ -232,7 +236,8 @@ country_event = {
 		is_same_value = event_target:gray_owner
 		NOR = {
 			has_country_flag = gray_constship_active
-			has_country_flag = gray_governor_active
+			has_country_flag = gray_official_active
+			has_country_flag = gray_governor_active #旧版flag
 			has_country_flag = gray_warship_active
 			has_country_flag = gray_army_active
 			has_country_flag = gray_reforming
@@ -244,8 +249,9 @@ country_event = {
 		name = graygoo.500.a
 		response_text = graygoo.500.a.response
 		trigger = {
-			NOT = {
-				has_country_flag = gray_governor_active
+			NOR = {
+				has_country_flag = gray_official_active
+				has_country_flag = gray_governor_active #旧版flag
 			}
 		}
 		hidden_effect = {
@@ -303,6 +309,54 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+			country_event = {
+				id = rg_grayleader_dialog.5027
+			}
+		}
+	}
 	option = {
 		# help
 		name = rg_help
@@ -339,7 +393,7 @@ country_event = {
 	diplomatic = yes
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		planet_background = event_target:gray_governor_planet
 		room = root
 	}
@@ -356,7 +410,10 @@ country_event = {
 			}
 		}
 		is_same_value = event_target:gray_owner
-		has_country_flag = gray_governor_active
+		OR = {
+			has_country_flag = gray_official_active
+			has_country_flag = gray_governor_active #旧版flag
+		}
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -444,6 +501,46 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_juggernaut_habitat_init = yes
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+			country_event = {
+				id = rg_grayleader_dialog.5027
+			}
+		}
+	}
 	option = {
 		# help
 		name = rg_help
@@ -480,7 +577,7 @@ country_event = {
 	diplomatic = yes
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_admiral
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -514,7 +611,7 @@ country_event = {
 		capital_scope = {
 			solar_system = {
 				starbase = {
-					save_event_target_as = gray_owner_capital_starbase
+					save_global_event_target_as = gray_owner_capital_starbase
 				}
 			}
 		}
@@ -699,155 +796,85 @@ country_event = {
 		}
 	}
 	option = {
-		#升级-2
-		name = rg_levelup_2
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
 		trigger = {
-			event_target:gray_leader_admiral = {
-				has_skill >= 10
-			}
-			NOR = {
-				has_country_flag = rg_gray_level_2
-				has_country_flag = rg_gray_level_3
-				has_special_project = RG_GRAY_MOD1
+			has_country_flag = rg_juggernaut_fired
+			NOT = {
+				has_country_flag = rg_habitat_enabled
 			}
 		}
 		allow = {
-			hidden_trigger = {
-				event_target:gray_warship = {
-					num_ships > 0
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
 				}
+				rg_clear_harbitat = yes
 			}
-			custom_tooltip = {
-				fail_text = graygoo.500.allow.a
-				event_target:gray_warship = {
-					is_in_combat = no
-				}
+			else = {
+				rg_juggernaut_habitat_init = yes
 			}
-			custom_tooltip = {
-				fail_text = graygoo.500.allow.b
-				event_target:gray_warship = {
-					NOT = {
-						has_hp_percentage < 0.97
-					}
-				}
-			}
-			custom_tooltip = {
-				fail_text = requires_rg_graylevel_higherthan_25
-				event_target:gray_leader_admiral = {
-					has_skill >= 10
-				}
-			}
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 40000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 40000
+			country_event = {
+				id = rg_grayleader_dialog.5026
 			}
 		}
-		custom_tooltip = rg_levelup_2.tooltip
-		enable_special_project = {
-			name = RG_GRAY_MOD1
-			location = event_target:gray_owner_capital_starbase
-			owner = root
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			has_country_flag = rg_habitat_enabled
 		}
-		add_resource = {
-			energy = -40000
-			alloys = -40000
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
 		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+			country_event = {
+				id = rg_grayleader_dialog.5027
+			}
+		}
+	}
+	option = {
+		#升级-2
+		name = rg_levelup_2
+		trigger = {
+			RG_gray_mod1_trigger = yes
+		}
+		allow = {
+			RG_gray_mod1_allow_trigger = yes
+		}
+		RG_gray_mod1_effect = yes
 	}
 	option = {
 		#升级-3
 		name = rg_levelup_3
 		trigger = {
-			AND = {
-				event_target:gray_leader_admiral = {
-					has_skill >= 10
-				}
-				has_country_flag = rg_gray_level_2
-			}
-			NOR = {
-				has_country_flag = rg_gray_level_3
-				has_special_project = RG_GRAY_MOD2
-			}
+			RG_gray_mod2_trigger = yes
 		}
 		allow = {
-			hidden_trigger = {
-				# To prevent exploit
-				event_target:gray_warship = {
-					num_ships > 0
-				}
-			}
-			custom_tooltip = {
-				fail_text = graygoo.500.allow.a
-				event_target:gray_warship = {
-					is_in_combat = no
-				}
-			}
-			custom_tooltip = {
-				fail_text = graygoo.500.allow.b
-				event_target:gray_warship = {
-					NOT = {
-						has_hp_percentage < 0.97
-					}
-				}
-			}
-			custom_tooltip = {
-				fail_text = requires_rg_graylevel_higherthan_50
-				has_technology = tech_juggernaut
-			}
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 150000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 150000
-			}
-		}
-		custom_tooltip = rg_levelup_2.tooltip
-		enable_special_project = {
-			name = RG_GRAY_MOD2
-			location = event_target:gray_owner_capital_starbase
-			owner = root
-		}
-		add_resource = {
-			energy = -150000
-			alloys = -150000
+			RG_gray_mod2_allow_trigger = yes
 		}
+		RG_gray_mod2_effect = yes
 	}
 	option = {
-		# 购买主宰
+		#升级-4
 		name = rg_event.4.d
 		trigger = {
-			NOR = {
-				has_country_flag = gray_reforming
-				has_country_flag = rg_juggernaut_fired
-			}
-			has_country_flag = rg_gray_level_3
+			RG_gray_mod3_trigger = yes
 		}
 		allow = {
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 150000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 150000
-			}
-			has_technology = tech_juggernaut
-		}
-		custom_tooltip = rg_levelup_2.tooltip
-		enable_special_project = {
-			name = RG_GRAY_MOD3
-			location = event_target:gray_owner_capital_starbase
-			owner = root
-		}
-		add_resource = {
-			energy = -150000
-			alloys = -150000
+			RG_gray_mod3_allow_trigger = yes
 		}
+		RG_gray_mod3_effect = yes
 	}
 	option = {
 		# 开启隐形
@@ -922,7 +949,7 @@ country_event = {
 	diplomatic = yes
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_general
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -1179,6 +1206,54 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+			country_event = {
+				id = rg_grayleader_dialog.5027
+			}
+		}
+	}
 	option = {
 		# 开启隐形
 		name = rg_event.4.e
@@ -1265,28 +1340,28 @@ country_event = {
 	option = {
 		name = OK
 	}
-	option = {
-		name = rg_graygoo.504.a
-		allow = {
-			has_country_flag = gray_reforming
-			resource_stockpile_compare = {
-				resource = nanites
-				value >= 1000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 50000
-			}
-		}
-		add_resource = {
-			nanites = -1000
-			alloys = -50000
-		}
-		remove_modifier = "gray_scattered"
-		country_event = {
-			id = graygoo.512
-		}
-	}
+	# option = {
+	# 	name = rg_graygoo.504.a
+	# 	allow = {
+	# 		has_country_flag = gray_reforming
+	# 		resource_stockpile_compare = {
+	# 			resource = nanites
+	# 			value >= 1000
+	# 		}
+	# 		resource_stockpile_compare = {
+	# 			resource = alloys
+	# 			value >= 50000
+	# 		}
+	# 	}
+	# 	add_resource = {
+	# 		nanites = -1000
+	# 		alloys = -50000
+	# 	}
+	# 	remove_modifier = "gray_scattered"
+	# 	country_event = {
+	# 		id = graygoo.512
+	# 	}
+	# }
 }
 
 # Main Menu (const)
@@ -1300,7 +1375,7 @@ country_event = {
 	diplomatic = yes
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_leader_scientist
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -1444,6 +1519,54 @@ country_event = {
 			}
 		}
 	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.f
+		response_text = RG_graygoo.502.f.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			NOT = {
+				has_country_flag = rg_habitat_enabled
+			}
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			if = {
+				limit = {
+					has_country_flag = rg_habitat_enabled
+				}
+				rg_clear_harbitat = yes
+			}
+			else = {
+				rg_juggernaut_habitat_init = yes
+			}
+			country_event = {
+				id = rg_grayleader_dialog.5026
+			}
+		}
+	}
+	option = {
+		# 空间站
+		name = RG_graygoo.500.g
+		response_text = RG_graygoo.502.g.response
+		trigger = {
+			has_country_flag = rg_juggernaut_fired
+			has_country_flag = rg_habitat_enabled
+		}
+		allow = {
+			has_country_flag = rg_juggernaut_fired	# To prevent exploit
+		}
+		custom_tooltip = rg_need_manual_toggle
+		hidden_effect = {
+			rg_clear_harbitat = yes
+			country_event = {
+				id = rg_grayleader_dialog.5027
+			}
+		}
+	}
 	#	option = { # 开启建造中继器
 	#		name = rg_event.5.e
 	#		trigger = {
@@ -1494,7 +1617,7 @@ country_event = {
 	desc = "rg_event.4.a.desc"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -1595,6 +1718,32 @@ country_event = {
 			rg_create_gray_colony_1 = yes
 		}
 	}
+	option = {
+		# 购买巨像
+		name = rg_event.4.h
+		trigger = {
+			NOT = {
+				has_country_flag = gray_reforming
+			}
+		}
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 8000
+			}
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 8000
+			}
+		}
+		add_resource = {
+			energy = -8000
+			alloys = -8000
+		}
+		hidden_effect = {
+			rg_create_gray_planetkiller_testship_1 = yes
+		}
+	}
 	option = {
 		# 没钱了，救救
 		name = rg_event.4.c
@@ -1643,7 +1792,7 @@ country_event = {
 	desc = "rg_event.5.c.desc"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes
@@ -1697,7 +1846,7 @@ country_event = {
 	desc = "rg_event.6.b.desc"
 	event_window_type = leader_recruit
 	picture_event_data = {
-		portrait = event_target:rg_gray_country_leader
+		portrait = event_target:gray_governor
 		room = "ethic_spaceship_room"
 	}
 	is_triggered_only = yes

events/RG_machine_event.txt

@@ -0,0 +1,94 @@
+namespace = rg_maid
+country_event = {
+	id = rg_maid.1
+	hide_window = yes
+	is_triggered_only = yes
+	immediate = {
+		if = {
+			limit = {
+				NOT = {
+					exist = event_target:rg_maid_species
+				}
+			}
+			create_species = {
+				name = 纳米构造体
+				class = RG_MACHINE
+				portrait = "rg_machine_maid"
+				traits = {
+					trait = trait_machine_unit
+					trait = rg_machine_maid_trait
+					trait = trait_robot_mass_produced
+				}
+				can_be_modified = yes
+				namelist = root.species
+				effect = {
+					save_event_target_as = rg_maid_species
+				}
+			}
+		}
+		capital_scope = {
+			while = {
+				count = 5
+				create_pop = {
+					species = event_target:rg_maid_species
+				}
+			}
+		}
+	}
+}
+
+# country_event = {
+# 	id = rg_maid.2
+# 	hide_window = yes
+# 	is_triggered_only = yes
+# 	immediate = {
+# 		every_playable_country = {
+# 			limit = {
+# 				any_owned_species = {
+# 					has_trait = rg_machine_maid_trait
+# 				}
+# 			}
+# 			triggered_planet_modifier = {
+# 				potential = {
+# 					can_assemble_budding_pop = yes
+# 				}
+# 				planet_pop_assembly_organic_add = @plantoid_budding_rate
+# 				mult = value:budding_multiplier
+# 			}
+# 		}
+# 		capital_scope = {
+# 			while = {
+# 				count = 5
+# 				create_pop = {
+# 					species = event_target:rg_maid_species
+# 				}
+# 			}
+# 		}
+# 	}
+# }
+
+# planet_event = { #Braiiiins
+# 	id = rg_maid.3
+# 	is_triggered_only = yes
+# 	hide_window = yes
+# 
+# 	trigger = {
+# 		fromfrom = { 
+# 			is_organic_species = yes
+# 			NOT = { has_trait = trait_zombie }
+# 		}
+# 		owner = { has_valid_civic = civic_permanent_employment }
+# 		has_building = building_posthumous_employment_center
+# 	}
+# 
+# 	immediate = {
+# 		fromfrom = {
+# 			make_pop_zombie = yes
+# 		}
+# 	}
+# 	after = {
+# 		fromfrom = {
+# 			clear_pop_category = yes #To make sure that the zombie pop does not spawn as a non worker strata
+# 		}
+# 	}
+# }

events/RG_origin_event.txt

@@ -0,0 +1,150 @@
+namespace = rg_origin
+
+########
+# SCION
+########
+
+country_event = {
+	id = rg_origin.1
+	hide_window = yes
+
+	is_triggered_only = yes
+	trigger = {
+		AND = {
+			has_origin = rg_origin_scion
+			# NOT = { has_global_flag = rg_origin_l_cluster }
+		}
+	}
+
+	immediate = {
+		# Scion
+		country_event = { id = rg_origin.5 }
+	}
+}
+
+
+# Setup
+country_event = {
+	id = rg_origin.5
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	immediate = {
+		# set_country_flag = first_contact_event
+		# set_country_flag = Story2 # Already encountered spacefarers
+		# Spawn mini-FE if player turned off Fallen Empires but picked this Origin anyway...
+		if = {
+			limit = {
+				NOT = {
+					exist = event_target:rg_scion_fe
+				}
+			}
+			set_country_flag = rg_scion_needs_fe
+			if = {
+				limit ={
+					any_playable_country = {
+						AND = {
+							has_origin = origin_rg_gray
+							# NOT = { has_global_flag = rg_origin_l_cluster }
+						}
+					}
+				}
+				random_system = {
+					limit = { has_owner = no }
+					spawn_system = { initializer = "rg_fallen_machine_1" }
+				}
+				add_extra_hyperlane_to_spawned_system_effect = yes
+			}
+			else = {
+				rg_lcluster_spawn_effect_scion = yes
+				every_system = {
+					limit = {
+						has_star_flag = lcluster
+					}
+					rg_create_fe_citadel = yes
+				}
+			}
+			event_target:rg_scion_fe = {
+				set_policy = {
+					policy = artificial_intelligence_policy
+					option = ai_servitude
+					cooldown = no
+				}
+				set_policy = {
+					policy = robot_pop_policy
+					option = robot_pops_allowed
+					cooldown = no
+				}
+				random_playable_country = {
+					limit = {
+						has_origin = rg_origin_scion
+						has_country_flag = rg_scion_needs_fe
+					}
+					remove_country_flag = rg_scion_needs_fe
+					save_event_target_as = rg_scion_slave
+				}
+				set_country_flag = rg_scion_master
+				save_event_target_as = rg_scion_master
+				add_opinion_modifier = {
+					who = event_target:rg_scion_slave
+					modifier = opinion_scion
+				}
+				# country_event = { id = origin.20 days = 9000 random = 9000 }
+				event_target:rg_scion_slave = {
+					establish_communications_no_message = event_target:rg_scion_fe
+					set_subject_of = {
+						who = event_target:rg_scion_fe
+						preset = preset_rg_scion
+					}
+					overlord = {
+						add_opinion_modifier = {
+							modifier = opinion_scion
+							who = rg_scion_fe
+						}
+					}
+					country_event = { id = rg_origin.10 days = 3 }
+				}
+			}
+			capital_scope = {
+				solar_system = {
+					set_star_flag = lgate
+					spawn_megastructure = {
+						type = lgate_base
+						orbit_angle = 225
+						orbit_distance = 30
+					}
+				}
+			}
+			# add_extra_hyperlane_to_spawned_system_effect = yes
+		}
+	}
+}
+
+# Intro Diplomatic Message
+country_event = {
+	id = rg_origin.10
+	title = TRANSMISSION
+
+	desc = {
+		text = "origin.10.b.desc"
+	}
+	diplomatic = yes
+	is_triggered_only = yes
+
+	picture_event_data = {
+		portrait = event_target:rg_scion_master
+		planet_background = event_target:rg_scion_master
+		graphical_culture = event_target:rg_scion_master
+		city_level = event_target:rg_scion_master
+		room = event_target:rg_scion_master
+	}
+
+	immediate = {
+		overlord = { save_event_target_as = rg_scion_master }
+	}
+
+	option = {
+		name = origin.10.b
+	}
+}

events/RG_planet_event.txt

@@ -0,0 +1,178 @@
+namespace = rg_planet
+
+##### Virtual Ascension Events
+
+### Create the Unemployed
+### Country scope gatekeeper
+### on_monthly_pulse_country
+country_event = {
+	id = rg_planet.5025
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+		has_country_flag = gray_habitat_active
+		exists = event_target:rg_gray_habitat_target
+		event_target:rg_gray_habitat_target = {
+			is_under_colonization = no
+			NOT = { is_planet_class = pc_cosmogenesis_world }
+			free_jobs > 0
+			NOR = {
+				free_jobs_of_type = {
+					job = mortal_initiate
+					value >= 1
+				}
+				free_jobs_of_type = {
+					category = bio_trophy
+					value >= 1
+				}
+			}
+		}
+	}
+
+	immediate = {
+		event_target:rg_gray_habitat_target = {
+			planet_event = { id = rg_planet.2027 days = 1 }
+		}
+	}
+}
+
+### Create the Unemployed
+### Planet scope gatekeeper
+### on_building_complete, on_building_upgraded, on_building_demolished,
+### on_building_downgraded, on_building_replaced
+### on_district_complete, on_district_demolished
+planet_event = {
+	id = rg_planet.2026
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+		is_same_value = event_target:rg_gray_habitat_target
+		is_under_colonization = no
+		NOT = { is_planet_class = pc_cosmogenesis_world }
+		exists = owner
+		owner = {
+			is_fallen_empire = no
+			has_country_flag = gray_habitat_active
+		}
+		free_jobs > 0
+	}
+
+	immediate = {
+		planet_event = { id = rg_planet.2027 days = 1 }
+	}
+}
+
+### Create the Unemployed
+### Fired by cybernetics.2025 and cybernetics.2026
+planet_event = {
+	id = rg_planet.2027
+	hide_window = yes
+
+	is_triggered_only = yes
+	trigger = {
+		is_same_value = event_target:rg_gray_habitat_target
+		is_under_colonization = no
+		NOT = { is_planet_class = pc_cosmogenesis_world }
+		exists = owner
+		owner = {
+			is_fallen_empire = no
+			has_country_flag = gray_habitat_active
+		}
+		free_jobs > 0
+	}
+
+	immediate = {
+		set_variable = {
+			which = num_pops
+			value = value:num_free_virtual_jobs
+		}
+		# Create pops for every free job
+		while = {
+			count = num_pops
+			create_pop = {
+				species = owner_main_species
+			}
+		}
+		# Kill pops generated in excess (e.g. from forbidden jobs)
+		if = {
+			limit = {
+				any_owned_pop = {
+					is_unemployed = yes
+				}
+			}
+			every_owned_pop = {
+				limit = {
+					is_unemployed = yes
+				}
+				kill_pop = yes
+			}
+		}
+	}
+}
+
+### Kill the unemployed
+### Country scope
+### on_monthly_pulse_country
+country_event = {
+	id = rg_planet.5030
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+		is_fallen_empire = no
+		has_country_flag = gray_habitat_active
+		event_target:rg_gray_habitat_target = {
+			any_owned_pop = {
+				is_unemployed = yes
+			}
+		}
+	}
+
+	immediate = {
+		event_target:rg_gray_habitat_target = {
+			every_owned_pop = {
+				limit = {
+					is_unemployed = yes
+				}
+				kill_pop = yes
+			}
+		}
+	}
+}
+
+### Kill the unemployed
+### Planet scope
+### on_building_complete, on_building_upgraded, on_building_demolished,
+### on_building_downgraded, on_building_replaced
+### on_district_complete, on_district_demolished
+planet_event = {
+	id = rg_planet.2031
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+		exists = owner
+		owner = {
+			is_fallen_empire = no
+			has_country_flag = gray_habitat_active
+		}
+		any_owned_pop = {
+			is_unemployed = yes
+		}
+	}
+
+	immediate = {
+		every_owned_pop = {
+			limit = {
+				is_unemployed = yes
+			}
+			kill_pop = yes
+		}
+	}
+}

events/RG_story_event.txt

@@ -1,4 +1,5 @@
 namespace = rg_story
+
 country_event = {
 	id = rg_story.2
 	title = "graygoo.500.title"
@@ -634,7 +635,6 @@ country_event = {
 	id = rg_story.20
 	hide_window = yes
 	is_triggered_only = yes
-	fire_only_once = yes
 	trigger = {
 		exists = event_target:rg_fake_dragon_owner
 		OR = {
@@ -648,8 +648,9 @@ country_event = {
 				leader = {
 					OR = {
 						exists = NO
-						NOT = {
+						NOR = {
 							has_leader_flag = rg_fake_dragon
+							has_leader_flag = rg_fake_dragon_reborn
 						}
 					}
 				}
@@ -720,8 +721,765 @@ country_event = {
 				has_special_project = RG_FAKE_DRAGON_SCAN_PROJECT
 			}
 			abort_special_project = {
-				RG_FAKE_DRAGON_SCAN_PROJECT
+				type = RG_FAKE_DRAGON_SCAN_PROJECT
 			}
 		}
 	}
 }
+
+# 开始改造
+country_event = {
+	id = rg_story.23
+	title = rg_story.23.title
+	desc = rg_story.23.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.23.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.23.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+		}
+		add_resource = {
+			energy = -1500
+			alloys = -1500
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_1_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.24
+	title = rg_story.24.title
+	desc = rg_story.24.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.24.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.24.b
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_2_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.25
+	title = rg_story.25.title
+	desc = rg_story.25.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.25.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_3_booster
+		}
+	}
+	option = {
+		name = rg_story.25.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 5000
+			}
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 5000
+			}
+		}
+		add_resource = {
+			energy = -5000
+			alloys = -5000
+		}
+		rg_create_gray_mod1_testship_1 = yes
+	}
+}
+
+country_event = {
+	id = rg_story.26
+	title = rg_story.26.title
+	desc = rg_story.26.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.26.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_4_booster
+		}
+	}
+	option = {
+		name = rg_story.26.b
+		add_resource = {
+			energy = -5000
+			alloys = -5000
+		}
+		rg_create_gray_planetkiller_testship_1 = yes
+	}
+}
+
+country_event = {
+	id = rg_story.27
+	title = rg_story.27.title
+	desc = rg_story.27.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.27.a
+		default_hide_option = yes
+
+	}
+	option = {
+		name = rg_story.27.b
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_5_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.28
+	title = rg_story.28.title
+	desc = rg_story.28.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+		enable_special_project = {
+			name = RG_GRAY_MOD1
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	option = {
+		name = rg_story.28.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_locked = yes
+			set_situation_flag = locked
+			set_situation_flag = rg_stage6_locked
+			set_situation_flag = situation_rg_gray_mod1_stage_6_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.29
+	title = rg_story.29.title
+	desc = rg_story.29.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.29.a
+		default_hide_option = yes
+	}
+}
+
+country_event = {
+	id = rg_story.30
+	title = rg_story.30.title
+	desc = rg_story.30.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.30.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.30.b
+		enable_special_project = {
+			name = rg_gray_mod2_stage1_project
+			# location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.31
+	title = rg_story.31.title
+	desc = rg_story.31.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.31.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.31.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = nanites
+				value >= 150
+			}
+		}
+		add_resource = {
+			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
+	}
+}

events/RG_wsg_graygoo_event.txt

@@ -36,7 +36,8 @@ country_event = {
 		is_same_value = event_target:gray_owner
 		NOR = {
 			has_country_flag = gray_constship_active
-			has_country_flag = gray_governor_active
+			has_country_flag = gray_official_active
+			has_country_flag = gray_governor_active #旧版flag
 			has_country_flag = gray_warship_active
 			has_country_flag = gray_army_active
 			has_country_flag = gray_reforming
@@ -49,8 +50,9 @@ country_event = {
 		name = graygoo.500.a
 		response_text = graygoo.500.a.response
 		trigger = {
-			NOT = {
-				has_country_flag = gray_governor_active
+			NOR = {
+				has_country_flag = gray_official_active
+				has_country_flag = gray_governor_active #旧版flag
 			}
 		}
 		allow = {
@@ -204,7 +206,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -238,7 +240,10 @@ country_event = {
 			}
 		}
 		is_same_value = event_target:gray_owner
-		has_country_flag = gray_governor_active
+		OR = {
+			has_country_flag = gray_official_active
+			has_country_flag = gray_governor_active #旧版flag
+		}
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -403,7 +408,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -455,7 +460,7 @@ country_event = {
 		capital_scope = {
 			solar_system = {
 				starbase = {
-					save_event_target_as = gray_owner_capital_starbase
+					save_global_event_target_as = gray_owner_capital_starbase
 				}
 			}
 		}
@@ -668,152 +673,34 @@ country_event = {
 		#升级-2
 		name = rg_levelup_2
 		trigger = {
-			event_target:gray_leader_admiral = {
-				has_skill >= 10
-			}
-			NOR = {
-				has_country_flag = rg_gray_level_2
-				has_country_flag = rg_gray_level_3
-				has_special_project = RG_GRAY_MOD1
-			}
+			RG_gray_mod1_trigger = yes
 		}
 		allow = {
-			hidden_trigger = {
-				event_target:gray_warship = {
-					num_ships > 0
-				}
-			}
-			custom_tooltip = {
-				fail_text = graygoo.500.allow.a
-				event_target:gray_warship = {
-					is_in_combat = no
-				}
-			}
-			custom_tooltip = {
-				fail_text = graygoo.500.allow.b
-				event_target:gray_warship = {
-					NOT = {
-						has_hp_percentage < 0.97
-					}
-				}
-			}
-			custom_tooltip = {
-				fail_text = requires_rg_graylevel_higherthan_25
-				event_target:gray_leader_admiral = {
-					has_skill >= 10
-				}
-			}
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 40000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 40000
-			}
-		}
-		custom_tooltip = rg_levelup_2.tooltip
-		enable_special_project = {
-			name = RG_GRAY_MOD1
-			location = event_target:gray_owner_capital_starbase
-			owner = root
-		}
-		add_resource = {
-			energy = -40000
-			alloys = -40000
+			RG_gray_mod1_allow_trigger = yes
 		}
+		RG_gray_mod1_effect = yes
 	}
 	option = {
 		#升级-3
 		name = rg_levelup_3
 		trigger = {
-			AND = {
-				event_target:gray_leader_admiral = {
-					has_skill >= 10
-				}
-				has_country_flag = rg_gray_level_2
-			}
-			NOR = {
-				has_country_flag = rg_gray_level_3
-				has_special_project = RG_GRAY_MOD2
-			}
+			RG_gray_mod2_trigger = yes
 		}
 		allow = {
-			hidden_trigger = {
-				# To prevent exploit
-				event_target:gray_warship = {
-					num_ships > 0
-				}
-			}
-			custom_tooltip = {
-				fail_text = graygoo.500.allow.a
-				event_target:gray_warship = {
-					is_in_combat = no
-				}
-			}
-			custom_tooltip = {
-				fail_text = graygoo.500.allow.b
-				event_target:gray_warship = {
-					NOT = {
-						has_hp_percentage < 0.97
-					}
-				}
-			}
-			custom_tooltip = {
-				fail_text = requires_rg_graylevel_higherthan_50
-				has_technology = tech_juggernaut
-			}
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 150000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 150000
-			}
-		}
-		custom_tooltip = rg_levelup_2.tooltip
-		enable_special_project = {
-			name = RG_GRAY_MOD2
-			location = event_target:gray_owner_capital_starbase
-			owner = root
-		}
-		add_resource = {
-			energy = -150000
-			alloys = -150000
+			RG_gray_mod2_allow_trigger = yes
 		}
+		RG_gray_mod2_effect = yes
 	}
 	option = {
-		# 购买主宰
-		name = rg_graygoo.4.d
+		#升级-4
+		name = rg_event.4.d
 		trigger = {
-			NOR = {
-				has_country_flag = gray_reforming
-				has_country_flag = rg_juggernaut_fired
-			}
-			has_country_flag = rg_gray_level_3
+			RG_gray_mod3_trigger = yes
 		}
 		allow = {
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 150000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 150000
-			}
-			has_technology = tech_juggernaut
-		}
-		custom_tooltip = rg_levelup_2.tooltip
-		enable_special_project = {
-			name = RG_GRAY_MOD3
-			location = event_target:gray_owner_capital_starbase
-			owner = root
-		}
-		add_resource = {
-			energy = -150000
-			alloys = -150000
+			RG_gray_mod3_allow_trigger = yes
 		}
+		RG_gray_mod3_effect = yes
 	}
 	option = {
 		# 开启隐形
@@ -910,7 +797,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -1271,7 +1158,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -1334,32 +1221,32 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
-	option = {
-		name = rg_graygoo.504.a
-		allow = {
-			has_country_flag = gray_reforming
-			resource_stockpile_compare = {
-				resource = nanites
-				value >= 1000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 50000
-			}
-		}
-		add_resource = {
-			nanites = -1000
-			alloys = -50000
-		}
-		remove_modifier = "gray_scattered"
-		country_event = {
-			id = graygoo.512
-		}
-	}
+	# option = {
+	# 	name = rg_graygoo.504.a
+	# 	allow = {
+	# 		has_country_flag = gray_reforming
+	# 		resource_stockpile_compare = {
+	# 			resource = nanites
+	# 			value >= 1000
+	# 		}
+	# 		resource_stockpile_compare = {
+	# 			resource = alloys
+	# 			value >= 50000
+	# 		}
+	# 	}
+	# 	add_resource = {
+	# 		nanites = -1000
+	# 		alloys = -50000
+	# 	}
+	# 	remove_modifier = "gray_scattered"
+	# 	country_event = {
+	# 		id = graygoo.512
+	# 	}
+	# }
 }
 
 # Main Menu (const)
@@ -1579,7 +1466,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}

events/z_RG_placeholder_event.txt

@@ -0,0 +1,24 @@
+namespace = wg_affection
+
+# 3.9引用空事件崩溃问题占位
+# 3.10已弃用
+# country_event = {
+# 	id = wg_affection.30000
+# 	title = wg_affection.30000.name
+# 	desc = wg_affection.30000.desc
+# 	is_triggered_only = yes
+# 	diplomatic = yes
+# 	show_sound = event_wg_wedding
+# 	custom_gui = wg_gray_commu_window
+# 	custom_gui_option = wg_gray_commu_option
+# 
+# 	immediate = {
+# 		set_country_flag = married_gray
+# 	}
+# 
+# 	option = {
+# 		name = wg_affection.30000.a
+# 		response_text = wg_affection.30000.response
+# 		change_variable = { which = rankpts value = 2 }
+# 	}
+# }

gfx/portraits/portraits/rg_portraits.txt

@@ -2,10 +2,121 @@ portraits = {
 	Gray = {
 		texturefile = "gfx/models/portraits/Gray.png"
 	}
-	Gray01 = {
-		texturefile = "gfx/models/portraits/Gray01.png"
+	rg_machine_maid01 = {
+		texturefile = "gfx/models/portraits/mamaid01.png"
 	}
-	Gray02 = {
-		texturefile = "gfx/models/portraits/Gray02.png"
+	rg_machine_maid02 = {
+		texturefile = "gfx/models/portraits/mamaid02.png"
+	}
+	rg_machine_maid03 = {
+		texturefile = "gfx/models/portraits/mamaid03.png"
+	}
+	rg_machine_maid04 = {
+		texturefile = "gfx/models/portraits/mamaid04.png"
+	}
+	rg_machine_maid05 = {
+		texturefile = "gfx/models/portraits/mamaid05.png"
+	}
+	rg_machine_maid06 = {
+		texturefile = "gfx/models/portraits/mamaid06.png"
+	}
+	rg_machine_maid07 = {
+		texturefile = "gfx/models/portraits/mamaid07.png"
+	}
+	rg_machine_maid08 = {
+		texturefile = "gfx/models/portraits/mamaid08.png"
+	}
+	rg_machine_maid09 = {
+		texturefile = "gfx/models/portraits/mamaid09.png"
 	}
 }
+
+portrait_groups = {
+	rg_machine_maid = {
+		default = rg_machine_maid01
+		game_setup = { #will run with a limited country scope. species and government is set but the country does not actually exist
+			add = {
+				portraits = {
+					rg_machine_maid01
+					rg_machine_maid02
+					rg_machine_maid03
+					rg_machine_maid04
+					rg_machine_maid05
+					rg_machine_maid06
+					rg_machine_maid07
+					rg_machine_maid08
+					rg_machine_maid09
+				}
+			}
+		}
+
+		#species scope
+		species = { #generic portrait for a species
+			add = {
+				portraits = {
+					rg_machine_maid01
+					rg_machine_maid02
+					rg_machine_maid03
+					rg_machine_maid04
+					rg_machine_maid05
+					rg_machine_maid06
+					rg_machine_maid07
+					rg_machine_maid08
+					rg_machine_maid09
+				}
+			}
+		}
+
+		#pop scope
+		pop = { #for a specific pop
+			add = {
+				portraits = {
+					rg_machine_maid01
+					rg_machine_maid02
+					rg_machine_maid03
+					rg_machine_maid04
+					rg_machine_maid05
+					rg_machine_maid06
+					rg_machine_maid07
+					rg_machine_maid08
+					rg_machine_maid09
+				}
+			}
+		}
+
+		#leader scope
+		leader = { #scientists, generals, admirals, governor
+			add = {
+				portraits = {
+					rg_machine_maid01
+					rg_machine_maid02
+					rg_machine_maid03
+					rg_machine_maid04
+					rg_machine_maid05
+					rg_machine_maid06
+					rg_machine_maid07
+					rg_machine_maid08
+					rg_machine_maid09
+				}
+			}
+		}
+
+
+		#leader scope
+		ruler = {
+			add = {
+				portraits = {
+					rg_machine_maid01
+					rg_machine_maid02
+					rg_machine_maid03
+					rg_machine_maid04
+					rg_machine_maid05
+					rg_machine_maid06
+					rg_machine_maid07
+					rg_machine_maid08
+					rg_machine_maid09
+				}
+			}
+		}
+	}
+}