From 47506cc3ce96df15f87032c02ee40acd9fbdff2f Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Mon, 23 Sep 2024 15:47:39 +0800
Subject: [PATCH] zc

---
 common/armies/!_RG_event_armies.txt           | 29 +------------------
 common/armies/RG_event_armies.txt             | 26 +++++++++++++++++
 .../scripted_effects/RG_gray_init_effects.txt |  5 +---
 .../RG_leader_scripted_triggers.txt           | 14 +++++++--
 .../RG_scripted_triggers.txt                  |  7 -----
 5 files changed, 39 insertions(+), 42 deletions(-)
 create mode 100644 common/armies/RG_event_armies.txt

diff --git a/common/armies/!_RG_event_armies.txt b/common/armies/!_RG_event_armies.txt
index e0426ab..00c1c82 100644
--- a/common/armies/!_RG_event_armies.txt
+++ b/common/armies/!_RG_event_armies.txt
@@ -18,31 +18,4 @@ gray_army = {
 	potential = {
 		always = no
 	}
-}
-
-# Gray Nanite Army
-rg_gray_army_base = {
-	damage = 10
-	health = 18
-	has_morale = no
-	morale_damage = 6
-	collateral_damage = 5
-	war_exhaustion = 4
-	prerequisites = {
-		"tech_gray_army_7"
-	}
-	time = 180
-	resources = {
-		category = armies
-		cost = {
-			alloys = 800
-		}
-		produces = {
-			energy = 1
-		}
-	}
-	has_species = no
-	icon = GFX_army_type_machine_assault
-	potential_country = {
-	}
-}
+}
\ No newline at end of file
diff --git a/common/armies/RG_event_armies.txt b/common/armies/RG_event_armies.txt
new file mode 100644
index 0000000..136b933
--- /dev/null
+++ b/common/armies/RG_event_armies.txt
@@ -0,0 +1,26 @@
+# Gray Nanite Army
+rg_gray_army_base = {
+	damage = 10
+	health = 18
+	has_morale = no
+	morale_damage = 6
+	collateral_damage = 5
+	war_exhaustion = 4
+	prerequisites = {
+		"tech_gray_army_7"
+	}
+	time = 180
+	resources = {
+		category = armies
+		cost = {
+			alloys = 800
+		}
+		produces = {
+			energy = 1
+		}
+	}
+	has_species = no
+	icon = GFX_army_type_machine_assault
+	potential_country = {
+	}
+}
diff --git a/common/scripted_effects/RG_gray_init_effects.txt b/common/scripted_effects/RG_gray_init_effects.txt
index 6e6a32b..99ac010 100644
--- a/common/scripted_effects/RG_gray_init_effects.txt
+++ b/common/scripted_effects/RG_gray_init_effects.txt
@@ -598,10 +598,7 @@ rg_juggernaut_habitat_init = {
 						if = {
 							limit = {
 								event_target:gray_owner = {
-									OR = {
-										has_country_flag = gray_official_active
-										has_country_flag = gray_governor_active										#旧版flag
-									}
+									RG_gray_official_active_trigger = yes
 								}
 							}
 							assign_leader = event_target:gray_governor
diff --git a/common/scripted_triggers/RG_leader_scripted_triggers.txt b/common/scripted_triggers/RG_leader_scripted_triggers.txt
index c8d8483..6ef8c74 100644
--- a/common/scripted_triggers/RG_leader_scripted_triggers.txt
+++ b/common/scripted_triggers/RG_leader_scripted_triggers.txt
@@ -11,6 +11,7 @@ RG_gray_mod1_trigger = {
 		}
 	}
 }
+
 RG_gray_mod1_allow_trigger = {
 	hidden_trigger = {
 		event_target:gray_warship = {
@@ -46,6 +47,7 @@ RG_gray_mod1_allow_trigger = {
 		value >= 15000
 	}
 }
+
 RG_gray_mod2_trigger = {
 	AND = {
 		event_target:gray_leader_admiral = {
@@ -61,6 +63,7 @@ RG_gray_mod2_trigger = {
 		}
 	}
 }
+
 RG_gray_mod2_allow_trigger = {
 	hidden_trigger = {
 		# To prevent exploit
@@ -103,6 +106,7 @@ RG_gray_mod2_allow_trigger = {
 		value >= 150000
 	}
 }
+
 RG_gray_mod3_trigger = {
 	NOR = {
 		RG_gray_is_reforming_trigger = yes
@@ -110,6 +114,7 @@ RG_gray_mod3_trigger = {
 	}
 	has_country_flag = rg_gray_level_3
 }
+
 RG_gray_mod3_allow_trigger = {
 	resource_stockpile_compare = {
 		resource = energy
@@ -124,15 +129,18 @@ 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
+		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
 }
@@ -144,15 +152,15 @@ RG_gray_scientist_active_trigger = {
 RG_gray_harbitat_active_trigger = {
 	has_country_flag = rg_habitat_enabled
 }
+
 RG_gray_not_avaliable_trigger = {
 	OR = {
 		RG_gray_is_reforming_trigger = yes
 		has_country_flag = gray_diplomacy_engaged
 	}
 }
+
 #小灰噶了
 RG_gray_is_reforming_trigger = {
 	has_country_flag = gray_reforming
 }
-
-
diff --git a/common/scripted_triggers/RG_scripted_triggers.txt b/common/scripted_triggers/RG_scripted_triggers.txt
index 85721d0..84dcc65 100644
--- a/common/scripted_triggers/RG_scripted_triggers.txt
+++ b/common/scripted_triggers/RG_scripted_triggers.txt
@@ -24,13 +24,6 @@ RG_planet_can_auto_build = {
 	}
 }
 
-RG_NOR_has_wsg_mod_trigger = {
-	NOR = {
-		has_global_flag = has_wsg_mod
-		has_global_flag = kdc_event_mod_active
-	}
-}
-
 RG_OR_has_wsg_mod_trigger = {
 	OR = {
 		has_global_flag = has_wsg_mod