整理effect

common/scripted_effects/!_RG_gray_goo_effects_overwrite.txt

@@ -18,6 +18,7 @@ create_gray_const = {
 	rg_create_gray_const = yes
 }
 
+#开启L-星团事件链
 start_lcluster_chain = {
 	if = {
 		limit = {

common/scripted_effects/RG_gray_init_effects.txt

@@ -3,7 +3,7 @@
 rg_global_gray_location_check = {
 	if = {
 		limit = {
-			has_country_flag = gray_constship_active
+			RG_gray_scientist_active_trigger = yes
 		}
 		if = {
 			limit = {
@@ -24,7 +24,7 @@ rg_global_gray_location_check = {
 	}
 	else_if = {
 		limit = {
-			has_country_flag = gray_warship_active
+			RG_gray_warship_active_trigger = yes
 		}
 		if = {
 			limit = {
@@ -66,10 +66,7 @@ rg_global_gray_location_check = {
 	}
 	else_if = {
 		limit = {
-			OR = {
+			RG_gray_official_active_trigger = yes
-				has_country_flag = gray_official_active
-				has_country_flag = gray_governor_active #旧版flag
-			}
 		}
 		if = {
 			limit = {
@@ -98,7 +95,7 @@ rg_global_gray_location_check = {
 	}
 	else_if = {
 		limit = {
-			has_country_flag = gray_army_active
+			RG_gray_army_active_trigger = yes
 		}
 		if = {
 			limit = {
@@ -129,7 +126,7 @@ rg_global_gray_location_check = {
 	}
 	else_if = {
 		limit = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 		if = {
 			limit = {exists = event_target:rg_gray_habitat_target}
@@ -189,14 +186,120 @@ rg_sent_gray_back_to_home_effect = {
 	}
 }
 
+#Country event_target:gray_owner
+#小灰领袖标识清理
+rg_clear_gray_active_flag_effect = {
+	remove_country_flag = gray_warship_active
+	remove_country_flag = gray_constship_active
+	remove_country_flag = gray_army_active
+	remove_country_flag = gray_official_active
+	remove_country_flag = gray_governor_active #旧版flag
+}
+
+#Country event_target:gray_owner
+#小灰总督启用标识
+rg_set_gray_official_active_effect = {
+	set_country_flag = gray_official_active #新版flag
+	set_country_flag = gray_governor_active #旧版flag
+}
+
+#Country event_target:gray_owner
+#小灰战舰启用标识
+rg_set_gray_warship_active_effect = {
+	set_country_flag = gray_warship_active
+}
+
+#Country event_target:gray_owner
+#小灰科学家启用标识
+rg_set_gray_scientist_active_effect = {
+	set_country_flag = gray_official_active #新版flag
+	set_country_flag = gray_governor_active #旧版flag
+}
+
+#Country event_target:gray_owner
+#小灰陆军启用标识
+rg_set_gray_army_active_effect = {
+	set_country_flag = gray_army_active
+}
+#Country event_target:gray_owner
+#小灰科学家启用标识
+rg_set_gray_scientist_active_effect = {
+	set_country_flag = gray_constship_active
+}
+#Country event_target:gray_owner
+#小灰纳米空间站启用标识
+rg_set_gray_harbitat_active_effect = {
+	set_country_flag = rg_habitat_enabled
+}
+#Country event_target:gray_owner
+#删除小灰科学家
+rg_clear_gray_science_ship_effect = {
+	every_owned_fleet = {
+		limit = {
+			has_fleet_flag = gray_constship
+		}
+		delete_fleet = {
+			target = this
+			kill_leader = no
+			destroy_template = yes
+		}
+	}
+}
+#Country event_target:gray_owner
+#删除小灰陆军
+rg_clear_gray_army_effect = {
+	every_owned_army = {
+		limit = {
+			army_type = gray_army
+		}
+		if = {
+			limit = {
+				exists = leader
+			}
+			unassign_leader = leader
+		}
+		remove_army = yes
+	}
+}
+#Country event_target:gray_owner
+#删除小灰战舰
+rg_clear_gray_warship_effect = {
+	every_owned_fleet = {
+		limit = {
+			has_fleet_flag = gray_fleet
+		}
+		delete_fleet = {
+			target = this
+			kill_leader = no
+			destroy_template = yes
+		}
+	}
+}
+#Country event_target:gray_owner
+#删除小灰纳米空间站
+rg_clear_harbitat = {
+	remove_country_flag = rg_habitat_enabled
+	event_target:rg_gray_habitat_target = {
+		remove_planet = yes
+	}
+}
+#Country event_target:gray_owner
+#等级导入，把存储的领袖等级赋予到领袖身上
+rg_set_varible_as_leader_level_effect = {
+	random_owned_leader = {
+		limit = {
+			has_leader_flag = rg_gray_leader
+		}
+		set_skill = owner.rg_gray_level
+	}
+}
+
+#Country event_target:gray_owner
 #创造灰风总督
 rg_create_gray_governor = {
 	if = {
 		limit = {
-			OR = {
+			RG_gray_official_active_trigger = yes
-				has_country_flag = gray_official_active
-				has_country_flag = gray_governor_active #旧版flag
-			}
 		}
 	}
 	else = {
@@ -241,14 +344,7 @@ rg_create_gray_governor = {
 		#存储当前领袖等级
 		rg_save_gray_leader_level_effect = yes
 		#把所有种类的小灰领袖都送回娘家
-		every_owned_leader = {
+		rg_sent_gray_back_to_home_effect = yes
-			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 = {
@@ -263,30 +359,22 @@ rg_create_gray_governor = {
 		else = {
 			rg_gray_govener_init = yes
 		}
-		#设置总督已启用标识
-		set_country_flag = gray_official_active #新版flag
-		set_country_flag = gray_governor_active #旧版flag
 		#更新灰风形态
-		remove_country_flag = gray_warship_active
+		rg_clear_gray_active_flag_effect = yes
-		remove_country_flag = rg_kac_grayfleet_active
+		#设置总督已启用标识
-		remove_country_flag = gray_constship_active
+		rg_set_gray_official_active_effect = yes
-		remove_country_flag = gray_army_active
 		
 		#等级导入，把存储的领袖等级赋予到领袖身上
-		random_owned_leader = {
+		rg_set_varible_as_leader_level_effect = yes
-			limit = {
-				has_leader_flag = gray_governor
-			}
-			set_skill = owner.rg_gray_level
-		}
 	}
 }
 
+#Country event_target:gray_owner
 #创造灰风战舰
 rg_create_gray_warship = {
 	if = {
 		limit = {
-			has_country_flag = gray_warship_active
+			RG_gray_warship_active_trigger = yes
 		}
 	}
 	else = {
@@ -295,14 +383,9 @@ rg_create_gray_warship = {
 		rg_global_gray_location_check = yes
 		#存储当前领袖等级
 		rg_save_gray_leader_level_effect = yes
-		every_owned_leader = {
+		#把所有种类的小灰领袖都送回娘家
-			limit = {
+		rg_sent_gray_back_to_home_effect = yes
-				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_leader_admiral
@@ -315,7 +398,7 @@ rg_create_gray_warship = {
 		else = {
 			rg_gray_commander_init = yes
 		}
-		set_country_flag = gray_warship_active
+
 		if = {
 			limit = {
 				has_country_flag = rg_gray_level_2
@@ -340,63 +423,36 @@ rg_create_gray_warship = {
 		else = {
 			rg_warship_init_mod0 = yes
 		}
-		every_owned_army = {
+		#删除科学舰
-			limit = {
+		rg_clear_gray_science_ship_effect = yes
-				army_type = gray_army
+		#删除陆军
-			}
+		rg_clear_gray_army_effect = yes
-			if = {
+		#更新灰风形态
-				limit = {
+		rg_clear_gray_active_flag_effect = yes
-					exists = leader
+		#设置战舰已启用标识
-				}
+		rg_set_gray_warship_active_effect = yes
-				unassign_leader = leader
+		#导入变量到等级
-			}
+		rg_set_varible_as_leader_level_effect = yes
-			remove_army = yes
-		}
-		every_owned_fleet = {
-			limit = {
-				has_fleet_flag = gray_constship
-			}
-			delete_fleet = {
-				target = this
-				kill_leader = no
-				destroy_template = yes
-			}
-		}
-
-		remove_country_flag = gray_constship_active
-		remove_country_flag = gray_governor_active #旧版flag
-		remove_country_flag = gray_official_active
-		remove_country_flag = gray_army_active
-		
-		random_owned_leader = {
-			limit = {
-				has_leader_flag = gray_admiral
-			}
-			set_skill = owner.rg_gray_level
-		}
 	}
 }
 
+#Country event_target:gray_owner
 #创造灰风地面单位
 rg_create_gray_army = {
 	if = {
 		limit = {
-			has_country_flag = gray_army_active
+			RG_gray_army_active_trigger = yes
 		}
 	}
 	else = {
 		optimize_memory
 		#舰船刷新位置检测
 		rg_global_gray_location_check = yes
+		#存储当前领袖等级
 		rg_save_gray_leader_level_effect = yes
-		every_owned_leader = {
+		#把所有种类的小灰领袖都送回娘家
-			limit = {
+		rg_sent_gray_back_to_home_effect = yes
-				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_leader_general
@@ -409,89 +465,32 @@ rg_create_gray_army = {
 		else = {
 			rg_gray_commander_init = yes
 		}
-		create_ship_design = {
+		rg_army_transport_ship_init = yes
-			design = "NAME_RG_armed_transport_ship"
+		rg_clear_gray_warship_effect = yes
-		}
+		rg_clear_gray_science_ship_effect = yes
-		add_ship_design = last_created_design
+		rg_clear_gray_active_flag_effect = yes
-		set_country_flag = gray_army_active
+		rg_set_gray_army_active_effect = yes
-		create_fleet = {
+		rg_set_varible_as_leader_level_effect = yes
-			name = "NAME_Gray"
-			effect = {
-				set_owner = prev
-				create_army_transport = {
-					ship_name = "NAME_Gray"
-					army_name = "NAME_Gray"
-					army_type = "gray_army"
-				}
-				set_location = {
-					target = event_target:global_gray_location
-					distance = 0
-					angle = random
-				}
-				# set_cloaking_active = yes
-				set_fleet_stance = aggressive
-			}
-		}
-		last_created_army = {
-			assign_leader = event_target:gray_leader_general
-		}
-		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
-			}
-		}
-
-		remove_country_flag = gray_warship_active
-		remove_country_flag = rg_kac_grayfleet_active
-		remove_country_flag = gray_governor_active #旧版flag
-		remove_country_flag = gray_official_active
-		remove_country_flag = gray_constship_active
-		
-		remove_ship_design = last_created_design
-		random_owned_leader = {
-			limit = {
-				has_leader_flag = gray_general
-			}
-			set_skill = owner.rg_gray_level
-		}
 	}
 }
 
+#Country event_target:gray_owner
 #创造灰风科学舰
 rg_create_gray_const = {
 	if = {
 		limit = {
-			has_country_flag = gray_constship_active
+			RG_gray_scientist_active_trigger = yes
 		}
 	}
 	else = {
 		optimize_memory
 		#舰船刷新位置检测
 		rg_global_gray_location_check = yes
+		#存储当前领袖等级
 		rg_save_gray_leader_level_effect = yes
-		every_owned_leader = {
+		#把所有种类的小灰领袖都送回娘家
-			limit = {
+		rg_sent_gray_back_to_home_effect = yes
-				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_leader_scientist
@@ -504,75 +503,21 @@ rg_create_gray_const = {
 		else = {
 			rg_gray_scientist_init = yes
 		}
-		set_country_flag = gray_constship_active
-		create_fleet = {
-			name = "NAME_Gray"
-			settings = {
-				can_upgrade = no
-				can_disband = no
-				can_change_composition = no
-				can_change_leader = yes
-				uses_naval_capacity = no
-				spawn_debris = no
-			}
-			effect = {
-				set_owner = prev
-				create_ship = {
-					name = "NAME_Gray"
-					design = "NAME_RG_GRAY_scienceship"
-					prefix = no
-					upgradable = yes
-				}
-				set_fleet_stance = evasive
-				set_location = {
-					target = event_target:global_gray_location
-					distance = 0
-					angle = random
-				}
-				set_fleet_flag = gray_constship
-				save_global_event_target_as = global_gray_constship
-				set_cloaking_active = yes
-				assign_leader = event_target:gray_leader_scientist
-			}
-		}
-		every_owned_fleet = {
-			limit = {
-				has_fleet_flag = gray_fleet
-			}
-			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
-		}
 
-		remove_country_flag = gray_army_active
+		rg_scientist_ship_init = yes
-		remove_country_flag = gray_warship_active
+		rg_clear_gray_warship_effect = yes
-		remove_country_flag = rg_kac_grayfleet_active
+		rg_clear_gray_army_effect = yes
-		remove_country_flag = gray_governor_active #旧版flag
-		remove_country_flag = gray_official_active
 
-		random_owned_leader = {
+		rg_clear_gray_active_flag_effect = yes
-			limit = {
+
-				has_leader_flag = gray_scientist
+		rg_set_gray_scientist_active_effect = yes
-			}
+
-			set_skill = owner.rg_gray_level
+		rg_set_varible_as_leader_level_effect = yes
-		}
 	}
 }
 
+#Country event_target:gray_owner
+#计算纳米空间站行星规模 基本10+（小灰领袖等级rg_gray_level*2）
 rg_harbitar_size_calculate = {
 	set_variable = {
 		which = rg_habitat_size
@@ -596,16 +541,17 @@ rg_harbitar_size_calculate = {
 	}
 }
 
+#Country event_target:gray_owner
+#创造灰风纳米空间站
 rg_juggernaut_habitat_init = {
 	if = {
 		limit = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 	}
 	else = {
 		optimize_memory
 		rg_global_gray_location_check = yes
-		set_country_flag = rg_habitat_enabled
 		rg_harbitar_size_calculate = yes
 		event_target:global_gray_location = {
 			solar_system = {
@@ -731,13 +677,9 @@ rg_juggernaut_habitat_init = {
 				}
 			}
 		}
+		rg_set_gray_harbitat_active_effect = yes
 	}
 }
 
-rg_clear_harbitat = {
+
-	remove_country_flag = rg_habitat_enabled
-	event_target:rg_gray_habitat_target = {
-		remove_planet = yes
-	}
-}
 

common/scripted_effects/RG_gray_leader_init_effects.txt

@@ -63,7 +63,6 @@ rg_gray_govener_init = {
 					add_trait_no_notify = trait_ruler_architectural_sense_3
 					add_trait_no_notify = leader_trait_distribution_lines_2
 				}
-				rg_gray_leader_experience_jar = yes
 			}
 		}
 		last_created_leader = {
@@ -72,6 +71,7 @@ rg_gray_govener_init = {
 	}
 	last_created_leader = {
 		set_leader_flag = has_gained_level_trait
+		rg_gray_leader_experience_jar = yes
 	}
 	random_owned_leader = {
 		limit = {
@@ -180,7 +180,6 @@ rg_gray_commander_init = {
 				add_trait_no_notify = leader_trait_carrier_specialization
 				add_trait_no_notify = leader_trait_juryrigger_2
 				add_trait_no_notify = leader_trait_reinforcer_2
-				rg_gray_leader_experience_jar = yes
 			}
 		}
 		last_created_leader = {
@@ -189,6 +188,7 @@ rg_gray_commander_init = {
 	}
 	last_created_leader = {
 		set_leader_flag = has_gained_level_trait
+		rg_gray_leader_experience_jar = yes
 	}
 	random_owned_leader = {
 		limit = {
@@ -503,7 +503,6 @@ rg_gray_scientist_init = {
 					set_leader_flag = "gray_leader"					# "gray_leader"==rg_gray_leader
 					set_leader_flag = gray_leader
 				}
-				rg_gray_leader_experience_jar = yes
 			}
 		}
 		last_created_leader = {
@@ -512,6 +511,7 @@ rg_gray_scientist_init = {
 	}
 	last_created_leader = {
 		set_leader_flag = has_gained_level_trait
+		rg_gray_leader_experience_jar = yes
 	}
 	random_owned_leader = {
 		limit = {
@@ -606,11 +606,11 @@ rg_gray_country_leader_init = {
 				add_trait_no_notify = trait_ruler_architectural_sense_3
 				add_trait_no_notify = leader_trait_distribution_lines_2
 			}
-			rg_gray_leader_experience_jar = yes
 		}
 	}
 	last_created_leader = {
 		rg_set_gray_portrait = yes
+		rg_gray_leader_experience_jar = yes
 	}
 }
 
@@ -620,14 +620,16 @@ rg_gray_leader_experience_jar = {
 			NOT = {
 				RG_has_gray_cluster_origin_trigger = yes
 			}
-			has_skill <= 10
+			has_skill < 10
 		}
 		while = {
-			count = 20 #安全限位-遇到20次加经验还没到10级的魔怔人紧急制动
 			limit = {
-				has_skill <= 10
+				has_skill < 10
 			}
 		}
-		add_experience = 5400
+		add_experience = 54000
+		event_target:gray_owner = {
+			rg_save_gray_leader_level_effect = yes
+		}
 	}
 }

common/scripted_effects/RG_gray_warship_init_effects.txt

@@ -183,3 +183,63 @@ rg_warship_init_mod0 = {
 		}
 	}
 }
+rg_army_transport_ship_init = {
+	create_ship_design = {
+		design = "NAME_RG_armed_transport_ship"
+	}
+	add_ship_design = last_created_design
+	create_fleet = {
+		name = "NAME_Gray"
+		effect = {
+			set_owner = prev
+			create_army_transport = {
+				ship_name = "NAME_Gray"
+				army_name = "NAME_Gray"
+				army_type = "gray_army"
+			}
+			set_location = {
+				target = event_target:global_gray_location
+				distance = 0
+				angle = random
+			}
+			# set_cloaking_active = yes
+			set_fleet_stance = aggressive
+		}
+	}
+	last_created_army = {
+		assign_leader = event_target:gray_leader_general
+	}
+	remove_ship_design = last_created_design
+}
+rg_scientist_ship_init = {
+	create_fleet = {
+		name = "NAME_Gray"
+		settings = {
+			can_upgrade = no
+			can_disband = no
+			can_change_composition = no
+			can_change_leader = yes
+			uses_naval_capacity = no
+			spawn_debris = no
+		}
+		effect = {
+			set_owner = prev
+			create_ship = {
+				name = "NAME_Gray"
+				design = "NAME_RG_GRAY_scienceship"
+				prefix = no
+				upgradable = yes
+			}
+			set_fleet_stance = evasive
+			set_location = {
+				target = event_target:global_gray_location
+				distance = 0
+				angle = random
+			}
+			set_fleet_flag = gray_constship
+			save_global_event_target_as = global_gray_constship
+			set_cloaking_active = yes
+			assign_leader = event_target:gray_leader_scientist
+		}
+	}
+}

common/scripted_effects/RG_scripted_effects.txt

@@ -69,7 +69,7 @@ rg_set_gray_portrait = {
 			else_if = {
 				limit = {
 					event_target:gray_owner = {
-						has_country_flag = gray_constship_active
+						RG_gray_scientist_active_trigger = yes
 					}
 					event_target:gray_scientist = {
 						change_leader_portrait = GFX_gray_scientist_portrait
@@ -80,8 +80,8 @@ rg_set_gray_portrait = {
 				limit = {
 					event_target:gray_owner = {
 						OR = {
-							has_country_flag = gray_warship_active
+							RG_gray_warship_active_trigger = yes
-							has_country_flag = gray_army_active
+							RG_gray_army_active_trigger = yes
 						}
 						
 					}
@@ -2792,21 +2792,25 @@ rg_gray_country_after_init = {
 	# 默认关闭自动建造中继器
 	# set_country_flag = rg_can_const_hyper_relay
 	# 初始化小灰领袖等级
-	if = {
-		limit = {
-			RG_has_gray_cluster_origin_trigger = yes
-		}
 	set_variable = {
 		which = rg_gray_level
 		value = 1
 	}
-	}
+	# if = {
-	else = {
+	# 	limit = {
-		set_variable = {
+	# 		RG_has_gray_cluster_origin_trigger = yes
-			which = rg_gray_level
+	# 	}
-			value = 10
+	# 	set_variable = {
-		}
+	# 		which = rg_gray_level
-	}
+	# 		value = 1
+	# 	}
+	# }
+	# else = {
+	# 	set_variable = {
+	# 		which = rg_gray_level
+	# 		value = 10
+	# 	}
+	# }
 	# 启动开局故事事件链
 	rg_storyline_trigger = yes
 	# 接受小灰建立通信

common/scripted_triggers/!_RG_scripted_trigger_overwrite.txt

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

common/scripted_triggers/RG_leader_scripted_triggers.txt

@@ -11,7 +11,6 @@ RG_gray_mod1_trigger = {
 		}
 	}
 }
-
 RG_gray_mod1_allow_trigger = {
 	hidden_trigger = {
 		event_target:gray_warship = {
@@ -47,7 +46,6 @@ RG_gray_mod1_allow_trigger = {
 		value >= 15000
 	}
 }
-
 RG_gray_mod2_trigger = {
 	AND = {
 		event_target:gray_leader_admiral = {
@@ -126,3 +124,25 @@ RG_gray_mod3_allow_trigger = {
 		has_technology = tech_juggernaut
 	}
 }
+RG_gray_official_active_trigger = {
+	OR = {
+		has_country_flag = gray_official_active
+		has_country_flag = gray_governor_active #旧版flag
+	}
+}
+RG_gray_warship_active_trigger = {
+	has_country_flag = gray_warship_active
+}
+RG_gray_army_active_trigger = {
+	has_country_flag = gray_army_active
+}
+
+RG_gray_scientist_active_trigger = {
+	has_country_flag = gray_constship_active
+}
+
+RG_gray_harbitat_active_trigger = {
+	has_country_flag = rg_habitat_enabled
+}
+
+

common/situations/rg_gray_situations.txt

@@ -214,7 +214,7 @@ situation_rg_gray_mod1 = {
 			NOT = { exists = event_target:gray_warship }
 			owner = {
 				NOT = {
-					has_country_flag = gray_warship_active
+					RG_gray_warship_active_trigger = yes
 				}
 			}
 		}

events/!_RG_distant_stars_events_3.txt

@@ -73,7 +73,6 @@ country_event = {
 				save_event_target_as = candidate_gateway_system
 			}
 		}
-		set_global_flag = rg_kac_lcluster_project
 	}
 	option = {
 		name = "distar.10905.a"

events/!_RG_gray_goo_events.txt

@@ -302,7 +302,7 @@ country_event = {
 		is_ai = no
 	}
 	immediate = {
-		set_global_flag = rg_kac_499
+
 		rg_timeline_attract_field_init = yes
 		if = {
 			# 非正常触发补事件
@@ -343,13 +343,13 @@ country_event = {
 		}
 		is_same_value = event_target:gray_owner
 		NOR = {
-			has_country_flag = gray_constship_active
+			RG_gray_scientist_active_trigger = yes
 			OR = {
 				has_country_flag = gray_official_active
 				has_country_flag = gray_governor_active				#旧版flag
 			}
-			has_country_flag = gray_warship_active
+			RG_gray_warship_active_trigger = yes
-			has_country_flag = gray_army_active
+			RG_gray_army_active_trigger = yes
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
 		}
@@ -424,7 +424,7 @@ country_event = {
 			}
 		}
 		is_same_value = event_target:gray_owner
-		has_country_flag = gray_warship_active
+		RG_gray_warship_active_trigger = yes
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -466,7 +466,7 @@ country_event = {
 				is_same_value = ROOT
 			}
 		}
-		has_country_flag = gray_army_active
+		RG_gray_army_active_trigger = yes
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -547,7 +547,7 @@ country_event = {
 			}
 		}
 		is_same_value = event_target:gray_owner
-		has_country_flag = gray_constship_active
+		RG_gray_scientist_active_trigger = yes
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -590,7 +590,7 @@ event = {
 		event_target:gray_owner = {
 			OR = {
 				AND = {
-					has_country_flag = gray_army_active
+					RG_gray_army_active_trigger = yes
 					NOT = {
 						any_owned_army = {
 							army_type = gray_army
@@ -598,7 +598,7 @@ event = {
 					}
 				}
 				AND = {
-					has_country_flag = gray_warship_active
+					RG_gray_warship_active_trigger = yes
 					NOT = {
 						exists = event_target:gray_warship
 					}
@@ -610,7 +610,7 @@ event = {
 					}
 				}
 				AND = {
-					has_country_flag = gray_constship_active
+					RG_gray_scientist_active_trigger = yes
 					NOT = {
 						exists = event_target:global_gray_constship
 					}

events/RG_events.txt

@@ -722,7 +722,7 @@ country_event = {
 	hide_window = yes
 	is_triggered_only = yes
 	trigger = {
-		has_country_flag = gray_army_active
+		RG_gray_army_active_trigger = yes
 		any_owned_army = {
 			army_type = gray_army
 			fleet = {
@@ -1049,7 +1049,7 @@ country_event = { # Memorial Valuts Civic Paragon Level Tick / FROM = Leader
 		FROM = {
 			has_leader_flag = rg_gray_leader
 		}
-		has_country_flag = rg_habitat_enabled
+		RG_gray_harbitat_active_trigger = yes
 	}
 
 	immediate = {

events/RG_gray_leader_event.txt

@@ -28,11 +28,11 @@ country_event = {
 				}
 				is_same_value = event_target:gray_owner
 				NOR = {
-					has_country_flag = gray_constship_active
+					RG_gray_scientist_active_trigger = yes
 					has_country_flag = gray_official_active
 					has_country_flag = gray_governor_active					#旧版flag
 					has_country_flag = gray_warship_active
-					has_country_flag = gray_army_active
+					RG_gray_army_active_trigger = yes
 					has_country_flag = gray_reforming
 					has_country_flag = gray_diplomacy_engaged
 				}
@@ -104,7 +104,7 @@ country_event = {
 						is_same_value = ROOT
 					}
 				}
-				has_country_flag = gray_army_active
+				RG_gray_army_active_trigger = yes
 				NOR = {
 					has_country_flag = gray_reforming
 					has_country_flag = gray_diplomacy_engaged
@@ -138,7 +138,7 @@ country_event = {
 					}
 				}
 				is_same_value = event_target:gray_owner
-				has_country_flag = gray_constship_active
+				RG_gray_scientist_active_trigger = yes
 				NOR = {
 					has_country_flag = gray_reforming
 					has_country_flag = gray_diplomacy_engaged
@@ -211,11 +211,11 @@ country_event = {
 		}
 		is_same_value = event_target:gray_owner
 		NOR = {
-			has_country_flag = gray_constship_active
+			RG_gray_scientist_active_trigger = yes
 			has_country_flag = gray_official_active
 			has_country_flag = gray_governor_active			#旧版flag
 			has_country_flag = gray_warship_active
-			has_country_flag = gray_army_active
+			RG_gray_army_active_trigger = yes
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
 		}
@@ -259,7 +259,7 @@ country_event = {
 		response_text = graygoo.500.c.response
 		trigger = {
 			NOT = {
-				has_country_flag = gray_army_active
+				RG_gray_army_active_trigger = yes
 			}
 		}
 		hidden_effect = {
@@ -291,7 +291,7 @@ country_event = {
 		response_text = RG_graygoo.502.f.response
 		trigger = {
 			NOT = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 			}
 		}
 		allow = {
@@ -300,7 +300,7 @@ country_event = {
 		hidden_effect = {
 			if = {
 				limit = {
-					has_country_flag = rg_habitat_enabled
+					RG_gray_harbitat_active_trigger = yes
 				}
 				rg_clear_harbitat = yes
 			}
@@ -317,7 +317,7 @@ country_event = {
 		name = RG_graygoo.500.g
 		response_text = RG_graygoo.502.g.response
 		trigger = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 		allow = {
 		}
@@ -486,7 +486,7 @@ country_event = {
 		response_text = RG_graygoo.502.f.response
 		trigger = {
 			NOT = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 			}
 		}
 		allow = {
@@ -504,7 +504,7 @@ country_event = {
 		name = RG_graygoo.500.g
 		response_text = RG_graygoo.502.g.response
 		trigger = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 		allow = {
 		}
@@ -782,7 +782,7 @@ country_event = {
 		response_text = RG_graygoo.502.f.response
 		trigger = {
 			NOT = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 			}
 		}
 		allow = {
@@ -791,7 +791,7 @@ country_event = {
 		hidden_effect = {
 			if = {
 				limit = {
-					has_country_flag = rg_habitat_enabled
+					RG_gray_harbitat_active_trigger = yes
 				}
 				rg_clear_harbitat = yes
 			}
@@ -808,7 +808,7 @@ country_event = {
 		name = RG_graygoo.500.g
 		response_text = RG_graygoo.502.g.response
 		trigger = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 		allow = {
 		}
@@ -938,7 +938,7 @@ country_event = {
 				is_same_value = ROOT
 			}
 		}
-		has_country_flag = gray_army_active
+		RG_gray_army_active_trigger = yes
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -1137,7 +1137,7 @@ country_event = {
 		response_text = RG_graygoo.502.f.response
 		trigger = {
 			NOT = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 			}
 		}
 		allow = {
@@ -1146,7 +1146,7 @@ country_event = {
 		hidden_effect = {
 			if = {
 				limit = {
-					has_country_flag = rg_habitat_enabled
+					RG_gray_harbitat_active_trigger = yes
 				}
 				rg_clear_harbitat = yes
 			}
@@ -1164,7 +1164,7 @@ country_event = {
 		response_text = RG_graygoo.502.g.response
 		trigger = {
 			has_country_flag = rg_juggernaut_fired
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 		allow = {
 			has_country_flag = rg_juggernaut_fired			# To prevent exploit
@@ -1309,7 +1309,7 @@ country_event = {
 			}
 		}
 		is_same_value = event_target:gray_owner
-		has_country_flag = gray_constship_active
+		RG_gray_scientist_active_trigger = yes
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -1443,7 +1443,7 @@ country_event = {
 		response_text = RG_graygoo.502.f.response
 		trigger = {
 			NOT = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 			}
 		}
 		allow = {
@@ -1452,7 +1452,7 @@ country_event = {
 		hidden_effect = {
 			if = {
 				limit = {
-					has_country_flag = rg_habitat_enabled
+					RG_gray_harbitat_active_trigger = yes
 				}
 				rg_clear_harbitat = yes
 			}
@@ -1469,7 +1469,7 @@ country_event = {
 		name = RG_graygoo.500.g
 		response_text = RG_graygoo.502.g.response
 		trigger = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 		allow = {
 		}

events/RG_planet_event.txt

@@ -9,7 +9,7 @@ country_event = {
 	is_triggered_only = yes
 	trigger = {
 		OR = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 			has_active_tradition = tr_rg_nanotech_5
 		}
 		# exists = event_target:rg_gray_habitat_target
@@ -35,7 +35,7 @@ country_event = {
 	immediate = {
 		if = {
 			limit = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 				NOT = {
 					has_active_tradition = tr_rg_nanotech_5
 				}
@@ -51,7 +51,7 @@ country_event = {
 			random_owned_planet = {
 				limit = {
 					owner = {
-						has_country_flag = rg_habitat_enabled
+						RG_gray_harbitat_active_trigger = yes
 					}
 					# exists = event_target:rg_gray_habitat_target
 					PREV = {
@@ -105,7 +105,7 @@ planet_event = {
 		exists = owner
 		owner = {
 			OR = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 				has_active_tradition = tr_rg_nanotech_5
 			}
 		}
@@ -134,7 +134,7 @@ planet_event = {
 		exists = owner
 		owner = {
 			OR = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 				has_active_tradition = tr_rg_nanotech_5
 			}
 		}
@@ -192,7 +192,7 @@ country_event = {
 	hide_window = yes
 	is_triggered_only = yes
 	trigger = {
-		has_country_flag = rg_habitat_enabled
+		RG_gray_harbitat_active_trigger = yes
 		event_target:rg_gray_habitat_target = {
 			any_owned_pop = {
 				is_unemployed = yes
@@ -223,7 +223,7 @@ planet_event = {
 	trigger = {
 		exists = owner
 		owner = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 		any_owned_pop = {
 			is_unemployed = yes

events/RG_wsg_graygoo_event.txt

@@ -32,11 +32,11 @@ country_event = {
 		}
 		is_same_value = event_target:gray_owner
 		NOR = {
-			has_country_flag = gray_constship_active
+			RG_gray_scientist_active_trigger = yes
 			has_country_flag = gray_official_active
 			has_country_flag = gray_governor_active			#旧版flag
-			has_country_flag = gray_warship_active
+			RG_gray_warship_active_trigger = yes
-			has_country_flag = gray_army_active
+			RG_gray_army_active_trigger = yes
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
 			has_country_flag = ban_commu_with_gray
@@ -72,7 +72,7 @@ country_event = {
 		response_text = graygoo.500.b.response
 		trigger = {
 			NOT = {
-				has_country_flag = gray_warship_active
+				RG_gray_warship_active_trigger = yes
 			}
 		}
 		allow = {
@@ -95,7 +95,7 @@ country_event = {
 		response_text = graygoo.500.c.response
 		trigger = {
 			NOT = {
-				has_country_flag = gray_army_active
+				RG_gray_army_active_trigger = yes
 			}
 		}
 		allow = {
@@ -141,7 +141,7 @@ country_event = {
 		response_text = RG_graygoo.502.f.response
 		trigger = {
 			NOT = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 			}
 		}
 		allow = {
@@ -150,7 +150,7 @@ country_event = {
 		hidden_effect = {
 			if = {
 				limit = {
-					has_country_flag = rg_habitat_enabled
+					RG_gray_harbitat_active_trigger = yes
 				}
 				rg_clear_harbitat = yes
 			}
@@ -164,7 +164,7 @@ country_event = {
 		name = RG_graygoo.500.g
 		response_text = RG_graygoo.502.g.response
 		trigger = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 		allow = {
 		}
@@ -333,7 +333,7 @@ country_event = {
 		response_text = RG_graygoo.502.f.response
 		trigger = {
 			NOT = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 			}
 		}
 		allow = {
@@ -342,7 +342,7 @@ country_event = {
 		hidden_effect = {
 			if = {
 				limit = {
-					has_country_flag = rg_habitat_enabled
+					RG_gray_harbitat_active_trigger = yes
 				}
 				rg_clear_harbitat = yes
 			}
@@ -356,7 +356,7 @@ country_event = {
 		name = RG_graygoo.500.g
 		response_text = RG_graygoo.502.g.response
 		trigger = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 		allow = {
 		}
@@ -411,7 +411,7 @@ country_event = {
 			}
 		}
 		is_same_value = event_target:gray_owner
-		has_country_flag = gray_warship_active
+		RG_gray_warship_active_trigger = yes
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -644,7 +644,7 @@ country_event = {
 		response_text = RG_graygoo.502.f.response
 		trigger = {
 			NOT = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 			}
 		}
 		allow = {
@@ -653,7 +653,7 @@ country_event = {
 		hidden_effect = {
 			if = {
 				limit = {
-					has_country_flag = rg_habitat_enabled
+					RG_gray_harbitat_active_trigger = yes
 				}
 				rg_clear_harbitat = yes
 			}
@@ -667,7 +667,7 @@ country_event = {
 		name = RG_graygoo.500.g
 		response_text = RG_graygoo.502.g.response
 		trigger = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 		allow = {
 		}
@@ -780,7 +780,7 @@ country_event = {
 				is_same_value = ROOT
 			}
 		}
-		has_country_flag = gray_army_active
+		RG_gray_army_active_trigger = yes
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -971,7 +971,7 @@ country_event = {
 		response_text = RG_graygoo.502.f.response
 		trigger = {
 			NOT = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 			}
 		}
 		allow = {
@@ -980,7 +980,7 @@ country_event = {
 		hidden_effect = {
 			if = {
 				limit = {
-					has_country_flag = rg_habitat_enabled
+					RG_gray_harbitat_active_trigger = yes
 				}
 				rg_clear_harbitat = yes
 			}
@@ -994,7 +994,7 @@ country_event = {
 		name = RG_graygoo.500.g
 		response_text = RG_graygoo.502.g.response
 		trigger = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 		allow = {
 		}
@@ -1123,7 +1123,7 @@ country_event = {
 			}
 		}
 		is_same_value = event_target:gray_owner
-		has_country_flag = gray_constship_active
+		RG_gray_scientist_active_trigger = yes
 		NOR = {
 			has_country_flag = gray_reforming
 			has_country_flag = gray_diplomacy_engaged
@@ -1272,7 +1272,7 @@ country_event = {
 		response_text = RG_graygoo.502.f.response
 		trigger = {
 			NOT = {
-				has_country_flag = rg_habitat_enabled
+				RG_gray_harbitat_active_trigger = yes
 			}
 		}
 		allow = {
@@ -1281,7 +1281,7 @@ country_event = {
 		hidden_effect = {
 			if = {
 				limit = {
-					has_country_flag = rg_habitat_enabled
+					RG_gray_harbitat_active_trigger = yes
 				}
 				rg_clear_harbitat = yes
 			}
@@ -1295,7 +1295,7 @@ country_event = {
 		name = RG_graygoo.500.g
 		response_text = RG_graygoo.502.g.response
 		trigger = {
-			has_country_flag = rg_habitat_enabled
+			RG_gray_harbitat_active_trigger = yes
 		}
 		allow = {
 		}