From 8133f83066c21cd9b46f8d4fcab7dd114d9b9241 Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Sat, 21 Sep 2024 15:28:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/buildings/RG_nano_buildings.txt        | 141 ++++++++++--------
 .../RG_special_ship_designs.txt               |  49 ++++++
 .../scripted_effects/RG_special_effects.txt   |  29 ++++
 common/traditions/RG_nanotech_tradition.txt   |  16 +-
 events/RG_events.txt                          |  27 ++++
 events/RG_planet_event.txt                    |  62 ++++----
 .../simp_chinese/RG_l_simp_chinese.yml        |  14 +-
 7 files changed, 220 insertions(+), 118 deletions(-)

diff --git a/common/buildings/RG_nano_buildings.txt b/common/buildings/RG_nano_buildings.txt
index d2488b0..0259344 100644
--- a/common/buildings/RG_nano_buildings.txt
+++ b/common/buildings/RG_nano_buildings.txt
@@ -43,42 +43,44 @@ building_rg_nanolab_1 = {
 		}
 	}
 
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				is_machine_empire = yes
-			}
-		}
-		job_nanotech_research_unit_add = 3
-	}
+	# triggered_planet_modifier = {
+	# 	potential = {
+	# 		exists = owner
+	# 		owner = {
+	# 			is_machine_empire = yes
+	# 		}
+	# 	}
+	# 	job_nanotech_research_unit_add = 3
+	# }
 
 	triggered_planet_modifier = {
 		potential = {
-			exists = owner
-			owner = {
-				is_individual_machine = yes
-			}
+			always = yes
+			# exists = owner
+			# owner = {
+			# 	is_individual_machine = yes
+			# }
 		}
-		job_nanotech_researcher_add = 3
+		job_nanotech_researcher_add = 8
 	}
 
+	# triggered_desc = {
+	# 	trigger = {
+	# 		exists = owner
+	# 		owner = {
+	# 			is_machine_empire = yes
+	# 		}
+	# 	}
+	# 	text = job_nanotech_research_unit_effect_desc
+	# }
+
 	triggered_desc = {
 		trigger = {
-			exists = owner
-			owner = {
-				is_machine_empire = yes
-			}
-		}
-		text = job_nanotech_research_unit_effect_desc
-	}
-
-	triggered_desc = {
-		trigger = {
-			exists = owner
-			owner = {
-				is_individual_machine = yes
-			}
+			always = yes
+			#exists = owner
+			#owner = {
+			#	is_individual_machine = yes
+			#}
 		}
 		text = job_nanotech_researcher_effect_desc
 	}
@@ -131,42 +133,44 @@ building_rg_nanolab_2 = {
 	}
 
 
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				is_machine_empire = yes
-			}
-		}
-		job_nanotech_research_unit_add = 6
-	}
+	# triggered_planet_modifier = {
+	# 	potential = {
+	# 		exists = owner
+	# 		owner = {
+	# 			is_machine_empire = yes
+	# 		}
+	# 	}
+	# 	job_nanotech_research_unit_add = 6
+	# }
 
 	triggered_planet_modifier = {
 		potential = {
-			exists = owner
-			owner = {
-				is_individual_machine = yes
-			}
+			always = yes
+			# exists = owner
+			# owner = {
+			# 	is_individual_machine = yes
+			# }
 		}
-		job_nanotech_researcher_add = 6
+		job_nanotech_researcher_add = 15
 	}
 
+	# triggered_desc = {
+	# 	trigger = {
+	# 		exists = owner
+	# 		owner = {
+	# 			is_machine_empire = yes
+	# 		}
+	# 	}
+	# 	text = job_nanotech_research_unit_effect_desc
+	# }
+
 	triggered_desc = {
 		trigger = {
-			exists = owner
-			owner = {
-				is_machine_empire = yes
-			}
-		}
-		text = job_nanotech_research_unit_effect_desc
-	}
-
-	triggered_desc = {
-		trigger = {
-			exists = owner
-			owner = {
-				is_individual_machine = yes
-			}
+			always = yes
+			# exists = owner
+			# owner = {
+			# 	is_individual_machine = yes
+			# }
 		}
 		text = job_nanotech_researcher_effect_desc
 	}
