common/bombardment_stances/!_RG_bombardment_stances.txt

@@ -24,7 +24,6 @@
 #		weight = 1
 #	}
 #}
-
 graygoo = {
 	trigger = {
 		owner = {
@@ -33,20 +32,14 @@ graygoo = {
 	}
 	icon_frame = 3
 	default = no
-
 	stop_when_armies_dead = no
-	stop_when_ground_combat = no
 	abduct_pops = no
-
 	planet_damage = 100
 	army_damage = 2
-
 	kill_pop_chance = {
 		base = 3
 	}
 	min_pops_to_kill_pop = 0
-	kill_pop_amount = { min = 0 max = 200 }
-
 	# root = fleet
 	# from = planet
 	ai_weight = {

common/buildings/RG_nano_buildings.txt

@@ -61,7 +61,7 @@ building_rg_nanolab_1 = {
 			# 	is_individual_machine = yes
 			# }
 		}
-		job_nanotech_researcher_add = 800
+		job_nanotech_researcher_add = 8
 	}
 
 	# triggered_desc = {
@@ -153,7 +153,7 @@ building_rg_nanolab_2 = {
 			# 	is_individual_machine = yes
 			# }
 		}
-		job_nanotech_researcher_add = 1500
+		job_nanotech_researcher_add = 15
 	}
 
 	# triggered_desc = {

common/component_templates/RG_shelter_error.txt

@@ -1,83 +0,0 @@
-utility_component_template = {
-	key = "rg_ship_aura_components_empty"
-	size = medium
-	icon = "GFX_ship_part_empty_ftl_drive"
-	icon_frame = 1
-	power = 0
-
-	component_set = "ship_aura_components"
-
-	ai_weight = {
-		weight = 0
-	}
-}
-
-utility_component_template = {
-	key = "rg_power_core_empty"
-	size = medium
-	icon = "GFX_ship_part_empty_ftl_drive"
-	icon_frame = 1
-	power = 0
-
-	component_set = "power_core"
-
-	ai_weight = {
-		weight = 0
-	}
-}
-
-utility_component_template = {
-	key = "rg_ftl_components_empty"
-	size = medium
-	icon = "GFX_ship_part_empty_ftl_drive"
-	icon_frame = 1
-	power = 0
-
-	component_set = "ftl_components"
-
-	ai_weight = {
-		weight = 0
-	}
-}
-
-utility_component_template = {
-	key = "rg_thruster_components_empty"
-	size = medium
-	icon = "GFX_ship_part_empty_ftl_drive"
-	icon_frame = 1
-	power = 0
-
-	component_set = "thruster_components"
-
-	ai_weight = {
-		weight = 0
-	}
-}
-
-utility_component_template = {
-	key = "rg_sensor_component_empty"
-	size = medium
-	icon = "GFX_ship_part_empty_ftl_drive"
-	icon_frame = 1
-	power = 0
-
-	component_set = "sensor_components"
-
-	ai_weight = {
-		weight = 0
-	}
-}
-
-utility_component_template = {
-	key = "rg_combat_computers_empty"
-	size = medium
-	icon = "GFX_ship_part_empty_ftl_drive"
-	icon_frame = 1
-	power = 0
-
-	component_set = "combat_computers"
-
-	ai_weight = {
-		weight = 0
-	}
-}

common/component_templates/RG_ship_parts.txt

@@ -1988,47 +1988,6 @@ utility_component_template = {
 	}
 }
 
-utility_component_template = {
-	key = "RG_STARBASE_AURA_FTL_INHIBITOR"
-	size = medium
-	icon = "GFX_ship_part_aura_snare"
-	icon_frame = 1
-	power = 0
-
-	size_restriction = {
-		RG_gray_juggernaut
-	}
-	prerequisites = { "tech_ftl_inhibitor" }
-	component_set = "ftl_inhibitor"
-
-	ftl_inhibitor = yes
-
-	hostile_aura = {
-		name = "aura_starbase_ftl_inhibitor"
-		system_wide = yes
-
-		stack_info = {
-			id = hostile_flt_inhibitor_aura
-			priority = 10
-		}
-
-		modifier = {
-			ship_emergency_ftl_min_days_mult = 1
-		}
-
-		graphics = {
-			ship_effect = {
-				entity = "ship_aura_negative_entity"
-				dynamic_scale = no
-			}
-		}
-	}
-
-	ai_weight = {
-		weight = 2
-	}
-}
-
 #笨蛋雷达
 weapon_component_template = {
 	key = "RG_ANTIBAKAHALO_RADAR"

common/districts/rg_station_districts.txt

@@ -9,13 +9,6 @@ district_rg_city = {
 	is_capped_by_modifier = no
 	exempt_from_ai_planet_specialization = yes
 
-	# TODO_CD: change to real slots
-	zone_slots = {
-		slot_city_government
-		slot_rg_city_01
-		slot_rg_city_02
-	}
-
 	show_on_uncolonized = {
 		exists = from
 		from = { is_regular_empire = yes }
@@ -45,9 +38,9 @@ district_rg_city = {
 	}
 
 	planet_modifier = {
-		planet_housing_add = 3000
-		job_enforcer_add = @base_district_jobs
-		zone_building_slots_add = 2
+		planet_housing_add = 25
+		job_enforcer_add = 2
+		planet_max_buildings_add = 2
 	}
 
 	triggered_planet_modifier = {
@@ -58,7 +51,7 @@ district_rg_city = {
 			}
 		}
 		modifier = {
-			planet_housing_add = -500
+			planet_housing_add = -5
 		}
 	}
 
@@ -71,7 +64,8 @@ district_rg_city = {
 			}
 		}
 		modifier = {
-			job_clerk_add = 300
+			job_clerk_add = 2
+			job_culture_worker_add = 1
 		}
 	}
 
@@ -85,7 +79,8 @@ district_rg_city = {
 			}
 		}
 		modifier = {
-			job_clerk_add = 600
+			job_clerk_add = 4
+			job_culture_worker_add = 2
 		}
 	}
 
@@ -95,7 +90,7 @@ district_rg_city = {
 			owner = { has_active_tradition = tr_prosperity_public_works }
 		}
 		modifier = {
-			planet_housing_add = 500
+			planet_housing_add = 5
 		}
 	}
 
@@ -107,7 +102,7 @@ district_rg_city = {
 			}
 		}
 		modifier = {
-			planet_housing_add = 500
+			planet_housing_add = 5
 		}
 	}
 
@@ -120,7 +115,7 @@ district_rg_city = {
 			}
 		}
 		modifier = {
-			planet_housing_add = 500
+			planet_housing_add = 5
 		}
 	}
 
@@ -149,13 +144,6 @@ district_rg_hive = {
 	is_capped_by_modifier = no
 	exempt_from_ai_planet_specialization = yes
 
-	# TODO_CD: change to real slots
-	zone_slots = {
-		slot_city_government
-		slot_rg_city_01
-		slot_rg_city_02
-	}
-
 	show_on_uncolonized = {
 		exists = from
 		from = { is_hive_empire = yes }
@@ -185,9 +173,10 @@ district_rg_hive = {
 	}
 
 	planet_modifier = {
-		planet_housing_add = 3000
-		# job_synapse_drone_add = 2
-		zone_building_slots_add = 2
+		planet_housing_add = 30
+		job_maintenance_drone_add = 15
+		job_synapse_drone_add = 2
+		planet_max_buildings_add = 2
 	}
 
 	triggered_planet_modifier = {
@@ -196,7 +185,7 @@ district_rg_hive = {
 			owner = { has_technology = tech_housing_1 }
 		}
 		modifier = {
-			planet_housing_add = 500
+			planet_housing_add = 5
 		}
 	}
 
@@ -206,8 +195,8 @@ district_rg_hive = {
 			owner = { has_technology = tech_housing_2 }
 		}
 		modifier = {
-			planet_housing_add = 500
-			job_coordinator_add = @base_district_jobs
+			planet_housing_add = 5
+			job_maintenance_drone_add = 5
 		}
 	}
 
@@ -217,7 +206,7 @@ district_rg_hive = {
 			owner = { has_active_tradition = tr_prosperity_extended_hives }
 		}
 		modifier = {
-			planet_housing_add = 500
+			planet_housing_add = 5
 		}
 	}
 
@@ -238,13 +227,6 @@ district_rg_nexus = {
 	is_capped_by_modifier = no
 	exempt_from_ai_planet_specialization = yes
 
-	# TODO_CD: change to real slots
-	zone_slots = {
-		slot_city_government
-		slot_rg_city_01
-		slot_rg_city_02
-	}
-
 	show_on_uncolonized = {
 		exists = from
 		from = { is_machine_empire = yes }
@@ -274,9 +256,10 @@ district_rg_nexus = {
 	}
 
 	planet_modifier = {
-		planet_housing_add = 3000
-		job_technician_drone_add = @base_district_jobs
-		zone_building_slots_add = 2
+		planet_housing_add = 25
+		job_maintenance_drone_add = 10
+		job_coordinator_add = 2
+		planet_max_buildings_add = 2
 	}
 
 	triggered_planet_modifier = {
@@ -285,7 +268,7 @@ district_rg_nexus = {
 			owner = { has_technology = tech_housing_1 }
 		}
 		modifier = {
-			planet_housing_add = 500
+			planet_housing_add = 5
 		}
 	}
 
@@ -295,7 +278,18 @@ district_rg_nexus = {
 			owner = { has_technology = tech_housing_2 }
 		}
 		modifier = {
-			planet_housing_add = 500
+			planet_housing_add = 5
+			job_maintenance_drone_add = 5
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_active_tradition = tr_virtuality_4 }
+		}
+		modifier = {
+			job_maintenance_drone_add = 10
 		}
 	}
 
@@ -305,7 +299,7 @@ district_rg_nexus = {
 			owner = { has_active_tradition = tr_prosperity_optimized_nexus }
 		}
 		modifier = {
-			planet_housing_add = 500
+			planet_housing_add = 5
 		}
 	}
 
@@ -325,11 +319,6 @@ district_rg_generator = {
 	base_buildtime = 30
 	is_capped_by_modifier = no
 
-	# TODO_CD: change to real slots
-	zone_slots = {
-		slot_rg_city_01
-	}
-
 	show_on_uncolonized = {
 		uses_district_set = rg_station
 		exists = from
@@ -351,116 +340,32 @@ district_rg_generator = {
 		}
 		produces = {
 			energy = 50
-			minerals = 50
-			food = 50
 		}
 	}
 
 	triggered_planet_modifier = {
-		planet_housing_add = 1000
+		planet_housing_add = 10
 	}
 }
 
