Changes文件名不知道怎么烂了

common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt

@@ -1,30 +0,0 @@
-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
-                }
-            }
-            any_country = {
-                has_civic = origin_rg_gray
-            }
-            has_global_flag = has_rg_mod
-        }
-        force_remove_civic = civic_AG_gray_master
-    }
-    else = {
-        country_event = { id = graygoo.499 }
-    }
-}
-

common/inline_scripts/events/rg_test_gray_skill_varible.txt

@@ -8,29 +8,31 @@ set_variable = {
 #Country event_target:gray_owner
 #存储当前领袖等级
 rg_save_gray_leader_level_effect = {
-    random_owned_leader = {
-		#是小灰领袖
-		limit = {
-			has_leader_flag = rg_gray_leader
-		}
-		export_trigger_value_to_variable = {
-			trigger = has_skill
-			variable = rg_gray_level_temp
-		}
-		owner = {
-			set_variable = {
-				which = rg_gray_level
-				value = prev.rg_gray_level_temp
-			}
-		}
+    every_owned_leader = {
+        if = {
+            ###等级检测
+            limit = {
+                has_leader_flag = rg_gray_leader
+            }
+			#由于目前是leader域，所以不能直接导出等级
+            #导出等级到暂存
+            export_trigger_value_to_variable = {
+                trigger = has_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
+        }
     }
 }
-#country scope
-#用的时候就
-check_variable = {
-	which = rg_gray_level
-	value >= 10
-}
 
 #Country event_target:gray_owner
 #等级导入，把存储的领袖等级赋予到领袖身上

common/inline_scripts/pop_categories/trait_production.txt

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

common/scripted_effects/RG_event_effects.txt

@@ -48,11 +48,8 @@ rg_event_effect_event1_cluster = {
 rg_event_effect_event1_cluster_galaxy = {
 	if = {
 		limit = {
-			OR = {
-				rg_has_ag_origin_trigger = yes
-				NOT = {
-					has_global_flag = origin_rg_gray_1st_global
-				}
+			NOT = {
+				has_global_flag = origin_rg_gray_1st_global
 			}
 		}
 		rg_event_effect_event1_gray_galaxy = yes
@@ -94,14 +91,7 @@ rg_event_effect_event1_gray_galaxy = {
 	set_country_flag = rg_gray_level_1
 	rg_event_effect_event1_to_event2_effect = yes
 	save_global_event_target_as = origin_rg_gray_country
-	if = {
-		limit = {
-			rg_has_ag_origin_trigger = yes
-		}
-	}
-	else = {
-		rg_lcluster_spawn_effect = yes
-	}
+	rg_lcluster_spawn_effect = yes
 }
 
 rg_event_effect_event1_to_event2_effect = {
@@ -148,9 +138,7 @@ rg_event_effect_lcluster_open = {
 				has_global_flag = rg_origin_l_cluster						# 遥远约定
 				has_global_flag = gray_origin_activate						# 远星之歌
 				has_global_flag = rg_origin_scion_l_cluster					# 未来追迹
-				rg_has_ag_origin_trigger = yes	# 遥远的故事
 			}
-
 		}
 		country_event = {
 			id = rg_cluster.2

common/scripted_triggers/RG_scripted_triggers.txt

@@ -1,23 +1,3 @@
-rg_all_cluster_mod_check = {
-	OR = {
-		has_global_flag = l_cluster_origin						# l-cluster plus
-		has_global_flag = rg_origin_l_cluster						# 遥远约定
-		has_global_flag = gray_origin_activate						# 远星之歌
-		has_global_flag = rg_origin_scion_l_cluster					# 未来追迹
-		rg_has_ag_origin_trigger = yes	# 遥远的故事
-	}
-}
-
-rg_all_cluster_mod_check_for_scion = {
-	OR = {
-		has_global_flag = l_cluster_origin						# l-cluster plus
-		# has_global_flag = rg_origin_l_cluster						# 遥远约定
-		has_global_flag = gray_origin_activate						# 远星之歌
-		# has_global_flag = rg_origin_scion_l_cluster					# 未来追迹
-		rg_has_ag_origin_trigger = yes	# 遥远的故事
-	}
-}
-
 RG_planet_can_auto_build = {
 	OR = {
 		AND = {
@@ -70,8 +50,9 @@ rg_is_main_species_with_maid_trait_trigger = {
 	}
 }
 
-rg_has_ag_origin_trigger = {
-	any_country = {
-		has_origin = origin_Asgray
+RG_tradition5_or_gray_owner_trigger = {
+	OR = {
+		RG_gray_harbitat_active_trigger = yes
+		has_active_tradition = tr_rg_nanotech_5
 	}
 }

common/traits/RG_machine_species_trait.txt

@@ -4,12 +4,24 @@ rg_machine_maid_trait = {
 	}
 	custom_tooltip = rg_machine_maid_trait_effect_tooltip
 	initial = no
-	species_potential_add = { always = no }
+	species_potential_add = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
 	species_possible_remove = { always = no }
-	species_possible_merge_add = { always = no }
-	species_possible_merge_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
+		}
+	}
 	randomized = no
-	allowed_archetypes = { MACHINE }
+	allowed_archetypes = { ROBOT MACHINE BIOLOGICAL LITHOID   }
 	sorting_priority = 20
 	potential_crossbreeding_chance = 1.0
 

events/RG_origin_event.txt

@@ -43,10 +43,10 @@ country_event = {
 			set_country_flag = rg_scion_needs_fe
 			if = {
 				limit ={
-					OR = {
-						rg_all_cluster_mod_check_for_scion = yes
-						any_playable_country = {
+					any_playable_country = {
+						AND = {
 							has_origin = origin_rg_gray
+							# NOT = { has_global_flag = rg_origin_l_cluster }
 						}
 					}
 				}

events/RG_planert_killer_events.txt

@@ -42,6 +42,31 @@ 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