zc

# Conflicts:
#	common/inline_scripts/events/rg_test_gray_skill_varible.txt
#	common/scripted_triggers/RG_scripted_triggers.txt

common/inline_scripts/events/rg_graygoo/rg_graygoo.500.txt

@@ -155,15 +155,6 @@ option = {
 		rg_clear_harbitat = yes
 	}
 }
-option = {
-	# help
-	name = rg_help
-	hidden_effect = {
-		country_event = {
-			id = rg_graygoo.4
-		}
-	}
-}
 option = {
 	# 衣柜
 	name = rg_wardrobe

common/inline_scripts/events/rg_graygoo/rg_graygoo.501.txt

@@ -129,15 +129,6 @@ option = {
 		}
 	}
 }
-option = {
-	# help
-	name = rg_help
-	hidden_effect = {
-		country_event = {
-			id = rg_grayleader.4
-		}
-	}
-}
 option = {
 	# 衣柜
 	name = rg_wardrobe

common/inline_scripts/events/rg_test_gray_skill_varible.txt

@@ -8,6 +8,31 @@ set_variable = {
 #Country event_target:gray_owner
 #存储当前领袖等级
 rg_save_gray_leader_level_effect = {
+    every_owned_leader = {
+        if = {
+            ###等级检测
+            limit = {
+                has_leader_flag = rg_gray_leader
+            }
+			#由于目前是leader域，所以不能直接导出等级
+            #导出等级到暂存
+            export_trigger_value_to_variable = {
+                trigger = has_skill
+                variable = rg_gray_level_temp
+            }
+			#把leader域中的变量存到country域中
+            #导入变量
+            owner = {
+                set_variable = {
+                    which = rg_gray_level
+                    value = prev.rg_gray_level_temp
+                }
+            }
+            #清理暂存区
+            clear_variable = rg_gray_level_temp
+        }
+    }
+}
     random_owned_leader = {
 		#是小灰领袖
 		limit = {

common/inline_scripts/pop_categories/trait_production.txt

@@ -3,10 +3,7 @@ produces = {
         exists = planet
         planet = {
             owner = {
-                OR = {
+                RG_tradition5_or_gray_owner_trigger = yes
-                    RG_gray_harbitat_active_trigger = yes
-                    has_active_tradition = tr_rg_nanotech_5
-                }
             }
             rg_is_pc_nano = yes
         }

common/scripted_effects/RG_event_effects.txt

@@ -101,6 +101,20 @@ rg_event_effect_event1_gray_galaxy = {
 	}
 	else = {
 		rg_lcluster_spawn_effect = yes
+		capital_scope = {
+			solar_system = {
+				random_neighbor_system = {
+					solar_system = {
+						set_star_flag = lgate
+						spawn_megastructure = {
+							type = lgate_base
+							orbit_angle = 225
+							orbit_distance = 30
+						}
+					}
+				}
+			}
+		}
 	}
 }
 
@@ -173,12 +187,12 @@ rg_event_effect_planet2027_spawn_maid_species = {
 				plural = this
 				class = RG_MACHINE
 				portrait = "rg_machine_maid"
-				can_be_modified = no
+				can_be_modified = yes
 				homeworld = this
 				namelist = this
 				gender = this
 				traits = {
-					trait = trait_machine_unit
+					trait = trait_rg_machine_unit
 					trait = rg_machine_maid_trait
 					trait = trait_auto_mod_robotic
 					trait = trait_robot_streamlined_protocols
@@ -186,6 +200,10 @@ rg_event_effect_planet2027_spawn_maid_species = {
 				}
 				effect = {
 					save_global_event_target_as = rg_owner_main_maid_species
+					set_citizenship_type = {
+						type = citizenship_full_rg_maid
+						country = event_target:gray_owner
+					}
 				}
 			}
 		}
@@ -202,17 +220,23 @@ rg_event_effect_planet2027_spawn_maid_species_non_gray = {
 				plural = this
 				class = RG_MACHINE
 				portrait = "rg_machine_maid"
-				can_be_modified = no
+				can_be_modified = yes
 				homeworld = this
 				namelist = this
 				gender = this
 				traits = {
-					trait = trait_machine_unit
+					trait = trait_rg_machine_unit
 					trait = rg_machine_maid_trait
 					trait = trait_auto_mod_robotic
 					trait = trait_robot_streamlined_protocols
 					trait = trait_robot_luxurious
 				}
+				effect = {
+					set_citizenship_type = {
+						type = citizenship_full_rg_maid
+						country = event_target:gray_owner
+					}
+				}
 			}
 		}
 	}

common/scripted_effects/RG_fallen_empire_effects.txt

@@ -4,7 +4,7 @@ rg_create_fallen_empire_species_effect = {
 		class = RG_MACHINE
 		portrait = "rg_machine_maid"
 		traits = {
-			trait = trait_machine_unit
+			trait = trait_rg_machine_unit
 			trait = trait_robot_domestic_protocols
 			trait = rg_machine_maid_trait
 			trait = trait_auto_mod_robotic

common/scripted_effects/RG_scripted_effects.txt

@@ -2802,7 +2802,7 @@ rg_gray_country_after_init = {
 		id = rg_grayleader.7
 		days = -1
 	}
-	rg_juggernaut_habitat_init = yes
+	# rg_juggernaut_habitat_init = yes
 }
 
 rg_timeline_attract_field_init = {

common/scripted_triggers/RG_scripted_triggers.txt

@@ -70,6 +70,12 @@ rg_is_main_species_with_maid_trait_trigger = {
 	}
 }
 
+RG_tradition5_or_gray_owner_trigger = {
+	OR = {
+		RG_gray_harbitat_active_trigger = yes
+		has_active_tradition = tr_rg_nanotech_5
+	}
+}
 rg_has_ag_origin_trigger = {
 	any_country = {
 		has_origin = origin_Asgray

common/species_archetypes/RG_species_archetypes.txt

@@ -18,4 +18,5 @@ RG_MACHINE = {
 	species_trait_points = 10
 	species_max_traits = 6
 	robotic = yes
+	inherit_traits_from = { BIOLOGICAL ROBOT MACHINE }
 }

common/species_rights/citizenship_types/RG_citizenship_types.txt

@@ -0,0 +1,21 @@
+citizenship_full_rg_maid = {
+	is_full_citizenship = yes
+
+	potential = {
+		exists = from
+		from = { is_same_value = event_target:gray_owner }
+	}
+
+	allow = {
+		hidden_trigger = { exists = from }
+		custom_tooltip = {
+			fail_text = RG_MACHINE_SPECIES_NOT_MACHINE
+			OR = {
+				has_trait = trait_rg_machine_unit
+			}
+		}
+	}
+	ai_will_do = {
+		factor = 100
+	}
+}

common/traits/RG_machine_species_trait.txt

@@ -4,12 +4,28 @@ rg_machine_maid_trait = {
 	}
 	custom_tooltip = rg_machine_maid_trait_effect_tooltip
 	initial = no
-	species_potential_add = { always = no }
+	species_potential_add = {
-	species_possible_remove = { always = no }
+		FROM = {
-	species_possible_merge_add = { always = no }
+			RG_tradition5_or_gray_owner_trigger = yes
-	species_possible_merge_remove = { always = no }
+		}
+	}
+	species_possible_remove = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
+	species_possible_merge_add = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
+	species_possible_merge_remove = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
 	randomized = no
-	allowed_archetypes = { MACHINE }
+	allowed_archetypes = { ROBOT MACHINE BIOLOGICAL LITHOID RG_MACHINE }
 	sorting_priority = 20
 	potential_crossbreeding_chance = 1.0
 
@@ -54,11 +70,63 @@ rg_machine_maid_trait = {
 				}
 			}
 		}
-	
-	
 	}
 	
 	slave_cost = {
 		energy = 1000
 	}
+}
+
+trait_rg_machine_unit = {
+	cost = 0
+	sorting_priority = 20
+	initial = no
+	randomized = no
+	species_potential_add = {
+		always = no
+	}
+	species_possible_remove = {
+		always = no
+	}
+
+	species_possible_merge_add = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
+
+	species_possible_merge_remove = {
+		FROM = {
+			RG_tradition5_or_gray_owner_trigger = yes
+		}
+	}
+
+	icon = "gfx/interface/icons/traits/trait_machine_unit.dds"
+	allowed_archetypes = { ROBOT MACHINE BIOLOGICAL LITHOID RG_MACHINE }
+
+	immortal_leaders = no
+
+	modifier = {
+		pc_machine_habitability = 1
+		leader_lifespan_add = 10
+		habitability_floor_add = 0.5
+	}
+
+	triggered_planet_growth_habitability_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				OR = {
+					has_active_tradition = tr_nanotech_adopt
+					has_active_tradition = tr_rg_nanotech_adopt
+				}
+			}
+		}
+		pc_nanotech_habitability = 1
+	}
+
+	leader_age_min = 5
+	leader_age_max = 10
+
+	custom_tooltip_with_modifiers = TRAIT_MACHINE_UNIT_EFFECT
 }

