暂存

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"
+	}
 }

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
 	}
 }

common/scripted_effects/rg_gray_warship_init_effects.txt

@@ -18,6 +18,10 @@ rg_warship_init_mod1 = {
 				random_existing_design = RG_graygoo_mothership
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -58,6 +62,10 @@ rg_warship_init_mod2 = {
 				random_existing_design = RG_graygoo_capitalship
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -99,6 +107,10 @@ rg_warship_init_mod3 = {
 				random_existing_design = RG_gray_juggernaut
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {
@@ -138,6 +150,10 @@ rg_warship_init_mod0 = {
 				design = "NAME_Gray_Warship_base"
 				prefix = no
 				upgradable = yes
+				effect = {
+					set_fleet_flag = gray_fleet_ship
+					save_global_event_target_as = gray_warship_ship
+				}
 			}
 			set_fleet_stance = aggressive
 			set_location = {

common/traits/!_RG_gray_goo_traits.txt

@@ -102,7 +102,7 @@ RG_leader_trait_ruler_gray = {
 			}
 		}
 		# country_energy_produces_mult = -0.02
-		planet_stability_add = -2
+		planet_stability_add = -1
 		mult = owner.rg_gray_level
 	}
 	triggered_modifier = {
@@ -120,7 +120,7 @@ RG_leader_trait_ruler_gray = {
 			}
 		}
 		# country_energy_produces_mult = -0.03
-		planet_stability_add = -3.5
+		planet_stability_add = -1.5
 		mult = owner.rg_gray_level
 	}
 	triggered_modifier = {
@@ -134,7 +134,7 @@ RG_leader_trait_ruler_gray = {
 			}
 		}
 		# country_energy_produces_mult = -0.04
-		planet_stability_add = -5
+		planet_stability_add = -2
 		mult = owner.rg_gray_level
 	}
 	triggered_modifier = {

events/RG_combat_skill_events.txt

@@ -599,6 +599,10 @@ country_event = {
 }
 
 # 纳米重塑
+# This = owner of ship 1 (combatant)
+# From = owner of ship 2 (destroyed)
+# FromFrom = ship 1
+# FromFromFrom = ship 2
 country_event = {
 	id = rg_skill.12
 	hide_window = yes
@@ -607,17 +611,18 @@ country_event = {
 		FromFromFrom = {
 			is_in_combat = yes
 			NOT = {
-				is_same_value = event_target:gray_warship
+				is_same_value = event_target:gray_warship_ship
 			}
+			exists = fleet.leader
 		}
-		FromFrom.leader = {
+		FromFromFrom.fleet.leader = {
 			has_trait = RG_leader_trait_admiral_nanorebuild_gray
 		}
 	}
 	immediate = {
 		if = {
 			limit = {
-				event_target:gray_owner = {
+				From = {
 					check_variable = {
 						which = rg_nanorebuild_counter
 						value >= 1
@@ -633,7 +638,7 @@ country_event = {
 					design = event_target:event_ship
 				}
 			}
-			event_target:gray_owner = {
+			From = {
 				change_variable = {
 					which = rg_nanorebuild_counter
 					value = -1
@@ -643,51 +648,93 @@ country_event = {
 	}
 }
 
+# country_event = {
+# 	id = rg_skill.13
+# 	hide_window = yes
+# 	is_triggered_only = yes
+# 	trigger = {
+# 		FromFromFrom = {
+# 			is_in_combat = yes
+# 		}
+# 		FromFrom.solar_system = {
+# 			any_fleet_in_system = {
+# 				leader = {
+# 					has_trait = RG_leader_trait_admiral_nanorebuild_gray
+# 				}
+# 			}
+# 		}
+# 		this = {
+# 			NOT = {
+# 				is_same_value = event_target:gray_owner
+# 				is_in_federation_with = event_target:gray_owner
+# 			}
+# 		}
+# 	}
+# 	immediate = {
+# 		event_target:gray_owner = {
+# 			change_variable = {
+# 				which = rg_nanorebuild_counter
+# 				value = 1
+# 			}
+# 		}
+# 	}
+# }
+
+# On destroying enemy ship.
 country_event = {
 	id = rg_skill.13
 	hide_window = yes
 	is_triggered_only = yes
+
 	trigger = {
-		FromFromFrom = {
+		FromFrom = {
 			is_in_combat = yes
+			exists = fleet.leader
 		}
-		FromFrom.solar_system = {
-			any_fleet_in_system = {
-				leader = {
-					has_trait = RG_leader_trait_admiral_nanorebuild_gray
-				}
-			}
-		}
-		this = {
-			NOT = {
-				is_same_value = event_target:gray_owner
-				is_in_federation_with = event_target:gray_owner
-			}
+		FromFrom.fleet.leader = {
+			has_trait = RG_leader_trait_admiral_nanorebuild_gray
 		}
 	}
+
 	immediate = {
-		event_target:gray_owner = {
-			change_variable = {
-				which = rg_nanorebuild_counter
-				value = 1
+		FROMFROM = { # Winning ship.
+			if = {
+				limit = { exists = fleet.leader }
+				fleet.leader = {
+					if = {
+						limit = {
+							OR = {
+								has_trait = RG_leader_trait_admiral_nanorebuild_gray
+							}
+						}
+						ROOT = {
+							change_variable = {
+								which = rg_nanorebuild_counter
+								value = 1
+							}
+						}
+					}
+				}
 			}
 		}
 	}
 }
-
+# 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
@@ -696,8 +743,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
 			}

events/RG_events.txt

@@ -22,7 +22,7 @@ country_event = {
 			set_country_flag = origin_rg_gray_1st
 			set_country_flag = rg_gray_level_1
 			country_event = {
-				id = rg_event.3
+				id = rg_event.2
 				days = 30
 			}
 			add_modifier = {
@@ -66,20 +66,32 @@ country_event = {
 
 country_event = {
 	id = rg_event.2
-	hide_window = yes
+	title = graygoo.500.title
+	desc = RG_realgray.desc
+	diplomatic = yes
+	picture_event_data = {
+		portrait = event_target:rg_gray_country_leader
+		room = "ethic_spaceship_room"
+	}
 	is_triggered_only = yes
 	immediate = {
+		rg_gray_country_init = yes
 		country_event = {
 			id = graygoo.499
 		}
+		give_technology = {
+			tech = tech_minilaser_gray_1
+			message = no
+		}
+		give_technology = {
+			tech = tech_object_gray_5
+			message = no
+		}
+	}
+	option = {
+		name = rg_event.2.a
+		default_hide_option = yes
 	}
-	# option = {
-	# 	name = rg_event.2.a
-	# 	hidden_effect = {
-	# 		country_event = { id = graygoo.499 }
-	# 	}
-	# 	default_hide_option = yes
-	# }
 }
 
 country_event = {
@@ -245,7 +257,7 @@ country_event = {
 				RG_realgray = {
 					custom_tooltip = "RG_realgray"
 					country_event = {
-						id = rg_event.2
+						id = graygoo.499
 						days = 30
 					}
 					give_technology = {
@@ -260,7 +272,7 @@ country_event = {
 				RG_sleepinggray = {
 					custom_tooltip = "RG_sleepinggray"
 					country_event = {
-						id = rg_event.2
+						id = graygoo.499
 						days = 360
 					}
 					give_technology = {
@@ -275,7 +287,7 @@ country_event = {
 				RG_whitenoise = {
 					custom_tooltip = "RG_whitenoise"
 					country_event = {
-						id = rg_event.2
+						id = graygoo.499
 						days = 360
 					}
 					give_technology = {
@@ -290,7 +302,7 @@ country_event = {
 				RG_dragon = {
 					custom_tooltip = "RG_dragon"
 					country_event = {
-						id = rg_event.2
+						id = graygoo.499
 						days = 360
 					}
 					give_technology = {
@@ -324,7 +336,7 @@ country_event = {
 				RG_desanau = {
 					custom_tooltip = "RG_desanau"
 					country_event = {
-						id = rg_event.2
+						id = graygoo.499
 						days = 360
 					}
 					give_technology = {
@@ -355,7 +367,7 @@ country_event = {
 				RG_pirate = {
 					custom_tooltip = "RG_pirate"
 					country_event = {
-						id = rg_event.2
+						id = graygoo.499
 						days = 360
 					}
 					give_technology = {
@@ -386,7 +398,7 @@ country_event = {
 				RG_alienpoem = {
 					custom_tooltip = "RG_alienpoem"
 					country_event = {
-						id = rg_event.2
+						id = graygoo.499
 						days = 360
 					}
 					give_technology = {
@@ -417,7 +429,7 @@ country_event = {
 				RG_gift = {
 					custom_tooltip = "RG_gift"
 					country_event = {
-						id = rg_event.2
+						id = graygoo.499
 						days = 360
 					}
 					give_technology = {
@@ -444,7 +456,7 @@ country_event = {
 				RG_biggift = {
 					custom_tooltip = "RG_biggift"
 					country_event = {
-						id = rg_event.2
+						id = graygoo.499
 						days = 360
 					}
 					give_technology = {