Merge branch 'RG_AG_TEST'

# Conflicts:
#	common/inline_scripts/events/rg_test_gray_skill_varible.txt
#	common/scripted_triggers/RG_scripted_triggers.txt

common/inline_scripts/events/rg_test_gray_skill_varible.txt

@@ -8,6 +8,33 @@ set_variable = {
 #Country event_target:gray_owner
 #存储当前领袖等级
 rg_save_gray_leader_level_effect = {
+<<<<<<< HEAD
+    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
+        }
+    }
+}
+=======
     random_owned_leader = {
 		#是小灰领袖
 		limit = {
@@ -31,6 +58,7 @@ check_variable = {
 	which = rg_gray_level
 	value >= 10
 }
+>>>>>>> RG_AG_TEST
 
 #Country event_target:gray_owner
 #等级导入，把存储的领袖等级赋予到领袖身上

common/inline_scripts/pop_categories/trait_production.txt

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

common/scripted_triggers/RG_scripted_triggers.txt

@@ -70,8 +70,15 @@ rg_is_main_species_with_maid_trait_trigger = {
 	}
 }
 
+<<<<<<< HEAD
+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
+>>>>>>> RG_AG_TEST
 	}
 }

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_add = {
-	species_possible_merge_remove = { always = no }
+		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_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