From 0f0e2f8fc84234715b134bcef1911bec4cd76efc Mon Sep 17 00:00:00 2001
From: "FA507RM-KALOSPA\\Kalo" <kalospacer@gmail.com>
Date: Wed, 21 Jun 2023 12:58:32 +0800
Subject: [PATCH] zc

---
 common/governments/civics/!_RG_origins.txt |  3 ++
 common/on_actions/RG_on_actions.txt        |  4 +-
 events/RG_combat_skill_events.txt          | 48 ++++++++++++++++++----
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/common/governments/civics/!_RG_origins.txt b/common/governments/civics/!_RG_origins.txt
index 495fcf5..6a9b754 100644
--- a/common/governments/civics/!_RG_origins.txt
+++ b/common/governments/civics/!_RG_origins.txt
@@ -11,4 +11,7 @@ origin_rg_gray = {
 	random_weight = {
 		base = 0
 	}
+	playable = {
+		host_has_dlc = "Distant Stars Story Pack"
+	}
 }
diff --git a/common/on_actions/RG_on_actions.txt b/common/on_actions/RG_on_actions.txt
index b94f094..45f5dea 100644
--- a/common/on_actions/RG_on_actions.txt
+++ b/common/on_actions/RG_on_actions.txt
@@ -117,7 +117,6 @@ on_destroy_planet_with_RG_PLANET_KILLER = {
 	events = {
 		RG_planet_killer.1
 		RG_planet_killer.2
-		origin.3245
 	}
 }
 
@@ -130,7 +129,6 @@ on_destroy_planet_with_RG_PLANET_KILLER_unqueued = {
 on_destroy_planet_with_RG_PLANET_KILLER_SMALL = {
 	events = {
 		RG_planet_killer.2
-		origin.3245
 	}
 }
 
@@ -211,6 +209,6 @@ on_space_battle_won = {
 # FromFromFrom = fleet 2
 on_space_battle_lost = {
 	events = {
-		rg_skill.14
+		rg_skill.15
 	}
 }
diff --git a/events/RG_combat_skill_events.txt b/events/RG_combat_skill_events.txt
index 72330e4..280ea44 100644
--- a/events/RG_combat_skill_events.txt
+++ b/events/RG_combat_skill_events.txt
@@ -708,20 +708,22 @@ country_event = {
 		}
 	}
 }
-
+# This = owner of fleet 1 (winner)
+# From = owner of fleet 2 (loser)
+# FromFrom = fleet 1
+# FromFromFrom = fleet 2
 country_event = {
 	id = rg_skill.14
 	hide_window = yes
 	is_triggered_only = yes
 	trigger = {
-		event_target:gray_warship = {
-			is_in_combat = no
-			fleet.leader = {
+		OR = {
+			fromfrom.leader = {
 				has_trait = RG_leader_trait_admiral_nanorebuild_gray
 			}
 		}
 		NOT = {
-			event_target:gray_owner = {
+			This = {
 				check_variable = {
 					which = rg_nanorebuild_counter
 					value = 0
@@ -730,8 +732,40 @@ country_event = {
 		}
 	}
 	immediate = {
-		event_target:gray_owner = {
-			change_variable = {
+		This = {
+			set_variable = {
+				which = rg_nanorebuild_counter
+				value = 0
+			}
+		}
+	}
+}
+# This = owner of fleet 1 (loser)
+# From = owner of fleet 2 (winner)
+# FromFrom = fleet 1
+# FromFromFrom = fleet 2
+country_event = {
+	id = rg_skill.15
+	hide_window = yes
+	is_triggered_only = yes
+	trigger = {
+		OR = {
+			fromfrom.leader = {
+				has_trait = RG_leader_trait_admiral_nanorebuild_gray
+			}
+		}
+		NOT = {
+			This = {
+				check_variable = {
+					which = rg_nanorebuild_counter
+					value = 0
+				}
+			}
+		}
+	}
+	immediate = {
+		This = {
+			set_variable = {
 				which = rg_nanorebuild_counter
 				value = 0
 			}