@@ -204,14 +208,21 @@ building_rg_nanotech_cauldron = {
 	resources = {
 		category = planet_buildings
 		cost = {
-			alloys = @b3_minerals
-		}
-		upkeep = {
-			nanites = 3
-			energy = 30
+			minerals = 1000
 		}
 		produces = {
-			alloys = 15
+			trigger = {
+				owner = {
+					NOT = {
+						has_deficit = minerals
+					}
+				}
+			}
+			alloys = 60
+			consumer_goods = 40
+		}
+		upkeep = {
+			nanites = 25
 		}
 	}
 }
@@ -246,17 +257,17 @@ building_rg_nanite_transmuter = {
 			trigger = {
 				owner = {
 					NOT = {
-						has_deficit = nanites
+						has_deficit = minerals
 					}
 				}
 			}
+			nanites = 40
 			rare_crystals = 2
 			volatile_motes = 2
 			exotic_gases = 2
 		}
 		upkeep = {
-			nanites = 1
-			energy = 5
+			minerals = 50
 		}
 	}
 
diff --git a/common/global_ship_designs/RG_special_ship_designs.txt b/common/global_ship_designs/RG_special_ship_designs.txt
index e69e340..140a3e3 100644
--- a/common/global_ship_designs/RG_special_ship_designs.txt
+++ b/common/global_ship_designs/RG_special_ship_designs.txt
@@ -388,6 +388,55 @@ ship_design = {
 	required_component = "RG_COMBAT_COMPUTER_MotherShip"
 }
 
+# 星海试验船-传统
+ship_design = {
+	name = "RG_COLOSSUS_interdictor_NANO_SP"
+	ship_size = RG_graygoo_interdictor
+	is_event_design = yes
+	section = {
+		template = "RG_COLOSSUS_interdictor_key"
+		slot = "mid"
+		component = {
+			slot = "PLANET_KILLER_GUN_01"
+			template = "RG_PLANET_KILLER_NANO_SP"
+		}
+		component = {
+			slot = "LARGE_UTILITY_1"
+			template = ""
+		}
+		component = {
+			slot = "LARGE_UTILITY_2"
+			template = ""
+		}
+		component = {
+			slot = "LARGE_UTILITY_3"
+			template = ""
+		}
+		component = {
+			slot = "LARGE_UTILITY_4"
+			template = ""
+		}
+		component = {
+			slot = "LARGE_UTILITY_5"
+			template = ""
+		}
+		component = {
+			slot = "LARGE_UTILITY_6"
+			template = ""
+		}
+		component = {
+			slot = "AUX_UTILITY_1"
+			template = ""
+		}
+	}
+	required_component = "RG_FUSION_NANO_REACTOR_S"
+	required_component = "HYPER_DRIVE_3"
+	required_component = "SENSOR_4"
+	required_component = "RG_gatebuilder_thruster"
+	required_component = "RG_COMBAT_COMPUTER_MotherShip"
+}
+
+
 # 星海纸船
 ship_design = {
 	name = "RG_Buff_interdictor_SP"
diff --git a/common/scripted_effects/RG_special_effects.txt b/common/scripted_effects/RG_special_effects.txt
index 6c586b6..50564d1 100644
--- a/common/scripted_effects/RG_special_effects.txt
+++ b/common/scripted_effects/RG_special_effects.txt
@@ -57,6 +57,35 @@ rg_create_gray_planetkiller_testship_1 = {
 	}
 }
 