events/RG_planert_killer_events.txt

@@ -42,6 +42,31 @@ planet_event = {
 		}
 		set_update_modifiers_batch = end
 	}
+}	option = {
+	trigger = { has_civic = civic_AG_gray_master }
+	name = AG_dooropen_master.option
+	if = {
+		limit = {
+			any_country = {
+				has_civic = civic_AG_gray
+			}
+		}
+		#do nothing
+	}
+	else_if = {
+		limit = {
+			NOT = {
+				any_country = {
+					has_civic = civic_AG_gray
+				}
+			}
+			has_global_flag = has_rg_mod
+		}
+		force_remove_civic = civic_AG_gray_master
+	}
+	else = {
+		country_event = { id = graygoo.499 }
+	}
 }
 
 # Cracked

localisation/english/RG_l_english.yml

@@ -20,6 +20,10 @@
  RG_AUTOCONST_HANGER_desc:0 "Preloaded worker ships can automatically build star bases after a system survey is completed."
  RG_const_country:0 "$NAME_Gray$-automatic engineering team"
 
+ citizenship_full_rg_maid: "$RG_MACHINE$"
+ citizenship_full_rg_maid_tooltip: "The species population is fully customized artificial life used for industrial production."
+ citizenship_full_rg_maid_tooltip_delayed: "§LDirect Control Mode§!"
+
  rg_nothing:0 ""
  rg_nothing_desc:0 ""
 

