diff --git a/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt b/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt new file mode 100644 index 0000000..1bf9d60 --- /dev/null +++ b/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt @@ -0,0 +1,30 @@ +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 + } + } + any_country = { + has_civic = origin_rg_gray + } + has_global_flag = has_rg_mod + } + force_remove_civic = civic_AG_gray_master + } + else = { + country_event = { id = graygoo.499 } + } +} + diff --git a/common/inline_scripts/events/rg_test_gray_skill_varible.txt b/common/inline_scripts/events/rg_test_gray_skill_varible.txt index f604e84..7563980 100644 --- a/common/inline_scripts/events/rg_test_gray_skill_varible.txt +++ b/common/inline_scripts/events/rg_test_gray_skill_varible.txt @@ -8,6 +8,7 @@ set_variable = { #Country event_target:gray_owner #存储当前领袖等级 rg_save_gray_leader_level_effect = { +<<<<<<< HEAD every_owned_leader = { if = { ###等级检测 @@ -33,6 +34,31 @@ rg_save_gray_leader_level_effect = { } } } +======= + random_owned_leader = { + #是小灰领袖 + limit = { + has_leader_flag = rg_gray_leader + } + export_trigger_value_to_variable = { + trigger = has_skill + variable = rg_gray_level_temp + } + owner = { + set_variable = { + which = rg_gray_level + value = prev.rg_gray_level_temp + } + } + } +} +#country scope +#用的时候就 +check_variable = { + which = rg_gray_level + value >= 10 +} +>>>>>>> RG_AG_TEST #Country event_target:gray_owner #等级导入,把存储的领袖等级赋予到领袖身上 diff --git a/common/scripted_effects/RG_event_effects.txt b/common/scripted_effects/RG_event_effects.txt index 52aff6b..1a45a6f 100644 --- a/common/scripted_effects/RG_event_effects.txt +++ b/common/scripted_effects/RG_event_effects.txt @@ -48,8 +48,11 @@ rg_event_effect_event1_cluster = { rg_event_effect_event1_cluster_galaxy = { if = { limit = { - NOT = { - has_global_flag = origin_rg_gray_1st_global + OR = { + rg_has_ag_origin_trigger = yes + NOT = { + has_global_flag = origin_rg_gray_1st_global + } } } rg_event_effect_event1_gray_galaxy = yes @@ -91,7 +94,14 @@ rg_event_effect_event1_gray_galaxy = { set_country_flag = rg_gray_level_1 rg_event_effect_event1_to_event2_effect = yes save_global_event_target_as = origin_rg_gray_country - rg_lcluster_spawn_effect = yes + if = { + limit = { + rg_has_ag_origin_trigger = yes + } + } + else = { + rg_lcluster_spawn_effect = yes + } } rg_event_effect_event1_to_event2_effect = { @@ -138,7 +148,9 @@ rg_event_effect_lcluster_open = { 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 # 遥远的故事 } + } country_event = { id = rg_cluster.2 diff --git a/common/scripted_triggers/RG_scripted_triggers.txt b/common/scripted_triggers/RG_scripted_triggers.txt index 8ac9ade..da653ba 100644 --- a/common/scripted_triggers/RG_scripted_triggers.txt +++ b/common/scripted_triggers/RG_scripted_triggers.txt @@ -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 } } \ No newline at end of file diff --git a/events/RG_origin_event.txt b/events/RG_origin_event.txt index a5260ca..de01731 100644 --- a/events/RG_origin_event.txt +++ b/events/RG_origin_event.txt @@ -43,10 +43,10 @@ country_event = { set_country_flag = rg_scion_needs_fe if = { limit ={ - any_playable_country = { - AND = { + OR = { + rg_all_cluster_mod_check_for_scion = yes + any_playable_country = { has_origin = origin_rg_gray - # NOT = { has_global_flag = rg_origin_l_cluster } } } }