+rg_create_gray_planetkiller_testship_2 = {
+	create_fleet = {
+		name = "NAME_RG_TESTSHIP"
+		settings = {
+			can_disband = yes
+			can_upgrade = no
+			can_change_composition = no
+			can_change_leader = no
+			uses_naval_capacity = no
+			spawn_debris = no
+		}
+		effect = {
+			set_owner = root
+			create_ship = {
+				name = "NAME_RG_TESTSHIP"
+				design = "RG_COLOSSUS_interdictor_NANO_SP"
+				prefix = no
+				upgradable = no
+			}
+			set_location = {
+				target = root.capital_scope
+				distance = 0
+				angle = random
+			}
+			set_fleet_flag = rg_test_ship_fleet
+		}
+	}
+}
+
 rg_create_gray_paperwork_testship_1 = {
 	create_fleet = {
 		name = "NAME_RG_TESTSHIP"
diff --git a/common/traditions/RG_nanotech_tradition.txt b/common/traditions/RG_nanotech_tradition.txt
index c08c4dd..02bca24 100644
--- a/common/traditions/RG_nanotech_tradition.txt
+++ b/common/traditions/RG_nanotech_tradition.txt
@@ -69,19 +69,9 @@ tr_rg_nanotech_5 = {
 	}
 	custom_tooltip_with_modifiers = tr_rg_nanotech_5_modifier_desc
 	#Unlocks the nanite edicts
-	hidden_effect = {
-		every_owned_pop = {
-			limit = {
-				is_same_species = root
-				species = {
-					has_trait = rg_machine_maid_trait
-				}
-			}
-			modify_species = {
-				species = this
-				add_trait = rg_machine_maid_trait
-			}
-			species = { save_event_target_as = gray_owner_modded_species }
+	on_enabled = {
+		country_event = {
+			id = rg_event.25
 		}
 	}
 	#Every 5 years, double the size of orbital nanite deposits that you're harvesting, up to a max of 50 OR spawns a number of nanite swarmers depending on the size of the deposit
diff --git a/events/RG_events.txt b/events/RG_events.txt
index 342a9e5..dc4d8e3 100644
--- a/events/RG_events.txt
+++ b/events/RG_events.txt
@@ -1183,6 +1183,33 @@ planet_event = {
 	}
 }
 
+country_event = { # Memorial Valuts Civic Paragon Level Tick / FROM = Leader
+	id = rg_event.25
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	trigger = {
+	}
+
+	immediate = {
+		rg_create_gray_planetkiller_testship_2 = yes
+		every_owned_pop = {
+			limit = {
+				is_same_species = root
+				species = {
+					has_trait = rg_machine_maid_trait
+				}
+			}
+			modify_species = {
+				species = this
+				add_trait = rg_machine_maid_trait
+			}
+			species = { save_event_target_as = gray_owner_modded_species }
+		}
+	}
+}
+
 # 拆毁工厂小灰通讯
 country_event = {
 	id = rg_event.200
diff --git a/events/RG_planet_event.txt b/events/RG_planet_event.txt
index 37d3834..dbab147 100644
--- a/events/RG_planet_event.txt
+++ b/events/RG_planet_event.txt
@@ -1,16 +1,12 @@
 namespace = rg_planet
-
 ##### Virtual Ascension Events
-
 ### Create the Unemployed
 ### Country scope gatekeeper
 ### on_monthly_pulse_country
 country_event = {
 	id = rg_planet.5025
 	hide_window = yes
-
 	is_triggered_only = yes
-
 	trigger = {
 		OR = {
 			has_country_flag = rg_habitat_enabled
@@ -36,10 +32,8 @@ country_event = {
 			}
 		}
 	}
-}
-
 	immediate = {
-		if = { 
+		if = {
 			limit = {
 				has_country_flag = rg_habitat_enabled
 				NOT = {
@@ -47,7 +41,10 @@ country_event = {
 				}
 			}
 			event_target:rg_gray_habitat_target = {
-				planet_event = { id = rg_planet.2027 days = 1 }
+				planet_event = {
+					id = rg_planet.2027
+					days = 1
+				}
 			}
 		}
 		else = {
@@ -74,14 +71,20 @@ country_event = {
 								value >= 1
 							}
 						}
+					}
+				}
+				planet_event = {
+					id = rg_planet.2027
+					days = 1
 				}
-				planet_event = { id = rg_planet.2027 days = 1 }
 			}
+			
 		}
-		}
+	}
 }
 
 
+
 ### Create the Unemployed
 ### Planet scope gatekeeper
 ### on_building_complete, on_building_upgraded, on_building_demolished,
