Merge branch 'RG_AG_TEST'
# Conflicts: # common/inline_scripts/events/rg_test_gray_skill_varible.txt # common/scripted_triggers/RG_scripted_triggers.txt
This commit is contained in:
@@ -1,3 +1,23 @@
|
||||
rg_all_cluster_mod_check = {
|
||||
OR = {
|
||||
has_global_flag = l_cluster_origin # l-cluster plus
|
||||
has_global_flag = rg_origin_l_cluster # 遥远约定
|
||||
has_global_flag = gray_origin_activate # 远星之歌
|
||||
has_global_flag = rg_origin_scion_l_cluster # 未来追迹
|
||||
rg_has_ag_origin_trigger = yes # 遥远的故事
|
||||
}
|
||||
}
|
||||
|
||||
rg_all_cluster_mod_check_for_scion = {
|
||||
OR = {
|
||||
has_global_flag = l_cluster_origin # l-cluster plus
|
||||
# has_global_flag = rg_origin_l_cluster # 遥远约定
|
||||
has_global_flag = gray_origin_activate # 远星之歌
|
||||
# has_global_flag = rg_origin_scion_l_cluster # 未来追迹
|
||||
rg_has_ag_origin_trigger = yes # 遥远的故事
|
||||
}
|
||||
}
|
||||
|
||||
RG_planet_can_auto_build = {
|
||||
OR = {
|
||||
AND = {
|
||||
@@ -50,9 +70,15 @@ rg_is_main_species_with_maid_trait_trigger = {
|
||||
}
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
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
|
||||
>>>>>>> RG_AG_TEST
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user