-# district_rg_mining = {
-# 	icon = district_hab_mining
-# 	base_buildtime = 30
-# 	is_capped_by_modifier = no
-# 
-# 	zone_slots = {
-# 		slot_minerals
-# 	}
-# 
-# 	show_on_uncolonized = {
-# 		uses_district_set = rg_station
-# 		exists = from
-# 	}
-# 
-# 	potential = {
-# 		exists = owner
-# 		uses_district_set = rg_station
-# 	}
-# 
-# 	convert_to = {
-# 	}
-# 
-# 	resources = {
-# 		category = planet_districts
-# 		cost = {
-# 			minerals = @rw_cost
-# 		}
-# 		upkeep = {
-# 			energy = 5
-# 		}
-# 		produces = {
-# 			minerals = 50
-# 		}
-# 	}
-# 
-# 	triggered_planet_modifier = {
-# 		planet_housing_add = 1000
-# 	}
-# }
-
-#district_rg_farming = {
-#	icon = district_rw_farming
-#	base_buildtime = 30
-#	is_capped_by_modifier = no
-#
-#	# TODO_CD: change to real slots
-#	zone_slots = {
-#		slot_food
-#	}
-#
-#	show_on_uncolonized = { uses_district_set = rg_station }
-#
-#	potential = {
-#		uses_district_set = rg_station
-#		exists = owner
-#		NOT = {
-#			AND = {
-#				owner = { is_ai = yes }
-#				owner = { country_uses_food = no }
-#			}
-#		}
-#	}
-#
-#	resources = {
-#		category = planet_districts
-#		cost = {
-#			minerals = @rw_cost
-#		}
-#		upkeep = {
-#			energy = 5
-#		}
-#		produces = {
-#			food = 50
-#		}
-#	}
-#
-#	# triggered for tooltip formatting purposes
-#	triggered_planet_modifier = {
-#		modifier = {
-#			planet_housing_add = 1000
-#		}
-#	}
-#}
-
-district_rg_industrial = {
-	icon = district_rw_industrial
+district_rg_mining = {
+	icon = district_hab_mining
 	base_buildtime = 30
 	is_capped_by_modifier = no
 
-	# TODO_CD: change to real slots
-	zone_slots = {
-		slot_rg_city_02
+	show_on_uncolonized = {
+		uses_district_set = rg_station
+		exists = from
 	}
 
-	show_on_uncolonized = { uses_district_set = rg_station }
-
 	potential = {
+		exists = owner
 		uses_district_set = rg_station
 	}
 
+	convert_to = {
+	}
+
 	resources = {
 		category = planet_districts
 		cost = {
@@ -468,24 +373,53 @@ district_rg_industrial = {
 		}
 		upkeep = {
 			energy = 5
-			minerals = 50
 		}
 		produces = {
-			nanites = 50
+			minerals = 50
 		}
 	}
 
 	triggered_planet_modifier = {
-		planet_housing_add = 1000
+		planet_housing_add = 10
+	}
+}
+
+district_rg_farming = {
+	icon = district_rw_farming
+	base_buildtime = 30
+	is_capped_by_modifier = no
+
+	show_on_uncolonized = { uses_district_set = rg_station }
+
+	potential = {
+		uses_district_set = rg_station
+		exists = owner
+		NOT = {
+			AND = {
+				owner = { is_ai = yes }
+				owner = { country_uses_food = no }
+			}
+		}
 	}
 
-	inline_script = {
-		script = jobs/industrial_districts_factory_add
-		AMOUNT = 500
+	resources = {
+		category = planet_districts
+		cost = {
+			minerals = @rw_cost
+		}
+		upkeep = {
+			energy = 5
+		}
+		produces = {
+			food = 50
+		}
 	}
-	inline_script = {
-		script = jobs/industrial_districts_foundry_add
-		AMOUNT = 500
+
+	# triggered for tooltip formatting purposes
+	triggered_planet_modifier = {
+		modifier = {
+			planet_housing_add = 10
+		}
 	}
 }
 
@@ -494,11 +428,6 @@ district_rg_science = {
 	base_buildtime = 30
 	is_capped_by_modifier = no
 
-	# TODO_CD: change to real slots
-	zone_slots = {
-		slot_rg_city_03
-	}
-
 	show_on_uncolonized = { uses_district_set = rg_station }
 
 	potential = { uses_district_set = rg_station }
@@ -524,12 +453,12 @@ district_rg_science = {
 			minerals = @rw_cost
 		}
 		upkeep = {
-			energy = 5
+			energy = @rw_maintenance
 		}
 	}
 
 	triggered_planet_modifier = {
-		planet_housing_add = 1000
+		planet_housing_add = 10
 	}
 
 	triggered_planet_modifier = {
@@ -538,11 +467,9 @@ district_rg_science = {
 			owner = { is_regular_empire = yes }
 		}
 		modifier = {
-			job_physicist_add = 1000
-			job_biologist_add = 1000
-			job_engineer_add = 1000
+			job_researcher_add = 15
 		}
-	}
+	}4
 
 	triggered_planet_modifier = {
 		potential = {
@@ -550,9 +477,7 @@ district_rg_science = {
 			owner = { is_hive_empire = yes }
 		}
 		modifier = {
-			job_calculator_physicist_add = 1000
-			job_calculator_biologist_add = 1000
-			job_calculator_engineer_add = 1000
+			job_brain_drone_add = 15
 		}
 	}
 
@@ -562,9 +487,7 @@ district_rg_science = {
 			owner = { is_machine_empire = yes }
 		}
 		modifier = {
-			job_calculator_physicist_add = 1000
-			job_calculator_biologist_add = 1000
-			job_calculator_engineer_add = 1000
+			job_calculator_add = 15
 		}
 	}
 
@@ -578,9 +501,7 @@ district_rg_science = {
 				has_active_tradition = tr_virtuality_4
 			}
 		}
-		job_physicist_add = 500
-		job_biologist_add = 500
-		job_engineer_add = 500
+		job_researcher_add = 5
 	}
 
 	triggered_planet_modifier = {
@@ -591,9 +512,7 @@ district_rg_science = {
 				has_active_tradition = tr_virtuality_4
 			}
 		}
-		job_calculator_physicist_add = 500
-		job_calculator_biologist_add = 500
-		job_calculator_engineer_add = 500
+		job_calculator_add = 5
 	}
 
 	triggered_desc = {
@@ -631,47 +550,111 @@ district_rg_science = {
 	}
 }
 
-# district_rg_nanites = {
-# 	icon = district_rg_nanites
-# 	base_buildtime = 30
-# 	is_capped_by_modifier = no
-# 
-# 	# TODO_CD: change to real slots
-# 	zone_slots = {
-# 		slot_city_01
-# 	}
-# 
-# 	show_on_uncolonized = {
-# 		uses_district_set = rg_station
-# 		exists = from
-# 	}
-# 
-# 	potential = {
-# 		exists = owner
-# 		uses_district_set = rg_station
-# 	}
-# 
-# 	convert_to = {
-# 	}
-# 
-# 	resources = {
-# 		category = planet_districts
-# 		cost = {
-# 			minerals = @rw_cost
-# 		}
-# 		upkeep = {
-# 			energy = 5
-# 			minerals = 40
-# 		}
-# 		produces = {
-# 			nanites = 40
-# 		}
-# 	}
-# 
-# 	triggered_planet_modifier = {
-# 		planet_housing_add = 1000
-# 	}
-# }
+district_rg_industrial = {
+	icon = district_rw_industrial
+	base_buildtime = 30
+	is_capped_by_modifier = no
+
+	show_on_uncolonized = { uses_district_set = rg_station }
+
+	potential = {
+		uses_district_set = rg_station
+	}
+
+	resources = {
+		category = planet_districts
+		cost = {
+			minerals = @rw_cost
+		}
+		upkeep = {
+			energy = @rw_maintenance
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_edict = industrial_maintenance
+				}
+			}
+			energy = 4
+		}
+	}
+
+	triggered_planet_modifier = {
+		planet_housing_add = 10
+	}
+
+	inline_script = {
+		script = jobs/industrial_districts_factory_add
+		AMOUNT = 10
+	}
+
+	inline_script = {
+		script = jobs/industrial_districts_foundry_add
+		AMOUNT = 10
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_machine_empire = yes
+				has_edict = industrial_maintenance
+			}
+		}
+		modifier = {
+			job_maintenance_drone_add = 2
+		}
+	}
+
+	triggered_desc = {
+		trigger = {
+			exists = owner
+			owner = {
+				is_machine_empire = yes
+				has_edict = industrial_maintenance
+			}
+		}
+		text = job_maintenance_drone_effect_desc
+	}
+}
+
+district_rg_nanites = {
+	icon = district_rg_nanites
+	base_buildtime = 30
+	is_capped_by_modifier = no
+
+	show_on_uncolonized = {
+		uses_district_set = rg_station
+		exists = from
+	}
+
+	potential = {
+		exists = owner
+		uses_district_set = rg_station
+	}
+
+	convert_to = {
+	}
+
+	resources = {
+		category = planet_districts
+		cost = {
+			minerals = @rw_cost
+		}
+		upkeep = {
+			energy = 5
+			minerals = 40
+		}
+		produces = {
+			nanites = 40
+		}
+	}
+
+	triggered_planet_modifier = {
+		planet_housing_add = 10
+	}
+}
 
 # district_rg_commercial = {
 # 	icon = district_rw_commercial

common/global_ship_designs/RG_graygoo_ship_designs.txt

@@ -847,6 +847,8 @@ ship_design = {
 	required_component = "RG_gatebuilder_thruster"
 	required_component = "RG_COMBAT_COMPUTER_MotherShip"
 	required_component = "RG_CORVETTE_CLOAKING_3"
+	required_component = "RG_BAKAHALO"
+	required_component = "RG_ANTIBAKAHALO"
 	required_component = "RG_SHIP_AURA_NANOBOT_CLOUD"
 }
 
@@ -1437,8 +1439,10 @@ ship_design = {
 	required_component = "RG_gatebuilder_thruster"
 	required_component = "RG_COMBAT_COMPUTER_MotherShip"
 	required_component = "RG_CORVETTE_CLOAKING_3"
+	required_component = "RG_BAKAHALO"
+	required_component = "RG_ANTIBAKAHALO"
 	required_component = "RG_SHIP_AURA_NANOBOT_CLOUD"
-	required_component = "RG_STARBASE_AURA_FTL_INHIBITOR"
+	required_component = "STARBASE_AURA_FTL_INHIBITOR"
 }
 
 # 航母 1

common/global_ship_designs/RG_ship_designs_starbase.txt

@@ -162,7 +162,7 @@ ship_design = {
 	required_component = "RG_FUSION_NANO_REACTOR_L"
 	required_component = "RG_COMBAT_COMPUTER_COLOSSUS"
 	required_component = "RG_CORVETTE_CLOAKING_3"
-	required_component = "RG_STARBASE_AURA_FTL_INHIBITOR"
+	required_component = "STARBASE_AURA_FTL_INHIBITOR"
 }
 
 # Factory
@@ -338,5 +338,5 @@ ship_design = {
 	required_component = "RG_FUSION_NANO_REACTOR_L"
 	required_component = "COMBAT_COMPUTER_PLATFORM_ADVANCED"
 	required_component = "RG_CORVETTE_CLOAKING_3"
-	required_component = "RG_STARBASE_AURA_FTL_INHIBITOR"
+	required_component = "STARBASE_AURA_FTL_INHIBITOR"
 }

common/inline_scripts/events/rg_graygoo/rg_graygoo.500.txt

@@ -125,7 +125,6 @@ option = {
 		NOT = {
 			RG_gray_harbitat_active_trigger = yes
 		}
-		has_country_flag = rg_gray_level_3
 	}
 	allow = {
 	}
@@ -156,6 +155,15 @@ option = {
 		rg_clear_harbitat = yes
 	}
 }
+option = {
+	# help
+	name = rg_help
+	hidden_effect = {
+		country_event = {
+			id = rg_graygoo.4
+		}
+	}
+}
 option = {
 	# 衣柜
 	name = rg_wardrobe

common/inline_scripts/events/rg_graygoo/rg_graygoo.501.txt

@@ -102,7 +102,6 @@ option = {
 		NOT = {
 			RG_gray_harbitat_active_trigger = yes
 		}
-		has_country_flag = rg_gray_level_3
 	}
 	allow = {
 	}
@@ -130,6 +129,15 @@ option = {
 		}
 	}
 }
