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/ag_start_event_9998_option_ag_master.txt

@@ -0,0 +1,30 @@
+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,6 +8,7 @@ set_variable = {
 #Country event_target:gray_owner
 #存储当前领袖等级
 rg_save_gray_leader_level_effect = {
+<<<<<<< HEAD
     every_owned_leader = {
         if = {
             ###等级检测
@@ -33,6 +34,31 @@ 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
+			}
+		}
+    }
+}
+#country scope
+#用的时候就
+check_variable = {
+	which = rg_gray_level
+	value >= 10
+}
+>>>>>>> RG_AG_TEST
 
 #Country event_target:gray_owner
 #等级导入，把存储的领袖等级赋予到领袖身上