@@ -90,9 +93,7 @@ country_event = {
 planet_event = {
 	id = rg_planet.2026
 	hide_window = yes
-
 	is_triggered_only = yes
-
 	trigger = {
 		is_under_colonization = no
 		OR = {
@@ -108,9 +109,11 @@ planet_event = {
 		}
 		free_jobs > 0
 	}
-
 	immediate = {
-		planet_event = { id = rg_planet.2027 days = 1 }
+		planet_event = {
+			id = rg_planet.2027
+			days = 1
+		}
 	}
 }
 
@@ -119,7 +122,6 @@ planet_event = {
 planet_event = {
 	id = rg_planet.2027
 	hide_window = yes
-
 	is_triggered_only = yes
 	trigger = {
 		is_under_colonization = no
@@ -136,7 +138,6 @@ planet_event = {
 		}
 		free_jobs > 0
 	}
-
 	immediate = {
 		set_variable = {
 			which = num_pops
@@ -144,17 +145,11 @@ planet_event = {
 		}
 		# Create pops for every free job
 		if = {
-			owner = {
-				is_same_value = event_target:gray_owner
-			}
-			while = {
-				count = num_pops
-				create_pop = {
-					species = owner_main_species
+			limit = {
+				owner = {
+					is_same_value = event_target:gray_owner
 				}
 			}
-		}
-		else = {
 			while = {
 				count = num_pops
 				create_pop = {
@@ -162,7 +157,14 @@ planet_event = {
 				}
 			}
 		}
-
+		else = {
+			while = {
+				count = num_pops
+				create_pop = {
+					species = owner_main_species
+				}
+			}
+		}
 		# Kill pops generated in excess (e.g. from forbidden jobs)
 		if = {
 			limit = {
@@ -186,9 +188,7 @@ planet_event = {
 country_event = {
 	id = rg_planet.5030
 	hide_window = yes
-
 	is_triggered_only = yes
-
 	trigger = {
 		has_country_flag = rg_habitat_enabled
 		event_target:rg_gray_habitat_target = {
@@ -197,7 +197,6 @@ country_event = {
 			}
 		}
 	}
-
 	immediate = {
 		event_target:rg_gray_habitat_target = {
 			every_owned_pop = {
@@ -218,9 +217,7 @@ country_event = {
 planet_event = {
 	id = rg_planet.2031
 	hide_window = yes
-
 	is_triggered_only = yes
-
 	trigger = {
 		exists = owner
 		owner = {
@@ -230,7 +227,6 @@ planet_event = {
 			is_unemployed = yes
 		}
 	}
-
 	immediate = {
 		every_owned_pop = {
 			limit = {
@@ -239,4 +235,4 @@ planet_event = {
 			kill_pop = yes
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/localisation/simp_chinese/RG_l_simp_chinese.yml b/localisation/simp_chinese/RG_l_simp_chinese.yml
index eda640c..e29afd3 100644
--- a/localisation/simp_chinese/RG_l_simp_chinese.yml
+++ b/localisation/simp_chinese/RG_l_simp_chinese.yml
@@ -49,15 +49,15 @@
  tradition_rg_nanotech_delayed: "我们是一股永不停息的洪流,吞天食地、势不可挡。一切都将融入我们,我们将形成一切。"
  tr_rg_nanotech_adopt_modifier_desc: "§Y$AVAILABLE_STARBASE_BUILDINGS$§!$sm_nanite_harvester$"
  tr_rg_nanotech_1_modifier_desc: "§Y$AVAILABLE_BUILDINGS$§!$building_rg_nanolab_1$\n§Y$AVAILABLE_BUILDINGS$§!$building_rg_nanolab_2$\n§Y$AVAILABLE_BUILDINGS$§!$building_rg_nanotech_cauldron$\n§Y$AVAILABLE_BUILDINGS$§!$building_rg_nanite_transmuter$\n"
- tr_rg_nanotech_2_modifier_desc: "—§I解锁巨型结构:§!$RG_habitat_central_complex$\n"
- tr_rg_nanotech_3_modifier_desc: "§Y解锁行星决议:§!$decision_rg_nanotech_swarm_consume_world$\n§Y解锁巨像武器:§!$tech_object_gray_7$,可将星球转变为可殖民的§Y$pc_nanotech$§!"
- tr_rg_nanotech_4_modifier_desc: "§Y解锁飞升:$rg_ap_nantiematter$\n解锁舰船:§!$RG_graygoo_destroyer$\n§Y获得遗珍:§!$rg_tempest_invocator$,允许你召唤宇宙风暴:$graytempest_storm$"
- tr_rg_nanotech_5_modifier_desc: "§Y解锁净化方式:$purge_nanophage$§!\n所有帝国人口将获得§Y纳米特质§!:人口需要$nanites$维护费。\n每个类型为§Y$pc_nanotech$§!或§Y$pc_rg_grayhabitat$§!的殖民地都将瞬间创建§Y纳米化人口$pops_with_icon$§!以填补§Y£building£建筑§!和§Y£district£区划§!的£job£岗位需求。"
+ tr_rg_nanotech_2_modifier_desc: "—§I解锁巨型结构:§!§Y$RG_habitat_central_complex$§!\n"
+ tr_rg_nanotech_3_modifier_desc: "§Y解锁行星决议:§!$decision_rg_nanotech_swarm_consume_world$\n§Y解锁巨像武器:§!$tech_object_gray_7$:可将星球转变为可殖民的§Y$pc_nanotech$§!"
+ tr_rg_nanotech_4_modifier_desc: "§Y解锁飞升:$rg_ap_nantiematter$\n解锁舰船:§!$RG_graygoo_destroyer$\n§Y获得遗珍:§!§Y$rg_tempest_invocator$§!:允许你召唤宇宙风暴:§Y$graytempest_storm$§!"
+ tr_rg_nanotech_5_modifier_desc: "§Y解锁净化方式:$purge_nanophage$§!:将非帝国主体人口同化为我们的一部分。\n所有帝国人口将获得§Y纳米特质§!:人口需要£nanites£§Y$nanites$§!维护费。\n每个类型为§Y$pc_nanotech$§!或§Y$pc_rg_grayhabitat$§!的殖民地都将瞬间创建§Y纳米化人口$pops_with_icon$§!以填补§Y£building£建筑§!和§Y£district£区划§!的£job£岗位需求。"
  tr_rg_nanotech_finish_modifier_desc: "§Y解锁舰船:§!$RG_graygoo_mothership$\n每§Y5§!年§Y$sm_nanite_harvester_plural$§!都会提升,可能是增加$r_nanites$矿藏的规模,或是直接产出一笔纳米机器人资源。该效果受到矿藏所依附的行星尺寸的限制。"
 
  decision_rg_server_shut_down: "§R核心关闭§!"
  decision_rg_server_shut_down_desc: "§R将摧毁殖民地!§!\n\n这个殖民地已经失去了它的用途,关闭信号中继核心。"
- decision_rg_nanotech_swarm_consume_world: "纳米化星球"
+ decision_rg_nanotech_swarm_consume_world: "§Y纳米化星球§!"
  decision_rg_nanotech_swarm_consume_world_desc: "我们的行星将被转变,以喂养洪流、增长我们的存在。"
  decision_rg_nanotech_swarm_consume_world_effect_desc: "改造这个星球,增加一个或多个障碍,减少这个星球的宜居性和区划,但会为我们的洪流提供更多的纳米机器人。"
 
@@ -90,9 +90,9 @@
  building_rg_nanolab_1_desc: "在纳观尺度上进行研究带来对宇宙的全新视角。"
  building_rg_nanolab_2: "§Y纳米研究复合体§!"
  building_rg_nanolab_2_desc: "无限小与无限大看起来是如此地相似,这是多么地奇妙啊。"
- building_rg_nanotech_cauldron: "纳米熔炉"
+ building_rg_nanotech_cauldron: "§Y纳米熔炉§!"
  building_rg_nanotech_cauldron_desc: "在分子水平上运作,虫群可以很容易地将矿物结构重新配置成坚固的合金晶格。"
- building_rg_nanite_transmuter: "纳米变形器"
+ building_rg_nanite_transmuter: "§Y纳米变形器§!"
  building_rg_nanite_transmuter_desc: "该工厂使用极为先进的纳米材料大量生产各种稀有资源。缺少纳米材料时生产将会暂停。"
 
  district_rg_farming: "农业区段"