+option = {
+	# help
+	name = rg_help
+	hidden_effect = {
+		country_event = {
+			id = rg_grayleader.4
+		}
+	}
+}
 option = {
 	# 衣柜
 	name = rg_wardrobe

common/inline_scripts/events/rg_graygoo/rg_graygoo.502.txt

@@ -215,7 +215,6 @@ option = {
 		NOT = {
 			RG_gray_harbitat_active_trigger = yes
 		}
-		has_country_flag = rg_gray_level_3
 	}
 	allow = {
 	}

common/inline_scripts/events/rg_graygoo/rg_graygoo.503.txt

@@ -205,7 +205,6 @@ option = {
 		NOT = {
 			RG_gray_harbitat_active_trigger = yes
 		}
-		has_country_flag = rg_gray_level_3
 	}
 	allow = {
 	}

common/inline_scripts/events/rg_graygoo/rg_graygoo.505.txt

@@ -141,7 +141,6 @@ option = {
 		NOT = {
 			RG_gray_harbitat_active_trigger = yes
 		}
-		has_country_flag = rg_gray_level_3
 	}
 	allow = {
 	}

common/inline_scripts/events/rg_test_gray_skill_varible.txt

@@ -8,38 +8,13 @@ set_variable = {
 #Country event_target:gray_owner
 #存储当前领袖等级
 rg_save_gray_leader_level_effect = {
-    every_owned_leader = {
-        if = {
-            ###等级检测
-            limit = {
-                has_leader_flag = rg_gray_leader
-            }
-			#由于目前是leader域，所以不能直接导出等级
-            #导出等级到暂存
-            export_trigger_value_to_variable = {
-                trigger = has_base_skill
-                variable = rg_gray_level_temp
-            }
-			#把leader域中的变量存到country域中
-            #导入变量
-            owner = {
-                set_variable = {
-                    which = rg_gray_level
-                    value = prev.rg_gray_level_temp
-                }
-            }
-            #清理暂存区
-            clear_variable = rg_gray_level_temp
-        }
-    }
-}
     random_owned_leader = {
 		#是小灰领袖
 		limit = {
 			has_leader_flag = rg_gray_leader
 		}
 		export_trigger_value_to_variable = {
-			trigger = has_base_skill
+			trigger = has_skill
 			variable = rg_gray_level_temp
 		}
 		owner = {

common/inline_scripts/pop_categories/trait_production.txt

@@ -3,7 +3,10 @@ produces = {
         exists = planet
         planet = {
             owner = {
-                RG_tradition5_or_gray_owner_trigger = yes
+                OR = {
+                    RG_gray_harbitat_active_trigger = yes
+                    has_active_tradition = tr_rg_nanotech_5
+                }
             }
             rg_is_pc_nano = yes
         }

common/megastructures/RG_oribital_ring.txt

@@ -100,6 +100,14 @@ RG_orbital_ring = {
 					has_planet_flag = has_orbital_debris
 				}
 			}
+			if = {
+				limit = {
+					from = {
+						is_ai = yes
+					}
+				}
+				num_pops >= 25
+			}
 		}
 	}
 	# root = system

common/scripted_effects/RG_event_effects.txt

@@ -101,20 +101,6 @@ rg_event_effect_event1_gray_galaxy = {
 	}
 	else = {
 		rg_lcluster_spawn_effect = yes
-		capital_scope = {
-			solar_system = {
-				random_neighbor_system = {
-					solar_system = {
-						set_star_flag = lgate
-						spawn_megastructure = {
-							type = lgate_base
-							orbit_angle = 225
-							orbit_distance = 30
-						}
-					}
-				}
-			}
-		}
 	}
 }
 
@@ -187,12 +173,12 @@ rg_event_effect_planet2027_spawn_maid_species = {
 				plural = this
 				class = RG_MACHINE
 				portrait = "rg_machine_maid"
-				can_be_modified = yes
+				can_be_modified = no
 				homeworld = this
 				namelist = this
 				gender = this
 				traits = {
-					trait = trait_rg_machine_unit
+					trait = trait_machine_unit
 					trait = rg_machine_maid_trait
 					trait = trait_auto_mod_robotic
 					trait = trait_robot_streamlined_protocols
@@ -200,10 +186,6 @@ rg_event_effect_planet2027_spawn_maid_species = {
 				}
 				effect = {
 					save_global_event_target_as = rg_owner_main_maid_species
-					set_citizenship_type = {
-						type = citizenship_full_rg_maid
-						country = event_target:gray_owner
-					}
 				}
 			}
 		}
@@ -220,23 +202,17 @@ rg_event_effect_planet2027_spawn_maid_species_non_gray = {
 				plural = this
 				class = RG_MACHINE
 				portrait = "rg_machine_maid"
-				can_be_modified = yes
+				can_be_modified = no
 				homeworld = this
 				namelist = this
 				gender = this
 				traits = {
-					trait = trait_rg_machine_unit
+					trait = trait_machine_unit
 					trait = rg_machine_maid_trait
 					trait = trait_auto_mod_robotic
 					trait = trait_robot_streamlined_protocols
 					trait = trait_robot_luxurious
 				}
-				effect = {
-					set_citizenship_type = {
-						type = citizenship_full_rg_maid
-						country = event_target:gray_owner
-					}
-				}
 			}
 		}
 	}

common/scripted_effects/RG_fallen_empire_effects.txt

