暂存

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

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/component_templates/RG_interdictor_parts.txt

@@ -23,6 +23,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_FUSION_REACTOR"
 	ai_weight = {
@@ -55,6 +57,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_COLD_FUSION_REACTOR"
 	ai_weight = {
@@ -87,6 +91,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_ANTIMATTER_REACTOR"
 	ai_weight = {
@@ -119,6 +125,8 @@ utility_component_template = {
 		RG_graygoo_Buff
 		RG_graygoo_mothership
 		RG_graygoo_icebreaker_interdictor
+		RG_gray_juggernaut
+		RG_graygoo_capitalship
 	}
 	upgrades_to = "RG_Interdictor_ZERO_POINT_REACTOR"
 	ai_weight = {

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/global_ship_designs/!_RG_event_ship_designs_distant_stars_overwrite.txt

@@ -336,292 +336,60 @@ ship_design = {
 	ship_size = nanite_space_dragon_baby
 	is_event_design = yes
 	section = {
-		template = "RG_nanite_space_dragon_baby_key"
+		template = "nanite_space_dragon_baby_key"
 		slot = "mid"
 		component = {
-			slot = "PLANET_KILLER_GUN_01"
-			template = "RG_PLANET_KILLER"
-		}
-		component = {
-			slot = "TITAN_01"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_02"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_03"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_04"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_05"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "TITAN_06"
-			template = "GRAY_BEAM_STATIC_EX"
-		}
-		component = {
-			slot = "EXTRA_LARGE_01"
+			slot = "PRIMARY_GUN_01"
 			template = "GRAY_BEAM_STATIC_X"
 		}
 		component = {
-			slot = "EXTRA_LARGE_02"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_01"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_03"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_02"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_04"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_03"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_05"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_04"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_06"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_05"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_07"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_06"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "EXTRA_LARGE_08"
-			template = "GRAY_BEAM_STATIC_X"
+			slot = "SECONDARY_GUN_07"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "TORPEDO_01"
-			template = "RG_ENERGY_MISSILE"
+			slot = "SECONDARY_GUN_08"
+			template = "SMALL_GRAY_WEAPON_LANCE"
 		}
 		component = {
-			slot = "TORPEDO_02"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_03"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_04"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_05"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_06"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_07"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "TORPEDO_08"
-			template = "RG_ENERGY_MISSILE"
-		}
-		component = {
-			slot = "LARGE_GUN_01"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_02"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_03"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_04"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_05"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_06"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_07"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_08"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_09"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_10"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_11"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_12"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_13"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_14"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_15"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_16"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_17"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_18"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_19"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_20"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_21"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_22"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_23"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_24"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_25"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_26"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_27"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_28"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_29"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_30"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_31"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_32"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_33"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_34"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_35"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "LARGE_GUN_36"
-			template = "LARGE_GRAY_WEAPON_LANCE"
-		}
-		component = {
-			slot = "PD_01"
+			slot = "TERTIARY_GUN_01"
 			template = "RG_FLAK_BATTERY"
 		}
 		component = {
-			slot = "PD_02"
+			slot = "TERTIARY_GUN_02"
 			template = "RG_FLAK_BATTERY"
 		}
 		component = {
-			slot = "PD_03"
+			slot = "TERTIARY_GUN_03"
 			template = "RG_FLAK_BATTERY"
 		}
 		component = {
-			slot = "PD_04"
+			slot = "TERTIARY_GUN_04"
 			template = "RG_FLAK_BATTERY"
 		}
-		component = {
-			slot = "PD_05"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_06"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_07"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_08"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_09"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_10"
-			template = "RG_FLAK_BATTERY"
-		}
-		component = {
-			slot = "PD_11"
-			template = "RG_FLAK_PHOENIX"
-		}
-		component = {
-			slot = "PD_12"
-			template = "RG_FLAK_PHOENIX"
-		}
 		component = {
 			slot = "LARGE_UTILITY_1"
 			template = "HUGE_GRAY_MIX_ARMOR"
@@ -638,217 +406,17 @@ ship_design = {
 			slot = "LARGE_UTILITY_4"
 			template = "HUGE_GRAY_MIX_ARMOR"
 		}
-		component = {
-			slot = "LARGE_UTILITY_5"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_6"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_7"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_8"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_9"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_10"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_11"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_12"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_13"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_14"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_15"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_16"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_17"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_18"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_19"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_20"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_21"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_22"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_23"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_24"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_25"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_26"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_27"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_28"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_29"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_30"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_31"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_32"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_33"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_34"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_35"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_36"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_37"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_38"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_39"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_40"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_41"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_42"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_43"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_44"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_45"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_46"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_47"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
-		component = {
-			slot = "LARGE_UTILITY_48"
-			template = "HUGE_GRAY_MIX_ARMOR"
-		}
 		component = {
 			slot = "AUX_UTILITY_1"
 			template = "RG_AUTO_REPAIR"
 		}
 		component = {
 			slot = "AUX_UTILITY_2"
-			template = "RG_AUTO_REPAIR"
-		}
-		component = {
-			slot = "AUX_UTILITY_3"
 			template = "RG_ARMOR_BOOSTER"
 		}
-		component = {
-			slot = "AUX_UTILITY_4"
-			template = "RG_ARMOR_BOOSTER"
-		}
-		component = {
-			slot = "AUX_UTILITY_5"
-			template = "RG_ENIGMATIC_SCHEDULER"
-		}
-		component = {
-			slot = "AUX_UTILITY_6"
-			template = "RG_ENIGMATIC_SCHEDULER"
-		}
-		component = {
-			slot = "AUX_UTILITY_7"
-			template = "RG_ENGINE_BOOSTER"
-		}
-		component = {
-			slot = "AUX_UTILITY_8"
-			template = "RG_ENGINE_BOOSTER"
-		}
 	}
 	required_component = "GUARDIAN_DRIVE"
-	required_component = "COMBAT_COMPUTER_ARTILLERY_DEFAULT"
+	required_component = "RG_COMBAT_COMPUTER_battle"
 	required_component = "GUARDIAN_PROPULSION"
 	required_component = "GUARDIAN_SENSORS"
 }

common/governments/civics/!_RG_origins.txt

@@ -11,4 +11,7 @@ origin_rg_gray = {
 	random_weight = {
 		base = 0
 	}
+	playable = {
+		host_has_dlc = "Distant Stars Story Pack"
+	}
 }

common/on_actions/RG_on_actions.txt

@@ -117,7 +117,6 @@ on_destroy_planet_with_RG_PLANET_KILLER = {
 	events = {
 		RG_planet_killer.1
 		RG_planet_killer.2
-		origin.3245
 	}
 }
 
@@ -130,7 +129,6 @@ on_destroy_planet_with_RG_PLANET_KILLER_unqueued = {
 on_destroy_planet_with_RG_PLANET_KILLER_SMALL = {
 	events = {
 		RG_planet_killer.2
-		origin.3245
 	}
 }
 
@@ -190,5 +188,27 @@ on_ship_destroyed_perp = {
 		rg_skill.11
 		rg_story.10
 		rg_story.22
+		rg_skill.12
+		rg_skill.13
+	}
+}
+
+# This = owner of fleet 1 (winner)
+# From = owner of fleet 2 (loser)
+# FromFrom = fleet 1
+# FromFromFrom = fleet 2
+on_space_battle_won = {
+	events = {
+		rg_skill.14
+	}
+}
+
+# This = owner of fleet 1 (loser)
+# From = owner of fleet 2 (winner)
+# FromFrom = fleet 1
+# FromFromFrom = fleet 2
+on_space_battle_lost = {
+	events = {
+		rg_skill.15
 	}
 }

common/scripted_effects/RG_combat_skill_effects.txt

@@ -279,3 +279,10 @@ RG_leader_trait_tempest_incoming_random_kill_effect = {
 		}
 	}
 }
+
+RG_leader_trait_admiral_nanorebuild_gray_counter_init_effect = {
+	set_variable = {
+		which = rg_nanorebuild_counter
+		value = 0
+	}
+}

common/scripted_effects/RG_gray_goo_effects.txt

@@ -241,6 +241,119 @@ rg_create_gray_governor = {
 	}
 }
 
+#创造灰风总督
+rg_create_gray_governor_habitat = {
+	if = {
+		limit = {
+			has_country_flag = gray_habitat_active
+		}
+	}
+	else = {
+		#延迟执行
+		optimize_memory
+		#删除战舰
+		every_owned_fleet = {
+			limit = {
+				has_fleet_flag = gray_fleet
+			}
+			delete_fleet = {
+				target = this
+				kill_leader = no
+				destroy_template = yes
+			}
+		}
+		#删除科学舰
+		every_owned_fleet = {
+			limit = {
+				has_fleet_flag = gray_constship
+			}
+			delete_fleet = {
+				target = this
+				kill_leader = no
+				destroy_template = yes
+			}
+		}
+		#删除陆军
+		every_owned_army = {
+			limit = {
+				army_type = gray_army
+			}
+			if = {
+				limit = {
+					exists = leader
+				}
+				unassign_leader = leader
+			}
+			remove_army = yes
+		}
+		#存储当前领袖等级
+		every_owned_leader = {
+			if = {
+				###等级检测
+				limit = {
+					has_leader_flag = rg_gray_leader
+					NOT = {
+						has_leader_flag = rg_gray_leader_temp
+					}
+				}
+				#导出等级到暂存
+				export_trigger_value_to_variable = {
+					trigger = has_skill
+					variable = rg_gray_level_temp
+				}
+				#导入变量
+				owner = {
+					set_variable = {
+						which = rg_gray_level
+						value = prev.rg_gray_level_temp
+					}
+				}
+				#清理暂存区
+				clear_variable = rg_gray_level_temp
+			}
+		}
+		#把所有种类的小灰领袖都送回娘家
+		every_owned_leader = {
+			limit = {
+				has_leader_flag = rg_gray_leader
+			}
+			set_owner = event_target:rg_gray_country
+			set_leader_flag = rg_gray_leader_temp
+			# kill_leader = { show_notification = no }
+		}
+		#把娘家的总督领袖接回来
+		if = {
+			limit = {
+				exists = event_target:gray_governor
+			}
+			event_target:gray_governor = {
+				set_owner = event_target:gray_owner
+				remove_leader_flag = rg_gray_leader_temp
+			}
+		}
+		#如果不存在总督备份，现场变一个
+		else = {
+			rg_gray_govener_init = yes
+		}
+		rg_juggernaut_habitat_init = yes
+		#设置总督已启用标识
+		set_country_flag = gray_governor_active
+		set_country_flag = gray_habitat_active
+		#更新灰风形态
+		remove_country_flag = gray_warship_active
+		remove_country_flag = rg_kac_grayfleet_active
+		remove_country_flag = gray_constship_active
+		remove_country_flag = gray_army_active
+		#等级导入，把存储的领袖等级赋予到领袖身上
+		random_owned_leader = {
+			limit = {
+				has_leader_flag = gray_governor
+			}
+			set_skill = owner.rg_gray_level
+		}
+	}
+}
+
 #创造灰风战舰
 rg_create_gray_warship = {
 	if = {

common/scripted_effects/RG_gray_leader_init_effects.txt

@@ -137,7 +137,7 @@ rg_gray_govener_init = {
 			rg_set_gray_portrait = yes
 		}
 	}
-	set_global_flag = rg_kac_leader
+	
 }
 
 rg_gray_admiral_init = {
@@ -196,6 +196,7 @@ rg_gray_admiral_init = {
 				}
 				set_leader_flag = rg_gray_leader
 				add_trait_no_notify = RG_leader_trait_admiral_gray
+				add_trait_no_notify = RG_leader_trait_admiral_nanorebuild_gray
 				# 缺少特质RG_leader_trait_admiral_gray将导致小灰改造项目无法完成
 				add_trait_no_notify = subclass_admiral_aggressor
 				add_trait_no_notify = leader_trait_carrier_specialization
@@ -243,7 +244,7 @@ rg_gray_admiral_init = {
 			rg_set_gray_portrait = yes
 		}
 	}
-	set_global_flag = rg_kac_leader
+	RG_leader_trait_admiral_nanorebuild_gray_counter_init_effect = yes
 }
 
 rg_gray_general_init = {
@@ -343,7 +344,7 @@ rg_gray_general_init = {
 		which = rg_general_skill_combat_killed_variable
 		value = 0
 	}
-	set_global_flag = rg_kac_leader
+	
 }
 
 rg_gray_scientist_init = {
@@ -434,14 +435,14 @@ rg_gray_scientist_init = {
 			rg_set_gray_portrait = yes
 		}
 	}
-	set_global_flag = rg_kac_leader
+	
 }
 
 rg_gray_country_leader_init = {
 	create_leader = {
 		# 只用作看板娘
 		class = governor
-		species = root
+		species = event_target:gray_species
 		name = "NAME_Gray"
 		gender = female
 		immortal = yes

common/scripted_effects/RG_special_effects.txt

@@ -185,15 +185,6 @@ rg_create_fake_dragon = {
 				trait = RG_leader_trait_admiral_timed_life
 			}
 			effect = {
-				if = {
-					limit = {
-						has_global_flag = has_wsg_mod
-					}
-					change_leader_portrait = wg_dragon
-				}
-				else = {
-					change_leader_portrait = species
-				}
 				set_leader_flag = has_gained_level_trait
 				set_leader_flag = has_gained_trait
 				set_leader_flag = legendary_leader

common/scripted_effects/rg_gray_warship_init_effects.txt

@@ -18,6 +18,10 @@ rg_warship_init_mod1 = {
 				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 = {
@@ -58,6 +62,10 @@ rg_warship_init_mod2 = {
 				random_existing_design = RG_graygoo_capitalship
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -99,6 +107,10 @@ rg_warship_init_mod3 = {
 				random_existing_design = RG_gray_juggernaut
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -138,6 +150,10 @@ rg_warship_init_mod0 = {
 				design = "NAME_Gray_Warship_base"
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -159,3 +175,54 @@ rg_warship_init_mod0 = {
 		}
 	}
 }
+
+rg_juggernaut_habitat_init = {
+	capital_scope = {
+		save_event_target_as = rg_capital_home_planet
+	}
+	spawn_planet = {
+		class = pc_habitat
+		location = root.home_planet
+		orbit_location = yes
+		orbit_angle_offset = 45
+		orbit_distance_offset = 9.899
+		size = 20
+		has_ring = no
+
+		init_effect = {
+			set_name = "NAME_rg_gray_habitat_base"
+			set_planet_entity = {
+				entity = "grey_tempesttw_juggernaut_entity"
+			}
+			set_surveyed = {
+				surveyed = yes
+				surveyor = FROM
+			}
+			set_all_comms_surveyed = yes
+			clear_blockers = yes
+
+			set_planet_flag = megastructure
+			set_planet_flag = habitat
+			set_planet_flag = advanced_habitat
+			set_planet_flag = advanced_habitat_2
+			set_planet_flag = rg_gray_habitat
+			save_global_event_target_as = rg_gray_habitat_target
+		}
+	}
+	event_target:spawn_planet = {
+		set_planet_flag = has_megastructure
+		# set_planet_flag = has_payback_habitat
+	}
+	event_target:rg_capital_home_planet = {
+		while = {
+			count = 1
+			random_owned_pop = {
+				resettle_pop = {
+					pop = this
+					planet = event_target:rg_gray_habitat_target
+				}
+				unemploy_pop = yes
+			}
+		}
+	}
+}

common/scripted_triggers/RG_scripted_triggers.txt

@@ -1,5 +1,3 @@
-#星球无法自动建造
-#scope (planet)
 RG_planet_can_auto_build = {
 	OR = {
 		AND = {

common/traits/!_RG_gray_goo_traits.txt

@@ -102,7 +102,7 @@ RG_leader_trait_ruler_gray = {
 			}
 		}
 		# country_energy_produces_mult = -0.02
-		planet_stability_add = -2
+		planet_stability_add = -1
 		mult = owner.rg_gray_level
 	}
 	triggered_modifier = {
@@ -120,7 +120,7 @@ RG_leader_trait_ruler_gray = {
 			}
 		}
 		# country_energy_produces_mult = -0.03
-		planet_stability_add = -3.5
+		planet_stability_add = -1.5
 		mult = owner.rg_gray_level
 	}
 	triggered_modifier = {
@@ -134,7 +134,7 @@ RG_leader_trait_ruler_gray = {
 			}
 		}
 		# country_energy_produces_mult = -0.04
-		planet_stability_add = -5
+		planet_stability_add = -2
 		mult = owner.rg_gray_level
 	}
 	triggered_modifier = {
@@ -246,6 +246,32 @@ RG_leader_trait_admiral_gray = {
 	randomized = no
 }
 
+RG_leader_trait_admiral_nanorebuild_gray = {
+	#3级舰长（默认
+	cost = 0
+	inline_script = {
+		script = trait/icon_psionic
+		CLASS = admiral
+		ICON = "GFX_leader_trait_nanorebuild"
+		RARITY = paragon
+		COUNCIL = no
+		TIER = none
+	}
+	custom_tooltip_with_modifiers = RG_leader_trait_admiral_nanorebuild_effect
+	modifier = {
+		ship_armor_mult = 0.5
+		ship_hull_mult = 0.5
+		ships_upkeep_mult = -0.1
+		ship_hull_regen_add_perc = 0.5
+		ship_armor_regen_add_perc = 0.5
+	}
+	leader_class = {
+		admiral
+	}
+	initial = no
+	randomized = no
+}
+
 RG_leader_trait_scientist_gray = {
 	#科学家特质
 	cost = 0

events/RG_combat_skill_events.txt

@@ -1,96 +1,98 @@
 namespace = rg_skill
-#fleet_event = {
-#    id = rg_skill.1
-#    hide_window = yes
-#    is_triggered_only = yes
-#
-#    trigger = {
-#        NOT = { has_global_flag = rg_grayskill_cooldown }
-#        any_owned_fleet = {
-#					exists = leader
-#					leader = { has_leader_flag = gray_leader_admiral }
-#					is_in_combat = yes
-#				}
-#    }
-#
-#    immediate = {
-#		if = {
-#			limit = {
-#				any_owned_fleet = {
-#					exists = leader
-#					leader = { has_leader_flag = gray_leader_admiral }
-#					is_in_combat = yes
-#				}
-#			}
-#			random_owned_fleet = {
-#				if = {
-#					limit = { leader = { has_leader_flag = gray_leader_admiral }}
-#					save_event_target_as = gray_warship_location
-#				}
-#			}
-#			create_fleet = {
-#				name = "NAME_RG_carrier"
-#				settings = { 
-#					can_disband = yes
-#					can_upgrade = no 
-#					can_change_composition = yes 
-#					can_change_leader = no 
-#					uses_naval_capacity = no
-#					spawn_debris = no
-#				}				
-#				effect = {
-#					set_owner = event_target:gray_owner
-#					while = {
-#						count = 4
-#						create_ship = {
-#							name = random
-#							design = "RG_carrier_Interdictor"
-#							graphical_culture = "pirate_01"
-#							prefix = no
-#							upgradable = no
-#						}
-#					}
-#					set_location = {
-#						target = event_target:gray_warship_location
-#						distance = 55
-#						angle = 270
-#					}
-#					set_fleet_flag = RG_carrier_fleet
-#					save_global_event_target_as = RG_carrier_fleet
-#				}
-#			}
-#			
-#			set_timed_global_flag = { 
-#				flag = rg_grayskill_cooldown days = 120
-#			}
-#		}	
-#	}	
-#}
-#fleet_event = {
-#    id = rg_skill.2
-#    hide_window = yes
-#    is_triggered_only = yes
-#
-#    trigger = {
-#        any_owned_fleet = {
-#					has_fleet_flag = RG_carrier_fleet
-#					is_in_combat = no
-#				}
-#    }
-#
-#    immediate = {
-#		if = {
-#			limit = {
-#				any_owned_fleet = {
-#					has_fleet_flag = RG_carrier_fleet
-#					is_in_combat = no
-#				}
-#			}	
-#			event_target:RG_carrier_fleet = { delete_ship = this }	
-#		}
-#	}
-#}
-#自动星系建设
+
+# fleet_event = {
+#     id = rg_skill.1
+#     hide_window = yes
+#     is_triggered_only = yes
+# 
+#     trigger = {
+#         NOT = { has_global_flag = rg_grayskill_cooldown }
+#         any_owned_fleet = {
+# 					exists = leader
+# 					leader = { has_leader_flag = gray_leader_admiral }
+# 					is_in_combat = yes
+# 				}
+#     }
+# 
+#     immediate = {
+# 		if = {
+# 			limit = {
+# 				any_owned_fleet = {
+# 					exists = leader
+# 					leader = { has_leader_flag = gray_leader_admiral }
+# 					is_in_combat = yes
+# 				}
+# 			}
+# 			random_owned_fleet = {
+# 				if = {
+# 					limit = { leader = { has_leader_flag = gray_leader_admiral }}
+# 					save_event_target_as = gray_warship_location
+# 				}
+# 			}
+# 			create_fleet = {
+# 				name = "NAME_RG_carrier"
+# 				settings = { 
+# 					can_disband = yes
+# 					can_upgrade = no 
+# 					can_change_composition = yes 
+# 					can_change_leader = no 
+# 					uses_naval_capacity = no
+# 					spawn_debris = no
+# 				}				
+# 				effect = {
+# 					set_owner = event_target:gray_owner
+# 					while = {
+# 						count = 4
+# 						create_ship = {
+# 							name = random
+# 							design = "RG_carrier_Interdictor"
+# 							graphical_culture = "pirate_01"
+# 							prefix = no
+# 							upgradable = no
+# 						}
+# 					}
+# 					set_location = {
+# 						target = event_target:gray_warship_location
+# 						distance = 55
+# 						angle = 270
+# 					}
+# 					set_fleet_flag = RG_carrier_fleet
+# 					save_global_event_target_as = RG_carrier_fleet
+# 				}
+# 			}
+# 			
+# 			set_timed_global_flag = { 
+# 				flag = rg_grayskill_cooldown days = 120
+# 			}
+# 		}	
+# 	}	
+# }
+
+# fleet_event = {
+#     id = rg_skill.2
+#     hide_window = yes
+#     is_triggered_only = yes
+# 
+#     trigger = {
+#         any_owned_fleet = {
+# 					has_fleet_flag = RG_carrier_fleet
+# 					is_in_combat = no
+# 				}
+#     }
+# 
+#     immediate = {
+# 		if = {
+# 			limit = {
+# 				any_owned_fleet = {
+# 					has_fleet_flag = RG_carrier_fleet
+# 					is_in_combat = no
+# 				}
+# 			}	
+# 			event_target:RG_carrier_fleet = { delete_ship = this }	
+# 		}
+# 	}
+# }
+
 ship_event = {
 	id = rg_skill.3
 	hide_window = yes
@@ -106,11 +108,9 @@ ship_event = {
 		}
 		solar_system = {
 			OR = {
-				#星系无主
 				NOT = {
 					exists = space_owner
 				}
-				#星系为我方但有空间站未建造
 				AND = {
 					space_owner = {
 						is_same_empire = root.controller
@@ -120,7 +120,6 @@ ship_event = {
 					}
 				}
 			}
-			#邻国不能是军孤
 			NOT = {
 				any_neighbor_system = {
 					has_owner = yes
@@ -145,7 +144,6 @@ ship_event = {
 				}
 				solar_system = {
 					NOT = {
-						#星系内不能有敌舰
 						any_fleet_in_system = {
 							exists = controller
 							controller = {
@@ -155,7 +153,6 @@ ship_event = {
 					}
 				}
 			}
-			#创建自动工程船暂存国家
 			RG_const_auto_build_effect_event = yes
 		}
 		else_if = {
@@ -168,8 +165,7 @@ ship_event = {
 				}
 				solar_system = {
 					has_star_flag = lcluster
-					NOT = {
-						#星系内不能有敌舰		
+					NOT = {	
 						any_fleet_in_system = {
 							exists = controller
 							controller = {
@@ -179,7 +175,6 @@ ship_event = {
 					}
 				}
 			}
-			#创建自动工程船暂存国家
 			RG_const_auto_build_effect_event = yes
 		}
 		else_if = {
@@ -190,8 +185,7 @@ ship_event = {
 				}
 				solar_system = {
 					# has_star_flag = lcluster
-					NOT = {
-						#星系内不能有敌舰		
+					NOT = {	
 						any_fleet_in_system = {
 							exists = controller
 							controller = {
@@ -201,10 +195,8 @@ ship_event = {
 					}
 				}
 			}
-			#创建自动工程船暂存国家
 			RG_const_auto_build_effect_event = yes
 		}
-		#循环检查
 		ship_event = {
 			id = rg_skill.3
 			days = 10
@@ -605,3 +597,189 @@ country_event = {
 		}
 	}
 }
+
+# 纳米重塑
+# This = owner of ship 1 (combatant)
+# From = owner of ship 2 (destroyed)
+# FromFrom = ship 1
+# FromFromFrom = ship 2
+country_event = {
+	id = rg_skill.12
+	hide_window = yes
+	is_triggered_only = yes
+	trigger = {
+		FromFromFrom = {
+			is_in_combat = yes
+			NOT = {
+				is_same_value = event_target:gray_warship_ship
+			}
+			exists = fleet.leader
+		}
+		FromFromFrom.fleet.leader = {
+			has_trait = RG_leader_trait_admiral_nanorebuild_gray
+		}
+	}
+	immediate = {
+		if = {
+			limit = {
+				From = {
+					check_variable = {
+						which = rg_nanorebuild_counter
+						value >= 1
+					}
+				}
+			}
+			FromFromFrom = {
+				save_event_target_as = event_ship
+			}
+			FromFromFrom.fleet = {
+				create_ship = {
+					name = event_target:event_ship
+					design = event_target:event_ship
+				}
+			}
+			From = {
+				change_variable = {
+					which = rg_nanorebuild_counter
+					value = -1
+				}
+			}
+		}
+	}
+}
+
+# country_event = {
+# 	id = rg_skill.13
+# 	hide_window = yes
+# 	is_triggered_only = yes
+# 	trigger = {
+# 		FromFromFrom = {
+# 			is_in_combat = yes
+# 		}
+# 		FromFrom.solar_system = {
+# 			any_fleet_in_system = {
+# 				leader = {
+# 					has_trait = RG_leader_trait_admiral_nanorebuild_gray
+# 				}
+# 			}
+# 		}
+# 		this = {
+# 			NOT = {
+# 				is_same_value = event_target:gray_owner
+# 				is_in_federation_with = event_target:gray_owner
+# 			}
+# 		}
+# 	}
+# 	immediate = {
+# 		event_target:gray_owner = {
+# 			change_variable = {
+# 				which = rg_nanorebuild_counter
+# 				value = 1
+# 			}
+# 		}
+# 	}
+# }
+
+# On destroying enemy ship.
+country_event = {
+	id = rg_skill.13
+	hide_window = yes
+	is_triggered_only = yes
+
+	trigger = {
+		FromFrom = {
+			is_in_combat = yes
+			exists = fleet.leader
+		}
+		FromFrom.fleet.leader = {
+			has_trait = RG_leader_trait_admiral_nanorebuild_gray
+		}
+	}
+
+	immediate = {
+		FROMFROM = { # Winning ship.
+			if = {
+				limit = { exists = fleet.leader }
+				fleet.leader = {
+					if = {
+						limit = {
+							OR = {
+								has_trait = RG_leader_trait_admiral_nanorebuild_gray
+							}
+						}
+						ROOT = {
+							change_variable = {
+								which = rg_nanorebuild_counter
+								value = 1
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+# This = owner of fleet 1 (winner)
+# From = owner of fleet 2 (loser)
+# FromFrom = fleet 1
+# FromFromFrom = fleet 2
+country_event = {
+	id = rg_skill.14
+	hide_window = yes
+	is_triggered_only = yes
+	trigger = {
+		OR = {
+			fromfrom.leader = {
+				has_trait = RG_leader_trait_admiral_nanorebuild_gray
+			}
+		}
+		NOT = {
+			This = {
+				check_variable = {
+					which = rg_nanorebuild_counter
+					value = 0
+				}
+			}
+		}
+	}
+	immediate = {
+		This = {
+			set_variable = {
+				which = rg_nanorebuild_counter
+				value = 0
+			}
+		}
+	}
+}
+# This = owner of fleet 1 (loser)
+# From = owner of fleet 2 (winner)
+# FromFrom = fleet 1
+# FromFromFrom = fleet 2
+country_event = {
+	id = rg_skill.15
+	hide_window = yes
+	is_triggered_only = yes
+	trigger = {
+		OR = {
+			fromfrom.leader = {
+				has_trait = RG_leader_trait_admiral_nanorebuild_gray
+			}
+		}
+		NOT = {
+			This = {
+				check_variable = {
+					which = rg_nanorebuild_counter
+					value = 0
+				}
+			}
+		}
+	}
+	immediate = {
+		This = {
+			set_variable = {
+				which = rg_nanorebuild_counter
+				value = 0
+			}
+		}
+	}
+}

events/RG_story_event.txt

@@ -725,4 +725,761 @@ country_event = {
 			}
 		}
 	}
+}
+
+# 开始改造
+country_event = {
+	id = rg_story.23
+	title = rg_story.23.title
+	desc = rg_story.23.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.23.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.23.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+		}
+		add_resource = {
+			energy = -1500
+			alloys = -1500
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_1_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.24
+	title = rg_story.24.title
+	desc = rg_story.24.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.24.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.24.b
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_2_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.25
+	title = rg_story.25.title
+	desc = rg_story.25.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.25.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_3_booster
+		}
+	}
+	option = {
+		name = rg_story.25.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 5000
+			}
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 5000
+			}
+		}
+		add_resource = {
+			energy = -5000
+			alloys = -5000
+		}
+		rg_create_gray_mod1_testship_1 = yes
+	}
+}
+
+country_event = {
+	id = rg_story.26
+	title = rg_story.26.title
+	desc = rg_story.26.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.26.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_4_booster
+		}
+	}
+	option = {
+		name = rg_story.26.b
+		add_resource = {
+			energy = -5000
+			alloys = -5000
+		}
+		rg_create_gray_planetkiller_testship_1 = yes
+	}
+}
+
+country_event = {
+	id = rg_story.27
+	title = rg_story.27.title
+	desc = rg_story.27.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.27.a
+		default_hide_option = yes
+
+	}
+	option = {
+		name = rg_story.27.b
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_flag = situation_rg_gray_mod1_stage_5_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.28
+	title = rg_story.28.title
+	desc = rg_story.28.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+		enable_special_project = {
+			name = RG_GRAY_MOD1
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	option = {
+		name = rg_story.28.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod1
+			}
+			set_situation_locked = yes
+			set_situation_flag = locked
+			set_situation_flag = rg_stage6_locked
+			set_situation_flag = situation_rg_gray_mod1_stage_6_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.29
+	title = rg_story.29.title
+	desc = rg_story.29.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_2
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.29.a
+		default_hide_option = yes
+	}
+}
+
+country_event = {
+	id = rg_story.30
+	title = rg_story.30.title
+	desc = rg_story.30.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.30.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.30.b
+		enable_special_project = {
+			name = rg_gray_mod2_stage1_project
+			# location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.31
+	title = rg_story.31.title
+	desc = rg_story.31.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.31.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.31.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = nanites
+				value >= 150
+			}
+		}
+		add_resource = {
+			resource = nanites
+			value = -150
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_2_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.32
+	title = rg_story.32.title
+	desc = rg_story.32.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.32.a
+		default_hide_option = yes
+	}
+}
+
+country_event = {
+	id = rg_story.33
+	title = rg_story.33.title
+	desc = rg_story.33.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.33.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.33.b
+		enable_special_project = {
+			name = rg_gray_mod2_stage4_project
+			# location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.34
+	title = rg_story.34.title
+	desc = rg_story.34.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.34.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.34.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+		}
+		add_resource = {
+			resource = alloys
+			value = -1500
+		}
+		add_resource = {
+			resource = energy
+			value = -1500
+		}
+		rg_create_gray_mod1_testship_2 = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_5_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.35
+	title = rg_story.35.title
+	desc = rg_story.35.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.35.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.35.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+		}
+		add_resource = {
+			resource = alloys
+			value = -1500
+		}
+		add_resource = {
+			resource = energy
+			value = -1500
+		}
+		rg_create_gray_mod1_testship_2 = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_6_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.36
+	title = rg_story.36.title
+	desc = rg_story.36.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.36.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.36.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 4000
+			}
+			resource_stockpile_compare = {
+				resource = minerals
+				value >= 1500
+			}
+		}
+		add_resource = {
+			resource = energy
+			value = -4000
+		}
+		add_resource = {
+			resource = minerals
+			value = -1500
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_7_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.37
+	title = rg_story.37.title
+	desc = rg_story.37.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.37.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.37.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = consumer_goods
+				value >= 3000
+			}
+		}
+		add_resource = {
+			resource = consumer_goods
+			value = -3000
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_8_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.38
+	title = rg_story.38.title
+	desc = rg_story.38.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.38.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.38.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 1500
+			}
+			resource_stockpile_compare = {
+				resource = energy
+				value >= 1500
+			}
+		}
+		add_resource = {
+			resource = alloys
+			value = -1500
+		}
+		add_resource = {
+			resource = energy
+			value = -1500
+		}
+		rg_create_gray_mod1_testship_2 = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_9_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.39
+	title = rg_story.39.title
+	desc = rg_story.39.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.39.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.39.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = alloys
+				value >= 3000
+			}
+		}
+		add_resource = {
+			resource = alloys
+			value = -3000
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_10_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.40
+	title = rg_story.40.title
+	desc = rg_story.40.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.40.a
+		default_hide_option = yes
+	}
+	option = {
+		name = rg_story.40.b
+		allow = {
+			resource_stockpile_compare = {
+				resource = nanites
+				value >= 500
+			}
+		}
+		add_resource = {
+			resource = alloys
+			value = -500
+		}
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_flag = situation_rg_gray_mod2_stage_11_booster
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.41
+	title = rg_story.41.title
+	desc = rg_story.41.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+		enable_special_project = {
+			name = RG_GRAY_MOD2
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	option = {
+		name = rg_story.41.a
+		default_hide_option = yes
+		random_situation = {
+			limit = {
+				is_situation_type = situation_rg_gray_mod2
+			}
+			set_situation_locked = yes
+			set_situation_flag = locked
+			set_situation_flag = rg_stage6_locked
+		}
+	}
+}
+
+country_event = {
+	id = rg_story.42
+	title = rg_story.42.title
+	desc = rg_story.42.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+	}
+	option = {
+		name = rg_story.42.a
+		default_hide_option = yes
+	}
+}
+
+country_event = {
+	id = rg_story.43
+	title = rg_story.43.title
+	desc = rg_story.43.desc
+	picture = GFX_evt_gray_goo_ships
+	show_sound = event_radio_chatter
+	is_triggered_only = yes
+	trigger = {
+		NOR = {
+			has_country_flag = rg_gray_level_1
+			has_country_flag = rg_gray_level_3
+		}
+	}
+	immediate = {
+		enable_special_project = {
+			name = RG_GRAY_MOD3
+			location = event_target:gray_owner_capital_starbase
+			owner = event_target:gray_owner
+		}
+	}
+	option = {
+		name = rg_story.43.a
+		default_hide_option = yes
+	}
 }

events/rg_gray_mod_story_event.txt

@@ -1,745 +0,0 @@
-namespace = rg_story
-
-# 开始改造
-country_event = {
-	id = rg_story.23
-	title = rg_story.23.title
-	desc = rg_story.23.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.23.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.23.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 1500
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 1500
-			}
-		}
-		add_resource = {
-			energy = -1500
-			alloys = -1500
-		}
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_1_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.24
-	title = rg_story.24.title
-	desc = rg_story.24.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.24.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.24.b
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_2_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.25
-	title = rg_story.25.title
-	desc = rg_story.25.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.25.a
-		default_hide_option = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_3_booster
-		}
-	}
-	option = {
-		name = rg_story.25.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = energy
-				value >= 5000
-			}
-			resource_stockpile_compare = {
-				resource = alloys
-				value >= 5000
-			}
-		}
-		add_resource = {
-			energy = -5000
-			alloys = -5000
-		}
-		rg_create_gray_mod1_testship_1 = yes
-	}
-}
-
-country_event = {
-	id = rg_story.26
-	title = rg_story.26.title
-	desc = rg_story.26.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.26.a
-		default_hide_option = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_4_booster
-		}
-	}
-	option = {
-		name = rg_story.26.b
-		add_resource = {
-			energy = -5000
-			alloys = -5000
-		}
-		rg_create_gray_planetkiller_testship_1 = yes
-	}
-}
-
-country_event = {
-	id = rg_story.27
-	title = rg_story.27.title
-	desc = rg_story.27.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.27.a
-		default_hide_option = yes
-
-	}
-	option = {
-		name = rg_story.27.b
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_flag = situation_rg_gray_mod1_stage_5_booster
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.28
-	title = rg_story.28.title
-	desc = rg_story.28.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.28.a
-		default_hide_option = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod1
-			}
-			set_situation_locked = yes
-			set_situation_flag = locked
-			set_situation_flag = rg_stage6_locked
-			set_situation_flag = situation_rg_gray_mod1_stage_6_booster
-		}
-		enable_special_project = {
-			name = RG_GRAY_MOD1
-			location = event_target:gray_owner_capital_starbase
-			owner = event_target:gray_owner
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.29
-	title = rg_story.29.title
-	desc = rg_story.29.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_2
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.29.a
-		default_hide_option = yes
-	}
-}
-
-country_event = {
-	id = rg_story.30
-	title = rg_story.30.title
-	desc = rg_story.30.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.30.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.30.b
-		enable_special_project = {
-			name = rg_gray_mod2_stage1_project
-			# location = event_target:gray_owner_capital_starbase
-			owner = event_target:gray_owner
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.31
-	title = rg_story.31.title
-	desc = rg_story.31.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.31.a
-		default_hide_option = yes
-	}
-	option = {
-		name = rg_story.31.b
-		allow = {
-			resource_stockpile_compare = {
-				resource = 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 = {
-	}
-	option = {
-		name = rg_story.41.a
-		default_hide_option = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod2
-			}
-			set_situation_locked = yes
-			set_situation_flag = locked
-			set_situation_flag = rg_stage6_locked
-		}
-		enable_special_project = {
-			name = RG_GRAY_MOD2
-			location = event_target:gray_owner_capital_starbase
-			owner = event_target:gray_owner
-		}
-	}
-}
-
-country_event = {
-	id = rg_story.42
-	title = rg_story.42.title
-	desc = rg_story.42.desc
-	picture = GFX_evt_gray_goo_ships
-	show_sound = event_radio_chatter
-	is_triggered_only = yes
-	trigger = {
-		NOR = {
-			has_country_flag = rg_gray_level_1
-			has_country_flag = rg_gray_level_3
-		}
-	}
-	immediate = {
-	}
-	option = {
-		name = rg_story.42.a
-		default_hide_option = yes
-		random_situation = {
-			limit = {
-				is_situation_type = situation_rg_gray_mod2
-			}
-			set_situation_locked = yes
-			set_situation_flag = locked
-			set_situation_flag = rg_stage6_locked
-		}
-		enable_special_project = {
-			name = RG_GRAY_MOD2
-			location = event_target:gray_owner_capital_starbase
-			owner = event_target:gray_owner
-		}
-	}
-}

interface/icons/traits/rg_leader_traits.gfx

@@ -0,0 +1,6 @@
+spriteTypes = {
+	spriteType = {
+		name = "GFX_leader_trait_nanorebuild"
+		texturefile = "gfx/interface/icons/traits/leader_trait_icons/nanorebuild.dds"
+	}
+}

kac_anticheat/kac_ads_compact_log.txt

@@ -1,187 +0,0 @@
-# © kac ads 主动防御系统。
-# 主动兼容性筛查只能在我所订阅的mod范围内进行。有漏网之鱼很正常。
-# 主动兼容性筛查只标记我认为不应该被覆盖的文件。
-# 唔姆。
-kac_ads.1 = {
-	name = "碧蓝航线"
-	supported_version = "3.*.*"
-	remote_file_id = "2020164764"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2020164764"
-	compact_file = {
-		!!azur_R_ships_designs.txt
-		azur_R_graygoo_sizes.txt
-		adt_ship_designs_distars.txt
-		gray_goo.txt
-	}
-	overwritten_id = {
-		ship_design = "NAME_Gray_Warship"
-	}
-	active_flag = {
-		exist = have_azur_R_fallen
-	}
-	desc = {
-		# 描述：小灰战舰设计会被魔怔人强覆盖。
-		# 处理方法：弹窗提醒
-		# 判断结果：小灰舰船设计被该mod覆盖，但大体上不影响游玩
-	}
-}
-
-kac_ads.2 = {
-	name = "Warship Girls R And MIST Species"
-	supported_version = "3.8.*"
-	remote_file_id = "1747099270"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=1747099270"
-	compact_file = {
-		00_wg_event_ship_designs_distant_stars.txt
-		scripted_effects_override.txt
-		00_wg_gray_goo_events.txt
-	}
-	overwritten_id = {
-	}
-	active_flag = {
-		exist = has_wsg_mod
-	}
-	desc = {
-		# 描述：小灰事件和设计重复。
-		# 处理方法：已经主动兼容
-		# 判断结果：会被本mod覆盖，不影响游玩。
-	}
-}
-
-kac_ads.3 = {
-	name = "A Deadly Tempest [3.8.☠]"
-	supported_version = "3.8.*"
-	remote_file_id = "2028826064"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2028826064"
-	compact_file = {
-		adt_ship_designs_distars.txt
-		gray_goo_effects_override.txt
-		3_gray_goo_events.txt
-		01_lcluster_+_event_override.txt
-		01_gray_goo_events_override.txt
-		# ~gray_goo_country_type.txt
-		z_graygoo_ships.txt
-		*
-	}
-	overwritten_id = {
-	}
-	active_flag = {
-		exist = a_deadly_tempest_mod_active
-	}
-	desc = {
-		# 描述：小灰事件和设计重复。大量事件重复。
-		# 处理方法：弹窗提醒
-		# 判断结果：太多了查不过来，可能会出问题。
-	}
-}
-
-kac_ads.4 = {
-	name = "( Twinks Dessanu )"
-	supported_version = "3.0.*"
-	remote_file_id = "2285039543"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2285039543"
-	compact_file = {
-		000_nanite_ship_designs.txt
-		gray_goo_nanite_effects.txt
-	}
-	overwritten_id = {
-	}
-	desc = {
-		# 描述：小灰战舰设计，小灰生成函数重复，并且原作者噶了。
-		# 处理方法：不做处理
-		# 判断结果：会被本mod覆盖，不影响游玩。
-	}
-}
-
-kac_ads.5 = {
-	name = "KDC Story Pack"
-	supported_version = "3.7.*"
-	remote_file_id = "2737603165"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2737603165"
-	compact_file = {
-		00_wg_event_ship_designs_distant_stars.txt
-		z_kdc_scripted_effects_override.txt
-	}
-	overwritten_id = {
-	}
-	desc = {
-		# 描述：小灰战舰设计，小灰生成函数重复。
-		# 处理方法：已经主动兼容
-		# 判断结果：会被本mod覆盖，不影响游玩。
-	}
-}
-
-kac_ads.6 = {
-	name = "Gray  with animated portrait"
-	supported_version = "3.8.3"
-	remote_file_id = "2976454692"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2976454692"
-	compact_file = {
-		gray_goo_effects.txt
-		gray_goo_events.txt
-	}
-	overwritten_id = {
-	}
-	desc = {
-		# 描述：小灰事件，小灰生成函数重复。该mod的Gray.dds瞎猫碰上死耗子一样替换了本mod的默认立绘。
-		# 处理方法：不做处理
-		# 判断结果：会被本mod覆盖，不影响游玩。
-	}
-}
-
-kac_ads.7 = {
-	name = "BRC United Fleet"
-	supported_version = "3.6.*"
-	remote_file_id = "2923867738"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2923867738"
-	compact_file = {
-		00_wg_gray_goo_events.txt
-	}
-	overwritten_id = {
-	}
-	desc = {
-		# 描述：小灰事件重复。
-		# 处理方法：不做处理
-		# 判断结果：会被本mod覆盖，不影响游玩。
-	}
-}
-
-kac_ads.9 = {
-	name = "L-Cluster Plus"
-	supported_version = "3.7.*"
-	remote_file_id = "2293169684"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2293169684"
-	compact_file = {
-		01_l_cluster_plus_distar_overwrite_events.txt
-		01_l_cluster_plus_graygoo_overwrite_events.txt
-		000_nanite_ship_designs.txt
-	}
-	overwritten_id = {
-	}
-	desc = {
-		# 描述：L星团事件重复。
-		# 处理方法：不做处理
-		# 判断结果：会被本mod覆盖，不影响游玩。
-	}
-}
-
-kac_ads.8 = {
-	name = "!CM伞の天灾之主(旧)!"
-	supported_version = "2.8.*"
-	remote_file_id = "2411774658"
-	remote_file_link = "https://steamcommunity.com/sharedfiles/filedetails/?id=2411774658"
-	compact_file = {
-		z_cm_ships_overwrite.txt
-		*
-	}
-	overwritten_id = {
-	}
-	active_flag = {
-		exist = z_cm_installed
-	}
-	desc = {
-		# 描述：灰蛊事件冲突，舰船设计覆盖，并且小伞已经不管这个mod了
-		# 处理方法：弹窗提醒
-		# 判断结果：可能会出问题，不过可能没人会开一个2.8的mod。
-	}
-}

localisation/simp_chinese/RG_l_simp_chinese.yml

@@ -18,6 +18,9 @@
  RG_leader_trait_general_gray_skill:0 "§Y风暴将至§!"
  RG_leader_trait_general_gray_skill_desc:0 "灰色风暴在L星团中席卷无数纪元。倘若风暴再度到来，想必那星球上的人们所看到的景色一定永生难忘吧。"
  RG_leader_trait_tempest_incoming_effect:0 "\n$t$§Y每击杀一个敌军单位§!：\n$tt$§G  额外陆军伤害 +5%§!\n§G  额外陆军生命值 +5%§!$t$\n当前BUFF层数：§G[owner.rg_general_skill_combat_daypassed_variable]§!£time£\n$tt$§G直接击杀一支敌对陆军的概率增加：§!§Y1%§!\n当前概率为：§R[owner.rg_general_skill_combat_killed_variable]%§!"
+ RG_leader_trait_admiral_nanorebuild_gray:0 "§Y灰质重塑§!"
+ RG_leader_trait_admiral_nanorebuild_gray_desc:0 "分解与重组，纳米机器席卷之处我们无所不能。"
+ RG_leader_trait_admiral_nanorebuild_effect:0 "\n$t$§Y每击杀一个敌军单位§!：\n$t$§G重组计数器 +1§!\n$t$当前计数器层数：§G[owner.rg_nanorebuild_counter]§!\n$tt$§Y该领袖所在舰队损失舰船时：消耗1计数器层数立即重塑舰船。灰风母舰无法被该技能重组。§!"
 
  SMALL_GRAY_MIX_ARMOR:0 "§Y纳米能量装甲§!"
  MEDIUM_GRAY_MIX_ARMOR:0 "§Y纳米能量装甲§!"

localisation/simp_chinese/RG_ships_l_simp_chinese.yml

@@ -61,3 +61,5 @@
  NAME_RG_Nanite_Dragon:0 "§Y模拟模拟龙§!"
  Name_rg_fake_dragon:0 "§Y模拟龙§!"
  NAME_RG_FAKE_Dragon:0 "龙之幼体"
+ NAME_rg_gray_habitat:0 "纳米机器核心站点"
+ NAME_rg_gray_habitat_base:0 "纳-迪-沙空间站点"