From a5c19c83e3bf9e1329e4612fec1ae65c94562b2f Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Thu, 14 Sep 2023 21:54:00 +0800
Subject: [PATCH] =?UTF-8?q?3.9=E6=94=B9=E5=8A=A8=20=E4=B8=8D=E5=87=86?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=9C=AA=E5=AE=9A=E4=B9=89=E7=9A=84event?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RG_gray_leader_init_effects.txt           | 56 +++++++++++++++----
 descriptor.mod                                |  2 +-
 events/RG_wsg_graygoo_event.txt               | 12 ++--
 events/z_RG_placeholder_event.txt             | 22 ++++++++
 4 files changed, 73 insertions(+), 19 deletions(-)
 create mode 100644 events/z_RG_placeholder_event.txt

diff --git a/common/scripted_effects/RG_gray_leader_init_effects.txt b/common/scripted_effects/RG_gray_leader_init_effects.txt
index 908c64b..cacb3c7 100644
--- a/common/scripted_effects/RG_gray_leader_init_effects.txt
+++ b/common/scripted_effects/RG_gray_leader_init_effects.txt
@@ -118,9 +118,17 @@ rg_gray_govener_init = {
 					}
 				}
 			}
-			leader_event = {
-				id = wg_affection.8
-				days = 1
+			if = {
+				limit = {
+					has_leader_flag = has_wg_affection_wg_gray
+				}
+				if = {
+					limit = {
+						owner = { has_country_flag = married_gray }
+					}
+					set_leader_flag = married
+				}
+				set_variable = { which = affection value = owner.wg_gray_affection }
 			}
 			if = {
 				limit = {
@@ -224,9 +232,17 @@ rg_gray_admiral_init = {
 					}
 				}
 			}
-			leader_event = {
-				id = wg_affection.8
-				days = 1
+			if = {
+				limit = {
+					has_leader_flag = has_wg_affection_wg_gray
+				}
+				if = {
+					limit = {
+						owner = { has_country_flag = married_gray }
+					}
+					set_leader_flag = married
+				}
+				set_variable = { which = affection value = owner.wg_gray_affection }
 			}
 			add_trait_no_notify = leader_trait_admiral_wg_gray_affection
 			if = {
@@ -316,9 +332,17 @@ rg_gray_general_init = {
 					}
 				}
 			}
-			leader_event = {
-				id = wg_affection.8
-				days = 1
+			if = {
+				limit = {
+					has_leader_flag = has_wg_affection_wg_gray
+				}
+				if = {
+					limit = {
+						owner = { has_country_flag = married_gray }
+					}
+					set_leader_flag = married
+				}
+				set_variable = { which = affection value = owner.wg_gray_affection }
 			}
 			# add_trait_no_notify = leader_trait_admiral_wg_gray_affection
 			if = {
@@ -415,9 +439,17 @@ rg_gray_scientist_init = {
 					}
 				}
 			}
-			leader_event = {
-				id = wg_affection.8
-				days = 1
+			if = {
+				limit = {
+					has_leader_flag = has_wg_affection_wg_gray
+				}
+				if = {
+					limit = {
+						owner = { has_country_flag = married_gray }
+					}
+					set_leader_flag = married
+				}
+				set_variable = { which = affection value = owner.wg_gray_affection }
 			}
 			add_trait_no_notify = leader_trait_admiral_wg_gray_affection
 			if = {
diff --git a/descriptor.mod b/descriptor.mod
index 0d433ea..d1bfb9a 100644
--- a/descriptor.mod
+++ b/descriptor.mod
@@ -8,5 +8,5 @@ tags={
 }
 name="Real Gray"
 picture="thumbnail.png"
-supported_version="3.8.*"
+supported_version="3.9.*"
 remote_file_id="2136166095"
\ No newline at end of file
diff --git a/events/RG_wsg_graygoo_event.txt b/events/RG_wsg_graygoo_event.txt
index dd136a2..360cd51 100644
--- a/events/RG_wsg_graygoo_event.txt
+++ b/events/RG_wsg_graygoo_event.txt
@@ -204,7 +204,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -403,7 +403,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -792,7 +792,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -1153,7 +1153,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -1216,7 +1216,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
@@ -1461,7 +1461,7 @@ country_event = {
 		}
 		hidden_effect = {
 			country_event = {
-				id = wg_aft.30000
+				id = wg_affection.30000
 			}
 		}
 	}
diff --git a/events/z_RG_placeholder_event.txt b/events/z_RG_placeholder_event.txt
new file mode 100644
index 0000000..a9b3936
--- /dev/null
+++ b/events/z_RG_placeholder_event.txt
@@ -0,0 +1,22 @@
+namespace = wg_affection
+
+country_event = {
+	id = wg_affection.30000
+	title = wg_affection.30000.name
+	desc = wg_affection.30000.desc
+	is_triggered_only = yes
+	diplomatic = yes
+	show_sound = event_wg_wedding
+	custom_gui = wg_gray_commu_window
+	custom_gui_option = wg_gray_commu_option
+
+	immediate = {
+		set_country_flag = married_gray
+	}
+
+	option = {
+		name = wg_affection.30000.a
+		response_text = wg_affection.30000.response
+		change_variable = { which = rankpts value = 2 }
+	}
+}
\ No newline at end of file