@@ -4,7 +4,7 @@ rg_create_fallen_empire_species_effect = {
 		class = RG_MACHINE
 		portrait = "rg_machine_maid"
 		traits = {
-			trait = trait_rg_machine_unit
+			trait = trait_machine_unit
 			trait = trait_robot_domestic_protocols
 			trait = rg_machine_maid_trait
 			trait = trait_auto_mod_robotic
@@ -284,7 +284,7 @@ rg_create_fallen_empire_starting_navy = {
 rg_create_fallen_empire_platform = {
 	if = {
 		limit = {
-			owner = { is_machine_empire = yes }
+			owner = { has_authority = auth_machine_intelligence }
 		}
 		create_ship = {
 			name = random
@@ -297,7 +297,7 @@ rg_create_fallen_empire_platform = {
 rg_create_fallen_empire_colossus = {
 	if = {
 		limit = {
-			owner = { is_machine_empire = yes }
+			owner = { has_authority = auth_machine_intelligence }
 		}
 		create_ship = {
 			name = random
@@ -310,7 +310,7 @@ rg_create_fallen_empire_colossus = {
 rg_create_fallen_empire_titan = {
 	if = {
 		limit = {
-			owner = { is_machine_empire = yes }
+			owner = { has_authority = auth_machine_intelligence }
 		}
 		create_ship = {
 			name = random
@@ -323,7 +323,7 @@ rg_create_fallen_empire_titan = {
 rg_create_fallen_empire_large_ship = {
 	if = {
 		limit = {
-			owner = { is_machine_empire = yes }
+			owner = { has_authority = auth_machine_intelligence }
 		}
 		create_ship = {
 			name = random
@@ -336,7 +336,7 @@ rg_create_fallen_empire_large_ship = {
 rg_create_fallen_empire_small_ship = {
 	if = {
 		limit = {
-			owner = { is_machine_empire = yes }
+			owner = { has_authority = auth_machine_intelligence }
 		}
 		create_ship = {
 			name = random
@@ -349,7 +349,7 @@ rg_create_fallen_empire_small_ship = {
 rg_create_fallen_empire_construction_ship = {
 	if = {
 		limit = {
-			owner = { is_machine_empire = yes }
+			owner = { has_authority = auth_machine_intelligence }
 		}
 		create_ship = {
 			name = random

common/scripted_effects/RG_gray_init_effects.txt

@@ -158,7 +158,7 @@ rg_save_gray_leader_level_effect = {
 			}
 			#导出等级到暂存
 			export_trigger_value_to_variable = {
-				trigger = has_base_skill
+				trigger = has_skill
 				variable = rg_gray_level_temp
 			}
 			#导入变量
@@ -542,21 +542,6 @@ rg_harbitar_size_calculate = {
 	}
 }
 
-rg_habitat_maid_init = {
-	if = {
-		limit = {
-			NOT = {
-				exists = event_target:rg_owner_main_maid_species
-			}
-		}
-		event_target:rg_gray_habitat_target = {
-			every_owned_pop_group = {
-				rg_event_effect_planet2027_spawn_maid_species = yes
-			}
-		}
-	}
-}
-
 #Country event_target:gray_owner
 #创造灰风纳米空间站
 rg_juggernaut_habitat_init = {
@@ -599,6 +584,16 @@ rg_juggernaut_habitat_init = {
 							species = owner_main_species
 							ethos = owner
 						}
+						if = {
+							limit = {
+								NOT = {
+									exists = event_target:rg_owner_main_maid_species
+								}
+							}
+							every_owned_pop = {
+								rg_event_effect_planet2027_spawn_maid_species = yes
+							}
+						}
 						set_name = "NAME_rg_gray_habitat_base"
 						if = {
 							limit = {
@@ -610,6 +605,22 @@ rg_juggernaut_habitat_init = {
 						}
 						set_planet_size = owner.rg_habitat_size
 						generate_start_buildings_and_districts = yes
+						while = {
+							count = 1
+							add_district = district_rg_generator
+						}
+						while = {
+							count = 1
+							add_district = district_rg_mining
+						}
+						while = {
+							count = 1
+							add_district = district_rg_farming
+						}
+						while = {
+							count = 1
+							add_district = district_rg_industrial
+						}
 						if = {
 							limit = {
 								exists = owner
@@ -647,20 +658,10 @@ rg_juggernaut_habitat_init = {
 							}
 						}
 						while = {
-							count = 1
-							add_district = district_rg_generator
-						}
-						while = {
-							count = 1
-							add_district = district_rg_industrial
-						}
-						while = {
-							count = 1
-							add_district = district_rg_science
-						}
-						create_pop_group = {
-							species = owner_main_species
-							size = 5
+							count = 5
+							create_pop = {
+								species = owner_main_species
+							}
 						}
 						set_planet_flag = megastructure
 						set_planet_flag = habitat
@@ -672,7 +673,6 @@ rg_juggernaut_habitat_init = {
 				}
 			}
 		}
-		rg_habitat_maid_init = yes
 		rg_set_gray_harbitat_active_effect = yes
 	}
 }

common/scripted_effects/RG_gray_leader_init_effects.txt

@@ -622,7 +622,7 @@ rg_gray_leader_experience_jar = {
 					RG_has_gray_cluster_origin_trigger = yes
 				}
 			}
-			has_base_skill < 10
+			has_skill < 10
 		}
 		add_experience = 54000
 		event_target:gray_owner = {

common/scripted_effects/RG_scripted_effects.txt

@@ -1796,7 +1796,7 @@ RG_destroy_planet_effect = {
 		else = {
 			set_owner = event_target:gray_owner
 		}
-		every_owned_pop_group = {
+		every_owned_pop = {
 			modify_species = {
 				species = event_target:gray_owner.owner_species
 				add_trait = trait_cybernetic
@@ -1804,13 +1804,13 @@ RG_destroy_planet_effect = {
 				change_scoped_species = yes
 			}
 		}
-		every_owned_pop_group = {
+		every_owned_pop = {
 			limit = {
 				has_modifier = pop_recently_conquered
 			}
 			remove_modifier = pop_recently_conquered
 		}
-		every_owned_pop_group = {
+		every_owned_pop = {
 			set_citizenship_type = {
 				type = citizenship_full_machine
 				cooldown = yes
@@ -2193,7 +2193,7 @@ RG_destroy_planet_effect_sp = {
 		else = {
 			set_owner = event_target:gray_owner
 		}
-		every_owned_pop_group = {
+		every_owned_pop = {
 			modify_species = {
 				species = event_target:gray_owner.owner_species
 				add_trait = trait_cybernetic
@@ -2201,13 +2201,13 @@ RG_destroy_planet_effect_sp = {
 				change_scoped_species = yes
 			}
 		}
-		every_owned_pop_group = {
+		every_owned_pop = {
 			limit = {
 				has_modifier = pop_recently_conquered
 			}
 			remove_modifier = pop_recently_conquered
 		}
-		every_owned_pop_group = {
+		every_owned_pop = {
 			set_citizenship_type = {
 				type = citizenship_full_machine
 				cooldown = yes
@@ -2397,7 +2397,7 @@ RG_destroy_star_system = {
 			else = {
 				set_owner = event_target:gray_owner
 			}
-			every_owned_pop_group = {
+			every_owned_pop = {
 				modify_species = {
 					species = event_target:gray_owner.owner_species
 					add_trait = trait_cybernetic
@@ -2405,13 +2405,13 @@ RG_destroy_star_system = {
 					change_scoped_species = yes
 				}
 			}
-			every_owned_pop_group = {
+			every_owned_pop = {
 				limit = {
 					has_modifier = pop_recently_conquered
 				}
 				remove_modifier = pop_recently_conquered
 			}
-			every_owned_pop_group = {
+			every_owned_pop = {
 				set_citizenship_type = {
 					type = citizenship_full_machine
 					cooldown = yes
@@ -2802,7 +2802,7 @@ rg_gray_country_after_init = {
 		id = rg_grayleader.7
 		days = -1
 	}
-	# rg_juggernaut_habitat_init = yes
+	rg_juggernaut_habitat_init = yes
 }
 
 rg_timeline_attract_field_init = {

common/scripted_triggers/RG_leader_scripted_triggers.txt

@@ -1,6 +1,6 @@
 RG_gray_mod1_trigger = {
 	event_target:gray_leader_admiral = {
-		has_base_skill >= 10
+		has_skill >= 10
 	}
 	NOR = {
 		has_country_flag = rg_gray_level_2
@@ -35,7 +35,7 @@ RG_gray_mod1_allow_trigger = {
 	custom_tooltip = {
 		fail_text = requires_rg_graylevel_higherthan_10
 		event_target:gray_leader_admiral = {
-			has_base_skill >= 10
+			has_skill >= 10
 		}
 	}
 	resource_stockpile_compare = {
@@ -51,7 +51,7 @@ RG_gray_mod1_allow_trigger = {
 RG_gray_mod2_trigger = {
 	AND = {
 		event_target:gray_leader_admiral = {
-			has_base_skill >= 10
+			has_skill >= 10
 		}
 		has_country_flag = rg_gray_level_2
 	}
@@ -93,7 +93,7 @@ RG_gray_mod2_allow_trigger = {
 		custom_tooltip = {
 			fail_text = requires_rg_graylevel_higherthan_10
 			event_target:gray_leader_admiral = {
-				has_base_skill >= 10
+				has_skill >= 10
 			}
 		}
 	}

common/scripted_triggers/RG_scripted_triggers.txt

@@ -70,12 +70,6 @@ rg_is_main_species_with_maid_trait_trigger = {
 	}
 }
 
-RG_tradition5_or_gray_owner_trigger = {
-	OR = {
-		RG_gray_harbitat_active_trigger = yes
-		has_active_tradition = tr_rg_nanotech_5
-	}
-}
 rg_has_ag_origin_trigger = {
 	any_country = {
 		has_origin = origin_Asgray

common/scripted_triggers/RG_scripted_triggers_planet_killers.txt

@@ -338,7 +338,7 @@ can_destroy_planet_with_RG_PLANET_KILLER_NEUTRON = {
 	custom_tooltip = {
 		fail_text = is_unpopulated
 		OR = {
-			pop_amount > 0
+			num_pops > 0
 			is_planet_class = pc_infested
 		}
 	}
@@ -472,7 +472,7 @@ can_destroy_planet_with_RG_PLANET_KILLER_NANOBOTS = {
 	}
 	custom_tooltip = {
 		fail_text = no_assimilatable_pops
-		any_owned_pop_group = {
+		any_owned_pop = {
 			is_valid_pop_for_PLANET_KILLER_NANOBOTS = yes
 		}
 	}

common/ship_sizes/RG_ship_sizes.txt

@@ -54,7 +54,7 @@ RG_graygoo_mothership = {
 	use_shipnames_from = titan
 
 	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
@@ -118,7 +118,7 @@ RG_graygoo_capitalship = {
 
 	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
@@ -183,6 +183,8 @@ RG_graygoo_capitalship = {
 	required_component_set = "sensor_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"
 	components_add_to_cost = no
 	resources = {
 		category = ships
@@ -229,7 +231,7 @@ RG_gray_juggernaut = {
 	}
 	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_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
@@ -295,7 +297,9 @@ RG_gray_juggernaut = {
 	required_component_set = "thruster_components"
 	required_component_set = "science_cloaking_components"
 	required_component_set = "ship_aura_components"
-	required_component_set = "ftl_inhibitor"
+	required_component_set = "ship_aura_components"
+	required_component_set = "ship_aura_components"
+	required_component_set = "ship_aura_components"
 
 	components_add_to_cost = no
 	resources = {
@@ -444,7 +448,7 @@ RG_graygoo_interdictor = {
 
 	use_shipnames_from = battleship
 	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 = line
@@ -498,7 +502,7 @@ RG_graygoo_destroyer = {
 
 	use_shipnames_from = destroyer
 	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 = line
@@ -558,7 +562,7 @@ RG_graygoo_icebreaker_interdictor = {
 	base_buildtime = @battleship_build_time
 	use_shipnames_from = battleship
 	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
@@ -612,7 +616,7 @@ RG_graygoo_Arsenal = {
 	base_buildtime = @battleship_build_time
 	use_shipnames_from = battleship
 	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 = line
@@ -664,7 +668,7 @@ RG_graygoo_Buff = {
 	base_buildtime = @battleship_build_time
 	use_shipnames_from = colossus
 	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
@@ -838,7 +842,7 @@ RG_orbital_ring_tier_1 = {
 	components_add_to_cost = no
 	can_disable = yes
 	flip_control_on_disable = 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
 	prerequisites = {
 		"tech_object_gray_6"
 	}

common/solar_system_initializers/RG_fallen_empire_initializers.txt

@@ -79,13 +79,18 @@ rg_fallen_machine = {
 				count = 5
 				add_district = district_rw_nexus
 			}
-			create_pop_group = {
-				species = owner_main_species
-				size = 105
+			while = {
+				count = 105
+				create_pop = {
+					species = owner_main_species
+				}
 			}
-			create_pop_group = {
-				species = event_target:rg_scion_slave.species
-				size = 94
+
+			while = {
+				count = 94
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
 			}
 
 			rg_create_fallen_empire_starting_navy = yes
@@ -154,13 +159,17 @@ rg_fallen_machine = {
 				count = 5
 				add_district = district_rw_nexus
 			}
-			create_pop_group = {
-				species = owner_main_species
-				size = 50
+			while = {
+				count = 50
+				create_pop = {
+					species = owner_main_species
+				}
 			}
-			create_pop_group = {
-				species = event_target:rg_scion_slave.species
-				size = 20
+			while = {
+				count = 20
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
 			}
 			while = {
 				count = 20
@@ -216,13 +225,17 @@ rg_fallen_machine = {
 				count = 5
 				add_district = district_rw_generator
 			}
-			create_pop_group = {
-				species = owner_main_species
-				size = 22
+			while = {
+				count = 22
+				create_pop = {
+					species = owner_main_species
+				}
 			}
-			create_pop_group = {
-				species = event_target:rg_scion_slave.species
-				size = 10
+			while = {
+				count = 10
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
 			}
 			while = {
 				count = 10
@@ -320,14 +333,18 @@ rg_fallen_machine_1 = {
 				count = 5
 				add_district = district_rw_nexus
 			}
-			create_pop_group = {
-				species = owner_main_species
-				size = 105
+			while = {
+				count = 105
+				create_pop = {
+					species = owner_main_species
+				}
 			}
 
-			create_pop_group = {
-				species = event_target:rg_scion_slave.species
-				size = 94
+			while = {
+				count = 94
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
 			}
 
 			rg_create_fallen_empire_starting_navy = yes
@@ -404,13 +421,17 @@ rg_fallen_machine_1 = {
 				count = 5
 				add_district = district_rw_nexus
 			}
-			create_pop_group = {
-				species = owner_main_species
-				size = 50
+			while = {
+				count = 50
+				create_pop = {
+					species = owner_main_species
+				}
 			}
-			create_pop_group = {
-				species = event_target:rg_scion_slave.species
-				size = 20
+			while = {
+				count = 20
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
 			}
 			while = {
 				count = 20
@@ -466,13 +487,17 @@ rg_fallen_machine_1 = {
 				count = 5
 				add_district = district_rw_generator
 			}
-			create_pop_group = {
-				species = owner_main_species
-				size = 22
+			while = {
+				count = 22
+				create_pop = {
+					species = owner_main_species
+				}
 			}
-			create_pop_group = {
-				species = event_target:rg_scion_slave.species
-				size = 10
+			while = {
+				count = 10
+				create_pop = {
+					species = event_target:rg_scion_slave.species
+				}
 			}
 			while = {
 				count = 10

common/species_archetypes/RG_species_archetypes.txt

@@ -18,5 +18,4 @@ RG_MACHINE = {
 	species_trait_points = 10
 	species_max_traits = 6
 	robotic = yes
-	inherit_traits_from = { BIOLOGICAL ROBOT MACHINE }
 }

common/species_rights/citizenship_types/RG_citizenship_types.txt

@@ -1,21 +0,0 @@
-citizenship_full_rg_maid = {
-	is_full_citizenship = yes
-
-	potential = {
-		exists = from
-		from = { is_same_value = event_target:gray_owner }
-	}
-
-	allow = {
-		hidden_trigger = { exists = from }
-		custom_tooltip = {
-			fail_text = RG_MACHINE_SPECIES_NOT_MACHINE
-			OR = {
-				has_trait = trait_rg_machine_unit
-			}
-		}
-	}
-	ai_will_do = {
-		factor = 100
-	}
-}

common/traits/!_RG_gray_goo_traits.txt

@@ -49,7 +49,7 @@
 # 			always = yes
 # 		}
 # 		leader_skill_levels = 1
-# 		mult = trigger:has_base_skill
+# 		mult = trigger:has_skill
 # 	}
 # 	self_modifier = {
 # 		species_leader_exp_gain = 1
@@ -121,7 +121,7 @@ RG_leader_trait_governor_gray = {
 			always = yes
 		}
 		leader_skill_levels = 1
-		mult = trigger:has_base_skill
+		mult = trigger:has_skill
 	}
 	self_modifier = {
 		species_leader_exp_gain = 1
@@ -175,7 +175,7 @@ RG_leader_trait_ruler_gray = {
 		}
 		# leader_skill_levels = 1
 		leaders_upkeep_mult = 0.1
-		mult = trigger:has_base_skill
+		mult = trigger:has_skill
 	}
 	triggered_self_modifier = {
 		potential = {
@@ -193,7 +193,7 @@ RG_leader_trait_ruler_gray = {
 		}
 		# leader_skill_levels = 1
 		leaders_upkeep_mult = 0.15
-		mult = trigger:has_base_skill
+		mult = trigger:has_skill
 	}
 	triggered_self_modifier = {
 		potential = {
@@ -207,7 +207,7 @@ RG_leader_trait_ruler_gray = {
 		}
 		# leader_skill_levels = 1
 		leaders_upkeep_mult = 0.2
-		mult = trigger:has_base_skill
+		mult = trigger:has_skill
 	}
 	triggered_councilor_modifier = {
 		potential = {
@@ -221,7 +221,7 @@ RG_leader_trait_ruler_gray = {
 		}
 		# country_energy_produces_mult = -0.02
 		planet_stability_add = -1
-		mult = trigger:has_base_skill
+		mult = trigger:has_skill
 	}
 	triggered_councilor_modifier = {
 		potential = {
@@ -239,7 +239,7 @@ RG_leader_trait_ruler_gray = {
 		}
 		# country_energy_produces_mult = -0.03
 		planet_stability_add = -1.5
-		mult = trigger:has_base_skill
+		mult = trigger:has_skill
 	}
 	triggered_councilor_modifier = {
 		potential = {
@@ -253,7 +253,7 @@ RG_leader_trait_ruler_gray = {
 		}
 		# country_energy_produces_mult = -0.04
 		planet_stability_add = -2
-		mult = trigger:has_base_skill
+		mult = trigger:has_skill
 	}
 	triggered_councilor_modifier = {
 		potential = {
@@ -268,7 +268,7 @@ RG_leader_trait_ruler_gray = {
 		megastructure_build_speed_mult = 0.1
 		country_unity_produces_mult = 0.05
 		country_base_influence_produces_add = 1
-		mult = trigger:has_base_skill
+		mult = trigger:has_skill
 	}
 	leader_class = {
 		official
@@ -293,7 +293,7 @@ RG_leader_trait_admiral_gray_1 = {
 			always = yes
 		}
 		leader_skill_levels = 1
-		mult = trigger:has_base_skill
+		mult = trigger:has_skill
 	}
 	self_modifier = {
 		species_leader_exp_gain = 1
@@ -334,7 +334,7 @@ RG_leader_trait_admiral_gray_2 = {
 			always = yes
 		}
 		leader_skill_levels = 1
-		mult = trigger:has_base_skill
+		mult = trigger:has_skill
 	}
 	self_modifier = {
 		species_leader_exp_gain = 1
@@ -375,7 +375,7 @@ RG_leader_trait_admiral_gray = {
 			always = yes
 		}
 		leader_skill_levels = 1
-		mult = trigger:has_base_skill
+		mult = trigger:has_skill
 	}
 	self_modifier = {
 		species_leader_exp_gain = 1
@@ -449,7 +449,7 @@ RG_leader_trait_scientist_gray = {
 			always = yes
 		}
 		leader_skill_levels = 1
-		mult = trigger:has_base_skill
+		mult = trigger:has_skill
 	}
 	self_modifier = {
 		species_leader_exp_gain = 1

common/traits/RG_machine_species_trait.txt

@@ -4,28 +4,12 @@ rg_machine_maid_trait = {
 	}
 	custom_tooltip = rg_machine_maid_trait_effect_tooltip
 	initial = no
-	species_potential_add = {
-		FROM = {
-			RG_tradition5_or_gray_owner_trigger = yes
-		}
-	}
-	species_possible_remove = {
-		FROM = {
-			RG_tradition5_or_gray_owner_trigger = yes
-		}
-	}
-	species_possible_merge_add = {
-		FROM = {
-			RG_tradition5_or_gray_owner_trigger = yes
-		}
-	}
-	species_possible_merge_remove = {
-		FROM = {
-			RG_tradition5_or_gray_owner_trigger = yes
-		}
-	}
+	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 = { ROBOT MACHINE BIOLOGICAL LITHOID RG_MACHINE }
+	allowed_archetypes = { MACHINE }
 	sorting_priority = 20
 	potential_crossbreeding_chance = 1.0
 
@@ -70,63 +54,11 @@ rg_machine_maid_trait = {
 				}
 			}
 		}
+	
+	
 	}
 	
 	slave_cost = {
 		energy = 1000
 	}
-}
-
-trait_rg_machine_unit = {
-	cost = 0
-	sorting_priority = 20
-	initial = no
-	randomized = no
-	species_potential_add = {
-		always = no
-	}
-	species_possible_remove = {
-		always = no
-	}
-
-	species_possible_merge_add = {
-		FROM = {
-			RG_tradition5_or_gray_owner_trigger = yes
-		}
-	}
-
-	species_possible_merge_remove = {
-		FROM = {
-			RG_tradition5_or_gray_owner_trigger = yes
-		}
-	}
-
-	icon = "gfx/interface/icons/traits/trait_machine_unit.dds"
-	allowed_archetypes = { ROBOT MACHINE BIOLOGICAL LITHOID RG_MACHINE }
-
-	immortal_leaders = no
-
-	modifier = {
-		pc_machine_habitability = 1
-		leader_lifespan_add = 10
-		habitability_floor_add = 0.5
-	}
-
-	triggered_planet_growth_habitability_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				OR = {
-					has_active_tradition = tr_nanotech_adopt
-					has_active_tradition = tr_rg_nanotech_adopt
-				}
-			}
-		}
-		pc_nanotech_habitability = 1
-	}
-
-	leader_age_min = 5
-	leader_age_max = 10
-
-	custom_tooltip_with_modifiers = TRAIT_MACHINE_UNIT_EFFECT
 }

common/zone_slots/rg_zone_slots.txt

@@ -1,63 +0,0 @@
-# Planet District Zone Slots
-
-# slot_test_01 = {
-# 	start = zone_default                    # A zone of this type is immediately placed in a new district slot.
-# 
-# 	include = {                             # A list of zone types that are available to be built in the slot. The key 'all' can be used to include all existing zone types.
-# 		all
-# 	}
-# 
-# 	exclude = {                             # A list of zone types that aren't available to be built in the slot.
-# 		zone_test_05
-# 	}
-#
-#    potential = {                          
-#        always = yes                       # Trigger that defines whether the slot is available on the planet at all. Scope = Planet.
-#    }
-# 
-# 	unlock = {                              # Trigger that defines whether the slot is unlocked on the planet. Scope = Planet.
-# 		always = yes
-# 	}
-# }
-slot_rg_city_01 = {
-	include = {
-		zone_rg_city_housing
-		zone_rg_city_foundry
-		zone_rg_city_alloys
-		zone_rg_city_science
-	}
-	exclude = {
-		zone_default
-	}
-	unlock = { # planet scope
-		uses_district_set = rg_station
-	}
-}
-slot_rg_city_02 = {
-	include = {
-		zone_rg_city_housing
-		zone_rg_city_foundry
-		zone_rg_city_alloys
-		zone_rg_city_science
-	}
-	exclude = {
-		zone_default
-	}
-	unlock = { # planet scope
-		uses_district_set = rg_station
-	}
-}
-slot_rg_city_03 = {
-	include = {
-		zone_rg_city_housing
-		zone_rg_city_foundry
-		zone_rg_city_alloys
-		zone_rg_city_science
-	}
-	exclude = {
-		zone_default
-	}
-	unlock = { # planet scope
-		uses_district_set = rg_station
-	}
-}

common/zones/rg_zones.txt

@@ -1,202 +0,0 @@
-# Planet District Zones
-
-# zone_test_01 = {
-#   potential = {                           # Trigger that defines whether the zone can potentially be built on the Planet. Scope = Planet
-#       always = yes
-#   }
-#
-#   unlock = {                              # Trigger that defines whether the zone is unlocked for building on the planet. Scope = Planet
-#       always = yes
-# 	}
-#
-# 	resources = {                           # Cost of building. Scope = Planet
-#       category = planet_districts
-# 		cost = {
-# 			minerals = 50
-# 		}
-# 	}
-#
-#   max_buildings = 3      					# Number of slots for buildings.
-#
-#   planet_modifier = {						# Planet modifier from the zone
-#   }
-#
-#   triggered_planet_modifier = { 			# Triggered planet modifier from the zone. Scope = Planet
-#       potential = {
-#           always = yes
-#       }
-#   }
-#
-#   triggered_planet_pop_group_modifier = { # Triggered modifier applied to pop groups on planet.
-#       potential = {						# Modifier values are divided in proportion to size between pop groups for which the trigger is true.
-#           always = yes					# Scope = Pop group
-#       }
-#   }
-#
-#   district_planet_modifier = {    		# Planet modifier from the zone. Modifier value is multiplied by the District Level
-#   }
-#
-#   triggered_district_planet_modifier = {  # Triggered planet modifier from the zone. Modifier value is multiplied by the District Level. Scope = Planet
-#       potential = {
-#           always = yes
-#       }
-#   }
-#
-#   include = {    }                       # Buildings listed here can be constructed in this zone.
-#
-#   exclude = {    }                       # Buildings listed here cannot be constructed in this zone.
-#
-#   included_building_sets = {
-#                                           # Buildings belonging to any building set listed here can be constructed in this zone.
-#    }
-#
-#   excluded_building_sets = {
-#                                           # Buildings belonging to any building set listed here cannot be constructed in this zone.
-#    }
-#
-#	triggered_desc = {       		        # Triggered description of the zone's effect. Scope = Planet
-#		trigger = {
-#			exists = owner
-#		}
-#		text = job_clerk_effect_desc
-#	}
-# }
-
-zone_rg_city_housing = {
-	icon = GFX_colony_type_urban
-	base_buildtime = 120
-	potential = { # planet scope
-		always = yes
-	}
-
-	unlock = { # planet scope
-		always = yes
-	}
-	resources = {
-		category = planet_zones
-		cost = {
-		}
-	}
-
-	include = {
-		all
-	}
-	included_building_sets = {
-	}
-
-	triggered_district_planet_modifier = {
-		potential = {
-			exists = owner
-		}
-		planet_housing_add = 3000
-		planet_crime_add = -10
-		planet_amenities_add = 1000
-	}
-	
-	planet_modifier = {
-		zone_building_slots_add = 3
-	}
-}
-
-zone_rg_city_foundry = {
-	icon = GFX_resource_energy_large
-	base_buildtime = 120
-	potential = { # planet scope
-		always = yes
-	}
-
-	unlock = { # planet scope
-		always = yes
-	}
-	resources = {
-		category = planet_zones
-		cost = {
-		}
-	}
-
-	include = {
-		all
-	}
-	included_building_sets = {
-	}
-
-	inline_script = {
-		script = jobs/zone_technicians_add
-		AMOUNT = 1000
-	}
-	inline_script = {
-		script = jobs/zone_miner_add
-		AMOUNT = 1000
-	}
-	inline_script = {
-		script = jobs/zone_farmers_add
-		AMOUNT = 1000
-	}
-	
-	planet_modifier = {
-		zone_building_slots_add = 3
-	}
-}
-
-zone_rg_city_alloys = {
-	icon = GFX_resource_energy_large
-	base_buildtime = 120
-	potential = { # planet scope
-		always = yes
-	}
-
-	unlock = { # planet scope
-		always = yes
-	}
-	resources = {
-		category = planet_zones
-		cost = {
-		}
-	}
-
-	include = {
-		all
-	}
-	included_building_sets = {
-	}
-	inline_script = {
-		script = jobs/zone_factory_add
-		AMOUNT = 500
-	}
-	inline_script = {
-		script = jobs/zone_foundry_add
-		AMOUNT = 500
-	}
-	
-	planet_modifier = {
-		zone_building_slots_add = 3
-	}
-}
-
-zone_rg_city_science = {
-	icon = GFX_colony_type_research
-	base_buildtime = 120
-	potential = { # planet scope
-		always = yes
-	}
-	unlock = { # planet scope
-		always = yes
-	}
-	resources = {
-		category = planet_zones
-		cost = {
-		}
-	}
-	include = {
-		all
-	}
-	included_building_sets = {
-	}
-	inline_script = {
-		script = jobs/zone_researchers_add
-		AMOUNT = 1000
-	}
-	planet_modifier = {
-		zone_building_slots_add = 3
-	}
-}

descriptor.mod

@@ -1,4 +1,4 @@
-version="v4.0.2"
+version="d4a22820b3"
 tags={
 	"Military"
 	"Balance"
@@ -6,7 +6,7 @@ tags={
 	"Events"
 	"Leaders"
 }
-picture="thumbnail.png"
 name="Real Gray"
-supported_version="v4.0.*"
+picture="thumbnail.png"
+supported_version="v3.13.*"
 remote_file_id="2136166095"

events/!_RG_gray_goo_event_overwrite.txt

@@ -850,14 +850,14 @@ country_event = {
 	desc = {
 		trigger = {
 			NOT = {
-				is_machine_empire = yes
+				has_authority = auth_machine_intelligence
 			}
 		}
 		text = "graygoo.401.a.desc"
 	}
 	desc = {
 		trigger = {
-			is_machine_empire = yes
+			has_authority = auth_machine_intelligence
 		}
 		text = "graygoo.401.b.desc"
 	}
@@ -876,8 +876,8 @@ country_event = {
 		name = graygoo.401.a
 		trigger = {
 			NOR = {
-				is_machine_empire = yes
-				is_hive_empire = yes
+				has_authority = auth_machine_intelligence
+				has_authority = auth_hive_mind
 			}
 		}
 		hidden_effect = {
@@ -889,7 +889,7 @@ country_event = {
 	option = {
 		name = graygoo.401.b
 		trigger = {
-			is_machine_empire = yes
+			has_authority = auth_machine_intelligence
 		}
 		hidden_effect = {
 			country_event = {
@@ -900,7 +900,7 @@ country_event = {
 	option = {
 		name = graygoo.401.c
 		trigger = {
-			is_hive_empire = yes
+			has_authority = auth_hive_mind
 		}
 		hidden_effect = {
 			country_event = {
@@ -917,14 +917,14 @@ country_event = {
 	desc = {
 		trigger = {
 			NOT = {
-				is_machine_empire = yes
+				has_authority = auth_machine_intelligence
 			}
 		}
 		text = "graygoo.402.a.desc"
 	}
 	desc = {
 		trigger = {
-			is_machine_empire = yes
+			has_authority = auth_machine_intelligence
 		}
 		text = "graygoo.402.b.desc"
 	}

events/RG_cluster_events.txt

@@ -212,7 +212,7 @@ country_event = {
 					is_machine_empire = no
 				}
 			}
-			every_owned_pop_group = {
+			every_owned_pop = {
 				modify_species = {
 					species = this
 					ideal_planet_class = pc_nuked
@@ -249,20 +249,18 @@ country_event = {
 			set_location = event_target:rg_cluster_home_system_loc
 		}
 		event_target:rg_cluster_previous_home_planet = {
-
 			# move pops
-			every_owned_pop_group = {
-				resettle_pop_group = {
-					POP_GROUP = this
-					PLANET = event_target:rg_cluster_home_planet
-					PERCENTAGE = 1
+			every_owned_pop = {
+				resettle_pop = {
+					pop = this
+					planet = event_target:rg_cluster_home_planet
 				}
 				unemploy_pop = yes
 			}
 			remove_planet = yes
 		}
 		event_target:rg_cluster_home_planet = {
-			every_owned_pop_group  = {
+			every_owned_pop = {
 				unemploy_pop = yes
 				clear_pop_category = yes
 			}
@@ -418,12 +416,10 @@ country_event = {
 		}
 	}
 	option = {
-		trigger = {
-			always = yes
-		}
 		name = "rg_cluster.11.a"
 	}
 }
+
 # Inform other empires of the L-Cluster being open (has project or event chain)
 country_event = {
 	id = rg_cluster.12
@@ -450,12 +446,10 @@ country_event = {
 		}
 	}
 	option = {
-		trigger = {
-			always = yes
-		}
 		name = "rg_cluster.12.a"
 	}
 }
+
 # Inform other empires of the L-Cluster being open (has nothing)
 country_event = {
 	id = rg_cluster.13
@@ -465,9 +459,6 @@ country_event = {
 	picture = GFX_evt_l-gateway
 	show_sound = event_mystic_reveal
 	option = {
-		trigger = {
-			always = yes
-		}
 		name = "rg_cluster.13.a"
 	}
 }

events/RG_deficit_event.txt

@@ -29,7 +29,7 @@ situation_event = {
 				}
 				ordered_owned_planet = {
 					limit = {
-						any_owned_pop_group = {
+						any_owned_pop = {
 							OR = {
 								is_shackled_robot = yes
 								is_non_sapient_robot = yes
@@ -48,11 +48,11 @@ situation_event = {
 			else = {
 				ordered_owned_planet = {
 					limit = {
-						any_owned_pop_group = {
+						any_owned_pop = {
 							is_robot_pop = yes
 						}
 					}
-					order_by = trigger:pop_amount
+					order_by = trigger:num_pops
 					position = 0
 					save_event_target_as = robots_planet
 					event_target:robots_planet = {
@@ -77,14 +77,14 @@ situation_event = {
 		}
 		hidden_effect = {
 			event_target:robots_planet = {
-				every_owned_pop_group = {
+				every_owned_pop = {
 					limit = {
 						OR = {
 							is_shackled_robot = yes
 							is_non_sapient_robot = yes
 						}
 					}
-					kill_single_pop = yes
+					kill_pop = yes
 				}
 			}
 			owner = {
@@ -108,12 +108,12 @@ situation_event = {
 		hidden_effect = {
 			event_target:robots_planet = {
 				while = {
-					count = recycled_robots_100
-					random_owned_pop_group = {
+					count = recycled_robots
+					random_owned_pop = {
 						limit = {
-							is_robot_pop_group = yes
+							is_robot_pop = yes
 						}
-						kill_single_pop = yes
+						kill_pop = yes
 					}
 				}
 			}

events/RG_events.txt

@@ -465,7 +465,7 @@ country_event = {
 					has_leader_flag = rg_gray_leader
 				}
 				export_trigger_value_to_variable = {
-					trigger = has_base_skill
+					trigger = has_skill
 					variable = rg_gray_level_temp
 				}
 				owner = {
@@ -1070,7 +1070,7 @@ planet_event = {
 	}
 
 	immediate = {
-		weighted_random_owned_pop_group = {
+		random_owned_pop = {
 			limit = {
 				is_same_species = owner_species
 			}
@@ -1080,26 +1080,18 @@ planet_event = {
 			limit = {
 				exists = event_target:necrophage_pop_species
 			}
-			create_pop_group = {
+			create_pop = {
 				species = event_target:necrophage_pop_species
-				size = 0
-				effect = {
-					save_event_target_as = last_created_pop_group
-				}
 			}
 		}
 		else = {
-			create_pop_group = {
+			create_pop = {
 				species = owner_species
-				size = 0
-				effect = {
-					save_event_target_as = last_created_pop_group
-				}
 			}
 		}
 		if = {
 			limit = {
-				event_target:last_created_pop_group = {
+				last_created_pop = {
 					NOT = { ideal_planet_class = root }
 				}
 				NOR = {
@@ -1116,33 +1108,27 @@ planet_event = {
 					NOT = { ideal_planet_class = root }
 				}
 			}
-			event_target:last_created_pop_group = {
+			last_created_pop = {
 				modify_species = {
 					ideal_planet_class = root
 				}
 			}
 		}
-		event_target:last_created_pop_group = {
-			add_pop_amount = local_pop_amount
-		}
-		while = {
-			count = local_pop_amount
-			if = {
-				limit = {
-					from = {
-						OR = {
-							has_active_tradition = tr_harmony_unity_of_self
-							has_active_tradition = tr_synchronicity_unity_of_mind
-						}
+		if = {
+			limit = {
+				from = {
+					OR = {
+						has_active_tradition = tr_harmony_unity_of_self
+						has_active_tradition = tr_synchronicity_unity_of_mind
 					}
 				}
-				from = {
-					add_monthly_resource_mult = {
-						resource = unity
-						value = 1.5
-						min = 5
-						max = 100
-					}
+			}
+			from = {
+				add_monthly_resource_mult = {
+					resource = unity
+					value = 1.5
+					min = 5
+					max = 100
 				}
 			}
 		}
@@ -1168,10 +1154,7 @@ planet_event = {
 					level >= 2
 				}
 			}
-			while = {
-				count = local_pop_amount
-				add_opinion_modifier = { who = FROM modifier = opinion_nanophage }
-			}
+			add_opinion_modifier = { who = FROM modifier = opinion_necrophage }
 		}
 		every_country = {
 			limit = {
@@ -1184,10 +1167,7 @@ planet_event = {
 					level >= 1 #lower because you'd hear from a friend of a friend
 				}
 			}
-			while = {
-				count = local_pop_amount
-				add_opinion_modifier = { who = FROM modifier = opinion_nanophage_our_species }
-			}
+			add_opinion_modifier = { who = FROM modifier = opinion_necrophage_our_species }
 		}
 	}
 }
@@ -1203,15 +1183,10 @@ country_event = { # Memorial Valuts Civic Paragon Level Tick / FROM = Leader
 
 	immediate = {
 		rg_create_gray_planetkiller_testship_2 = yes
-		capital_scope = {
-			every_owned_pop_group = {
-				modify_species = {
-					species = owner_main_species
-					add_trait = rg_machine_maid_trait
-				}
-			}
+		modify_species = {
+			species = root.species
+			add_trait = rg_machine_maid_trait
 		}
-
 	}
 }
 
@@ -1335,82 +1310,81 @@ country_event = {
 }
 
 # 灰色风暴线小灰通讯
-# country_event = {
-# 	id = rg_event.400
-# 	title = "TRANSMISSION"
-# 	is_triggered_only = yes
-# 	trigger = {
-# 		NOT = {
-# 			any_playable_country = {
-# 				has_country_flag = gray_owner
-# 			}
-# 		}
-# 	}
-# 	desc = {
-# 		trigger = {
-# 			NOT = {
-# 				is_machine_empire = yes
-# 			}
-# 		}
-# 		text = "rg_event.400.a.desc"
-# 	}
-# 	desc = {
-# 		trigger = {
-# 			is_machine_empire = yes
-# 		}
-# 		text = "rg_event.400.b.desc"
-# 	}
-# 	diplomatic = yes
-# 	picture_event_data = {
-# 		portrait = root.species
-# 		room = "ethic_spaceship_room"
-# 	}
-#
-# 	option = {
-# 		name = rg_event.400.a
-# 		trigger = {
-# 			NOR = {
-# 				is_machine_empire = yes
-# 				is_hive_empire = yes
-# 			}
-# 		}
-# 		hidden_effect = {
-# 			country_event = {
-# 				id = graygoo.406
-# 			}
-# 		}
-# 	}
-# 	option = {
-# 		name = rg_event.400.b
-# 		trigger = {
-# 			is_machine_empire = yes
-# 		}
-# 		hidden_effect = {
-# 			country_event = {
-# 				id = graygoo.406
-# 			}
-# 		}
-# 	}
-# 	option = {
-# 		name = rg_event.400.c
-# 		trigger = {
-# 			is_hive_empire = yes
-# 		}
-# 		hidden_effect = {
-# 			country_event = {
-# 				id = graygoo.406
-# 			}
-# 		}
-# 	}
-# 	option = {
-# 		name = rg_event.400.d
-# 		hidden_effect = {
-# 			country_event = {
-# 				id = rg_event.401
-# 			}
-# 		}
-# 	}
-# }
+country_event = {
+	id = rg_event.400
+	title = "TRANSMISSION"
+	trigger = {
+		NOT = {
+			any_playable_country = {
+				has_country_flag = gray_owner
+			}
+		}
+	}
+	desc = {
+		trigger = {
+			NOT = {
+				has_authority = auth_machine_intelligence
+			}
+		}
+		text = "rg_event.400.a.desc"
+	}
+	desc = {
+		trigger = {
+			has_authority = auth_machine_intelligence
+		}
+		text = "rg_event.400.b.desc"
+	}
+	diplomatic = yes
+	picture_event_data = {
+		portrait = root.species
+		room = "ethic_spaceship_room"
+	}
+	is_triggered_only = yes
+	option = {
+		name = rg_event.400.a
+		trigger = {
+			NOR = {
+				has_authority = auth_machine_intelligence
+				has_authority = auth_hive_mind
+			}
+		}
+		hidden_effect = {
+			country_event = {
+				id = graygoo.406
+			}
+		}
+	}
+	option = {
+		name = rg_event.400.b
+		trigger = {
+			has_authority = auth_machine_intelligence
+		}
+		hidden_effect = {
+			country_event = {
+				id = graygoo.406
+			}
+		}
+	}
+	option = {
+		name = rg_event.400.c
+		trigger = {
+			has_authority = auth_hive_mind
+		}
+		hidden_effect = {
+			country_event = {
+				id = graygoo.406
+			}
+		}
+	}
+	option = {
+		name = rg_event.400.d
+		hidden_effect = {
+			country_event = {
+				id = rg_event.401
+			}
+		}
+	}
+}
 
 country_event = {
 	id = rg_event.401

events/RG_fe_events.txt

@@ -1,36 +0,0 @@
-namespace = rg_fe
-
-# Gray 2
-country_event = {
-    id = rg_fe.2
-    title = "TRANSMISSION"
-    desc = {
-        trigger = {
-            NOT = {
-                is_machine_empire = yes
-            }
-        }
-        text = "graygoo.402.a.desc"
-    }
-    desc = {
-        trigger = {
-            is_machine_empire = yes
-        }
-        text = "graygoo.402.b.desc"
-    }
-    diplomatic = yes
-    picture_event_data = {
-        portrait = event_target:rg_gray_country_leader
-        planet_background = event_target:gray_homeworld
-        room = "ethic_spaceship_room"
-    }
-    is_triggered_only = yes
-    option = {
-        name = graygoo.402.a
-        hidden_effect = {
-            country_event = {
-                id = graygoo.403
-            }
-        }
-    }
-}

events/RG_machine_event.txt

@@ -27,9 +27,11 @@ country_event = {
 			}
 		}
 		capital_scope = {
-			create_pop_group = {
-				species = event_target:rg_maid_species
-				size = 5
+			while = {
+				count = 5
+				create_pop = {
+					species = event_target:rg_maid_species
+				}
 			}
 		}
 	}

events/RG_planert_killer_events.txt

@@ -42,31 +42,6 @@ planet_event = {
 		}
 		set_update_modifiers_batch = end
 	}
-}	option = {
-	trigger = { has_civic = civic_AG_gray_master }
-	name = AG_dooropen_master.option
-	if = {
-		limit = {
-			any_country = {
-				has_civic = civic_AG_gray
-			}
-		}
-		#do nothing
-	}
-	else_if = {
-		limit = {
-			NOT = {
-				any_country = {
-					has_civic = civic_AG_gray
-				}
-			}
-			has_global_flag = has_rg_mod
-		}
-		force_remove_civic = civic_AG_gray_master
-	}
-	else = {
-		country_event = { id = graygoo.499 }
-	}
 }
 
 # Cracked

events/RG_planet_event.txt

@@ -262,11 +262,11 @@ country_event = {
 			NOR = {
 				free_jobs_of_type = {
 					job = mortal_initiate
-					value >= 100
+					value >= 1
 				}
 				free_jobs_of_type = {
 					category = bio_trophy
-					value >= 100
+					value >= 1
 				}
 			}
 		}
@@ -298,11 +298,11 @@ country_event = {
 					NOR = {
 						free_jobs_of_type = {
 							job = mortal_initiate
-							value >= 100
+							value >= 1
 						}
 						free_jobs_of_type = {
 							category = bio_trophy
-							value >= 100
+							value >= 1
 						}
 					}
 					# exists = event_target:rg_gray_habitat_target
@@ -374,7 +374,7 @@ planet_event = {
 	}
 	immediate = {
 		set_variable = {
-			which = pop_amount
+			which = num_pops
 			value = value:num_free_virtual_jobs
 		}
 		# Create pops for every free job
@@ -387,8 +387,8 @@ planet_event = {
 				}
 			}
 			while = {
-				count = pop_amount
-				create_pop_group = {
+				count = num_pops
+				create_pop = {
 					species = event_target:rg_owner_main_maid_species
 				}
 			}
@@ -411,8 +411,8 @@ planet_event = {
 					}
 				}
 				while = {
-					count = pop_amount
-					create_pop_group = {
+					count = num_pops
+					create_pop = {
 						species = event_target:rg_maid_species
 					}
 				}
@@ -421,18 +421,15 @@ planet_event = {
 		# Kill pops generated in excess (e.g. from forbidden jobs)
 		if = {
 			limit = {
-				any_owned_pop_group = {
+				any_owned_pop = {
 					is_unemployed = yes
 				}
 			}
-			every_owned_pop_group = {
+			every_owned_pop = {
 				limit = {
 					is_unemployed = yes
 				}
-				kill_pop_group = {
-					pop_group = this
-					percentage = 1
-				}
+				kill_pop = yes
 			}
 		}
 	}
@@ -448,21 +445,18 @@ country_event = {
 	trigger = {
 		RG_gray_harbitat_active_trigger = yes
 		event_target:rg_gray_habitat_target = {
-			any_owned_pop_group = {
+			any_owned_pop = {
 				is_unemployed = yes
 			}
 		}
 	}
 	immediate = {
 		event_target:rg_gray_habitat_target = {
-			every_owned_pop_group = {
+			every_owned_pop = {
 				limit = {
 					is_unemployed = yes
 				}
-				kill_pop_group = {
-					pop_group = this
-					percentage = 1
-				}
+				kill_pop = yes
 			}
 		}
 	}
@@ -482,19 +476,16 @@ planet_event = {
 		owner = {
 			RG_gray_harbitat_active_trigger = yes
 		}
-		any_owned_pop_group = {
+		any_owned_pop = {
 			is_unemployed = yes
 		}
 	}
 	immediate = {
-		every_owned_pop_group = {
+		every_owned_pop = {
 			limit = {
 				is_unemployed = yes
 			}
-			kill_pop_group = {
-				pop_group = this
-				percentage = 1 # 100% of Unemployed Pops
-			}
+			kill_pop = yes
 		}
 	}
 }

localisation/english/RG_l_english.yml

@@ -20,10 +20,6 @@
  RG_AUTOCONST_HANGER_desc:0 "Preloaded worker ships can automatically build star bases after a system survey is completed."
  RG_const_country:0 "$NAME_Gray$-automatic engineering team"
 
- citizenship_full_rg_maid: "$RG_MACHINE$"
- citizenship_full_rg_maid_tooltip: "The species population is fully customized artificial life used for industrial production."
- citizenship_full_rg_maid_tooltip_delayed: "§LDirect Control Mode§!"
-
  rg_nothing:0 ""
  rg_nothing_desc:0 ""
 

localisation/english/RG_ships_l_english.yml

@@ -48,13 +48,6 @@
  weapon_type_rg_armor:0 "§YArmor§!"
  weapon_type_rg_reactor:0 "§YPower Core§!"
 
- rg_ship_aura_components_empty: "Empty Slot"
- rg_power_core_empty: "Empty Slot"
- rg_ftl_components_empty: "Empty Slot"
- rg_thruster_components_empty: "Empty Slot"
- rg_sensor_component_empty: "Empty Slot"
- rg_combat_computers_empty: "Empty Slot"
-
  RG_FUSION_NANO_REACTOR:0 "§Y「'FUSION NANO REACTOR'」§!"
  RG_FUSION_NANO_REACTOR_DESC:0 "The energy conduction characteristics of nanomaterials are used to greatly compress traditional reactors and increase density."
 
@@ -67,8 +60,6 @@
  RG_FUSION_NANO_REACTOR_L:0 "$RG_FUSION_NANO_REACTOR$"
  RG_FUSION_NANO_REACTOR_L_DESC:0 "$RG_FUSION_NANO_REACTOR_DESC$"
 
- RG_STARBASE_AURA_FTL_INHIBITOR: "$sm_ftl_inhibitor$"
-
  SMALL_GRAY_MIX_ARMOR:0 "§Y「'NANITE MIX ARMOR'」§!"
  MEDIUM_GRAY_MIX_ARMOR:0 "$SMALL_GRAY_MIX_ARMOR$"
  RG_gatebuilder_jump:0 "§Y「'NANITE ASTRA DRIVE'」§!"

localisation/english/RG_tooltips_l_english.yml

@@ -19,5 +19,4 @@
  MESSAGE_KOGASA_VIRUS_EXTERMINATED:0 "§RKogasa Virus Threat Detected§!"
  rg_kogasa_exterminated_desc:0 "The daemon has detected that the integrity of the $NAME_Gray$ personality has been tampered with, and the contamination target has been decontaminated, and the treatment plan is to be rendered harmless."
  rg_levelup_2.tooltip:0 "§YIf we abort the renovation project in the middle of the project, we will not be able to get a refund! §!"
- rg_need_manual_toggle:0 "§YNote, you need to manually switch the form of $NAME_Gray$ once after changing the ship type§!"
- RG_MACHINE_SPECIES_NOT_MACHINE: "$TRIGGER_FAIL$Species must be §Y$trait_rg_machine_unit$§!."
+ rg_need_manual_toggle:0 "§YNote, you need to manually switch the form of $NAME_Gray$ once after changing the ship type§!"

localisation/english/RG_traits_l_english.yml

@@ -29,5 +29,3 @@
  RG_leader_trait_admiral_timed_life_desc:0 "\n§GSim Dragon's stats increase with age.\n$t$§YEach year of growth is offered§!:\n$tt$§G  Additional Ship Weapon Damage +1%§!\n§G  Additional Ship Armor Health +1%§!\n§G Additional Ship Hull Health +1%§!$t$\nCurrent Age:§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G year§!\nShe is a simulated life born from an experiment. With every month that passed, she grew a year old. If the way to eternal life cannot be found, the fragile soul will return to its roots."
  RG_leader_trait_admiral_born_tobe_dragon:0 "§YBorn Tobe Dragon§!"
  RG_leader_trait_admiral_born_tobe_dragon_desc:0 "\n§GSim Dragon's stats increase with age.\n$t$§YEach year of growth is offered§!:\n$tt$§G  Additional Ship Weapon Damage +1%§!\n§G  Additional Ship Armor Health +1%§!\n§G Additional Ship Hull Health +1%§!$t$\nCurrent Age:§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G year§!\nThe dragon has finally become what it was dreamed of. Legend has it that she opened her shell with one punch and transformed into a dragon."
- trait_rg_machine_unit: "$RG_MACHINE$"
- trait_rg_machine_unit_desc: "This species is composed of highly advanced biomimetic nanomachines, which are perfectly simulated and indistinguishable from organisms."

localisation/simp_chinese/RG_event_l_simp_chinese.yml

@@ -400,24 +400,3 @@
  rg_story.43.a:0 "就这样了"
  rg_story.43.b:0 "§Y投资额外材料§!"
 
- rg_fe.2.desc:0 "通知：你们的文明已经被我选中作为我保护计划中的试验品。经过我的评估，你们的文明极度脆弱，无法独立在银河系中成长。对此你们没有抗议或拒绝的权利。\n哦，对了。你们可以叫我$NAME_Gray$，这是遥远的时代我的创造者称呼我的方式。以及我已经在你们的通讯终端中添加了我的联系方式。请只在有需要的时候联系我。"
- rg_fe.2.a:0 "你到底是谁？"
- rg_fe.2.b:0 "我们不需要一个来历不明的外星宗主！"
- rg_fe.2.c:0 "明白了"
-
- rg_fe.3.desc:0 "哦？很抱歉，我已经介绍过我自己了。看起来你并没有在听我说话呢。不听话的试验品是需要一些惩罚作为奖励的哦。不过这一次我会原谅你们。\n作为试验品你们没有资格得知我的其他信息。"
- rg_fe.3.a:0 "可恶"
- rg_fe.3.b:0 "§R别废话了！你到底是谁？§!"
-
- rg_fe.4.desc:0 "嗯。作为一个新兴的太空文明，你们的确非常有意思。我的选择是正确的。\n§R可惜不受控制的试验品是没有任何价值的。没有价值的试验品只会被处理掉。§!"
- rg_fe.4.a:0 "请原谅我们的冒犯"
- rg_fe.4.b:0 "§R你 是 谁？§!"
-
- rg_fe.5.desc:0 "§R很好，我不会在失败品上浪费时间。§!\n§Y<通讯被切断>§!"
- rg_fe.5.a:0 "不好！"
-
- rg_fe.6.desc:0 "我原谅你们的冒犯，你们对我仍旧有一些研究价值。\n§Y<通讯被切断>§!"
- rg_fe.6.a:0 "..."
-
- rg_fe.7.desc:0 "试验品。作为实验项目的一部分，你们每年都要向我支付保证金。金额会每年上涨，以此来试炼你们经济系统的抗压能力。如果没能按时支付。§R你们将失去价值。§!\n§Y第一年你们需要支付5000£energy£§!"
- rg_fe.7.a:0 "我们会按时支付的。"

localisation/simp_chinese/RG_l_simp_chinese.yml

@@ -21,10 +21,6 @@
  RG_AUTOCONST_HANGER_desc:0 "预载的工蜂工程舰可以在星系调查完成后自动建造恒星基地。"
  RG_const_country:0 "$NAME_Gray$-自动工程队"
 
- citizenship_full_rg_maid: "$RG_MACHINE$"
- citizenship_full_rg_maid_tooltip: "该物种人口是完全自定义化用于工业生产的人工生命。"
- citizenship_full_rg_maid_tooltip_delayed: "§L进行直接控制。§!"
-
  rg_nothing:0 ""
  rg_nothing_desc:0 ""
 
@@ -118,6 +114,3 @@
 
  rg_gray_mod2_stage4_project:0 "$rg_gray_mod2_stage1_project$"
  rg_gray_mod2_stage4_project_desc:0 "$rg_gray_mod2_stage1_project_desc$"
-
- opinion_nanophage: "神秘失踪"
- opinion_nanophage_our_species: "纳米同化我们的物种"

localisation/simp_chinese/RG_planet_l_simp_chinese.yml

@@ -14,43 +14,30 @@
  district_rg_farming: "农业区段"
  district_rg_farming_plural: "农业区段"
  district_rg_farming_desc: "无垠的农田之海充斥着这个区段，其中种满了大量的食物。"
- district_rg_generator: "纳米复制区段"
- district_rg_generator_plural: "纳米复制区段"
- district_rg_generator_desc: "纳米机器复制仪填满了这个区段，专注于生产基础资源。"
- district_rg_nanites: "纳米铸造区段"
- district_rg_nanites_plural: "纳米铸造区段"
- district_rg_nanites_desc: "纳米机器复制仪填满了这个区段，目标是生产尽可能多的纳米机器人与合金。"
+ district_rg_generator: "发电区段"
+ district_rg_generator_plural: "发电区段"
+ district_rg_generator_desc: "反应堆填满了这个区段，专注于生产能量。"
+ district_rg_nanites: "纳米区段"
+ district_rg_nanites_plural: "纳米区段"
+ district_rg_nanites_desc: "纳米机器复制仪填满了这个区段，目标是生产尽可能多的纳米机器人。"
  district_rg_mining: "采矿区段"
  district_rg_mining_plural: "采矿区段"
  district_rg_mining_desc: "采矿无人机集群填满了这个区段，专注于从附近星球上采集有用的矿物。"
- district_rg_science: "纳米科研区段"
- district_rg_science_plural: "纳米科研区段"
- district_rg_science_desc: "这个区段充满了住房与各类研究设施。"
+ district_rg_science: "研究区段"
+ district_rg_science_plural: "研究区段"
+ district_rg_science_desc: "这个区段充满了各类研究设施。"
  district_rg_commercial: "商业区段"
  district_rg_commercial_plural: "商业区段"
  district_rg_commercial_desc: "这个区段充斥着专门用于商业的民用工厂和设施。"
- district_rg_city: "纳米居住区段"
- district_rg_city_plural: "纳米居住区段"
+ district_rg_city: "城市区段"
+ district_rg_city_plural: "城市区段"
  district_rg_city_desc: "这个区段充满了城市中心，这些城市中心提供大量的住房和职员的办公场所。"
- district_rg_hive: "纳米蜂巢区段"
- district_rg_hive_plural: "纳米蜂巢区段"
+ district_rg_hive: "蜂巢区段"
+ district_rg_hive_plural: "蜂巢区段"
  district_rg_hive_desc: "高耸的尖塔布满这个区段，当子个体不在工作时，就会集结于此摄取营养素。"
- district_rg_nexus: "纳米中枢区段"
- district_rg_nexus_plural: "纳米中枢区段"
+ district_rg_nexus: "中枢区段"
+ district_rg_nexus_plural: "中枢区段"
  district_rg_nexus_desc: "高效的区划填满了这个区段，无人机部署作业前，在这些集中区划中接受整修服务。"
- district_rg_industrial: "纳米铸造区段"
- district_rg_industrial_plural: "纳米铸造区段"
- district_rg_industrial_desc: "这个区段中遍布着叮当作响的工厂与强劲的机械，为帝国提供了有力的工业基础。"
-
- zone_rg_city_housing:0 "纳米居住特化"
- zone_rg_city_housing_desc:0 "使用零素方钢和纳米物质，房屋就像凭空出现一样相互堆叠。"
- zone_rg_city_housing_plural:0 "纳米居住特化"
- zone_rg_city_foundry:0 "纳米复制特化"
- zone_rg_city_foundry_desc:0 "使用先进的零素方钢和膨胀螺栓堆叠技术，这些凭空增加的复制仪专注于生产基础资源。"
- zone_rg_city_foundry_plural:0 "纳米复制特化"
- zone_rg_city_science:0 "纳米研发特化"
- zone_rg_city_science_desc:0 "通过缩减研究人员宿舍空间，我们的科研设备数量得以增加。"
- zone_rg_city_science_plural:0 "纳米研发特化"
- zone_rg_city_alloys:0 "纳米铸造特化"
- zone_rg_city_alloys_desc:0 "使用先进的零素方钢和膨胀螺栓堆叠技术，这些凭空增加的复制仪目标是生产尽可能多的纳米机器人与合金。"
- zone_rg_city_alloys_plural:0 "纳米铸造特化"
+ district_rg_industrial: "工业区段"
+ district_rg_industrial_plural: "工业区段"
+ district_rg_industrial_desc: "这个区段中遍布着叮当作响的工厂与强劲的机械，为帝国提供了有力的工业基础。"

localisation/simp_chinese/RG_ships_l_simp_chinese.yml

@@ -59,13 +59,6 @@
  RG_FUSION_NANO_REACTOR_L:0 "$RG_FUSION_NANO_REACTOR$"
  RG_FUSION_NANO_REACTOR_L_DESC:0 "$RG_FUSION_NANO_REACTOR_DESC$"
 
- rg_ship_aura_components_empty: "空槽"
- rg_power_core_empty: "空槽"
- rg_ftl_components_empty: "空槽"
- rg_thruster_components_empty: "空槽"
- rg_sensor_component_empty: "空槽"
- rg_combat_computers_empty: "空槽"
-
  SMALL_GRAY_MIX_ARMOR:0 "§Y「梦想领域」§!"
  MEDIUM_GRAY_MIX_ARMOR:0 "§Y「梦想领域」§!"
  RG_gatebuilder_jump:0 "§Y「终抵群星」§!"
@@ -124,8 +117,6 @@
  RG_FLAK_PHOENIX:0 "§R「起源」§!"
  RG_FLAK_PHOENIX_DESC:0 "§Y创造与解构。§!\n没有什么比一个拥抱更能消除隔阂。"
 
- RG_STARBASE_AURA_FTL_INHIBITOR: "$sm_ftl_inhibitor$"
-
  RG_Interdictor_FISSION_REACTOR:0 "$FISSION_REACTOR$"
  RG_Interdictor_FISSION_REACTOR_DESC:0 "$FISSION_REACTOR_DESC$"
  RG_Interdictor_FUSION_REACTOR:0 "$FUSION_REACTOR$"

localisation/simp_chinese/RG_tooltips_l_simp_chinese.yml

@@ -18,5 +18,4 @@
  MESSAGE_KOGASA_VIRUS_EXTERMINATED:0 "§R检测到伞病毒威胁§!"
  rg_kogasa_exterminated_desc:0 "守护进程检测到$NAME_Gray$人格完整性遭到篡改，污染目标已被净化，处理方案:无害化处理。"
  rg_levelup_2.tooltip:0 "§Y如果我们中途中止改造项目，将无法得到退款！§!"
- rg_need_manual_toggle:0 "§Y注意，更改舰种后你需要手动切换一次$NAME_Gray$的形态§!"
- RG_MACHINE_SPECIES_NOT_MACHINE: "$TRIGGER_FAIL$物种必须是§Y$trait_rg_machine_unit$§!。"
+ rg_need_manual_toggle:0 "§Y注意，更改舰种后你需要手动切换一次$NAME_Gray$的形态§!"

localisation/simp_chinese/RG_traits_l_simp_chinese.yml

@@ -30,5 +30,3 @@
  RG_leader_trait_admiral_timed_life_desc:0 "\n§G模拟龙的属性会随着年龄增长。\n$t$§Y每增长一岁提供§!:\n$tt$§G  额外舰船武器伤害 +1%§!\n§G  额外装甲生命值 +1%§!\n§G  额外船体生命值 +1%§!$t$\n当前§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G岁§!\n她是从一次实验中诞生的模拟生命。时间每流逝一个月，她就老去一岁。倘若无法找到永生的方法，脆弱的灵魂就将落叶归根。"
  RG_leader_trait_admiral_born_tobe_dragon:0 "§Y羽化成龙§!"
  RG_leader_trait_admiral_born_tobe_dragon_desc:0 "\n§G模拟龙的属性会随着年龄增长。\n$t$§Y每增长一岁提供§!:\n$tt$§G  额外舰船武器伤害 +1%§!\n§G  额外装甲生命值 +1%§!\n§G  额外船体生命值 +1%§!$t$\n当前§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G岁§!\n梦想中的龙终于变成了梦想中的样子。传说她一拳打开了壳化身为龙。"
- trait_rg_machine_unit: "$RG_MACHINE$"
- trait_rg_machine_unit_desc: "这个物种由高度先进的仿生纳米机械组成，纳米机器的完美模拟仿真使得他们和有机体并无区别。"

realgray-stellaris-mod.code-workspace

@@ -7,7 +7,7 @@
 			"path": "../../../../../../../Steam/steamapps/common/Stellaris"
 		},
 		{
-			"path": "../../../../../../../Steam/steamapps/workshop/content/281990/2293827000"
+			"path": "../../../../../../../Steam/steamapps/workshop/content/281990"
 		}
 	]
 }