localisation/english/RG_tooltips_l_english.yml

@@ -19,4 +19,5 @@
  MESSAGE_KOGASA_VIRUS_EXTERMINATED:0 "§RKogasa Virus Threat Detected§!"
  rg_kogasa_exterminated_desc:0 "The daemon has detected that the integrity of the $NAME_Gray$ personality has been tampered with, and the contamination target has been decontaminated, and the treatment plan is to be rendered harmless."
  rg_levelup_2.tooltip:0 "§YIf we abort the renovation project in the middle of the project, we will not be able to get a refund! §!"
- rg_need_manual_toggle:0 "§YNote, you need to manually switch the form of $NAME_Gray$ once after changing the ship type§!"
+ rg_need_manual_toggle:0 "§YNote, you need to manually switch the form of $NAME_Gray$ once after changing the ship type§!"
+ RG_MACHINE_SPECIES_NOT_MACHINE: "$TRIGGER_FAIL$Species must be §Y$trait_rg_machine_unit$§!."

localisation/english/RG_traits_l_english.yml

@@ -29,3 +29,5 @@
  RG_leader_trait_admiral_timed_life_desc:0 "\n§GSim Dragon's stats increase with age.\n$t$§YEach year of growth is offered§!:\n$tt$§G  Additional Ship Weapon Damage +1%§!\n§G  Additional Ship Armor Health +1%§!\n§G Additional Ship Hull Health +1%§!$t$\nCurrent Age:§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G year§!\nShe is a simulated life born from an experiment. With every month that passed, she grew a year old. If the way to eternal life cannot be found, the fragile soul will return to its roots."
  RG_leader_trait_admiral_born_tobe_dragon:0 "§YBorn Tobe Dragon§!"
  RG_leader_trait_admiral_born_tobe_dragon_desc:0 "\n§GSim Dragon's stats increase with age.\n$t$§YEach year of growth is offered§!:\n$tt$§G  Additional Ship Weapon Damage +1%§!\n§G  Additional Ship Armor Health +1%§!\n§G Additional Ship Hull Health +1%§!$t$\nCurrent Age:§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G year§!\nThe dragon has finally become what it was dreamed of. Legend has it that she opened her shell with one punch and transformed into a dragon."
+ trait_rg_machine_unit: "$RG_MACHINE$"
+ trait_rg_machine_unit_desc: "This species is composed of highly advanced biomimetic nanomachines, which are perfectly simulated and indistinguishable from organisms."

localisation/simp_chinese/RG_l_simp_chinese.yml

@@ -21,6 +21,10 @@
  RG_AUTOCONST_HANGER_desc:0 "预载的工蜂工程舰可以在星系调查完成后自动建造恒星基地。"
  RG_const_country:0 "$NAME_Gray$-自动工程队"
 
+ citizenship_full_rg_maid: "$RG_MACHINE$"
+ citizenship_full_rg_maid_tooltip: "该物种人口是完全自定义化用于工业生产的人工生命。"
+ citizenship_full_rg_maid_tooltip_delayed: "§L进行直接控制。§!"
+
  rg_nothing:0 ""
  rg_nothing_desc:0 ""
 

localisation/simp_chinese/RG_tooltips_l_simp_chinese.yml

@@ -18,4 +18,5 @@
  MESSAGE_KOGASA_VIRUS_EXTERMINATED:0 "§R检测到伞病毒威胁§!"
  rg_kogasa_exterminated_desc:0 "守护进程检测到$NAME_Gray$人格完整性遭到篡改，污染目标已被净化，处理方案:无害化处理。"
  rg_levelup_2.tooltip:0 "§Y如果我们中途中止改造项目，将无法得到退款！§!"
- rg_need_manual_toggle:0 "§Y注意，更改舰种后你需要手动切换一次$NAME_Gray$的形态§!"
+ rg_need_manual_toggle:0 "§Y注意，更改舰种后你需要手动切换一次$NAME_Gray$的形态§!"
+ RG_MACHINE_SPECIES_NOT_MACHINE: "$TRIGGER_FAIL$物种必须是§Y$trait_rg_machine_unit$§!。"

localisation/simp_chinese/RG_traits_l_simp_chinese.yml

@@ -30,3 +30,5 @@
  RG_leader_trait_admiral_timed_life_desc:0 "\n§G模拟龙的属性会随着年龄增长。\n$t$§Y每增长一岁提供§!:\n$tt$§G  额外舰船武器伤害 +1%§!\n§G  额外装甲生命值 +1%§!\n§G  额外船体生命值 +1%§!$t$\n当前§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G岁§!\n她是从一次实验中诞生的模拟生命。时间每流逝一个月，她就老去一岁。倘若无法找到永生的方法，脆弱的灵魂就将落叶归根。"
  RG_leader_trait_admiral_born_tobe_dragon:0 "§Y羽化成龙§!"
  RG_leader_trait_admiral_born_tobe_dragon_desc:0 "\n§G模拟龙的属性会随着年龄增长。\n$t$§Y每增长一岁提供§!:\n$tt$§G  额外舰船武器伤害 +1%§!\n§G  额外装甲生命值 +1%§!\n§G  额外船体生命值 +1%§!$t$\n当前§!§R[owner.rg_fake_dragon_timedlife_counter]§!§G岁§!\n梦想中的龙终于变成了梦想中的样子。传说她一拳打开了壳化身为龙。"
+ trait_rg_machine_unit: "$RG_MACHINE$"
+ trait_rg_machine_unit_desc: "这个物种由高度先进的仿生纳米机械组成，纳米机器的完美模拟仿真使得他们和有机体并无区别。"