diff --git a/common/on_actions/RG_on_actions.txt b/common/on_actions/RG_on_actions.txt index 5adea6b..c006763 100644 --- a/common/on_actions/RG_on_actions.txt +++ b/common/on_actions/RG_on_actions.txt @@ -45,10 +45,12 @@ on_game_start_country = { } # This = country +# 最高优先级检测才放月检 on_monthly_pulse_country = { events = { - rg.8 - rg.16 + rg.8 #领袖等级检测更新 + rg.16 #陆军压制舰更新 + # rg.22 #小灰复活检测 # rg_skill.9 } } diff --git a/events/!_RG_gray_goo_events.txt b/events/!_RG_gray_goo_events.txt index b3e1049..156228a 100644 --- a/events/!_RG_gray_goo_events.txt +++ b/events/!_RG_gray_goo_events.txt @@ -585,7 +585,7 @@ event = { days = 3600 } country_event = { id = graygoo.511 } - country_event = { id = graygoo.512 days = 3600 } + country_event = { id = rg.22 } } } } diff --git a/events/RG_events.txt b/events/RG_events.txt index fcf7227..861347b 100644 --- a/events/RG_events.txt +++ b/events/RG_events.txt @@ -842,6 +842,33 @@ country_event = { } } +# looping check for grayreforming +country_event = { + id = rg.22 + hide_window = yes + + is_triggered_only = yes + + trigger = { + is_same_value = event_target:gray_owner + has_country_flag = gray_reforming + } + + immediate = { + if = { + limit = { + NOT = { + has_modifier = "gray_scattered" + } + } + country_event = { id = graygoo.512 } + } + else = { + country_event = { id = rg.22 years = 1 } # *THIS* looping check + } + } +} + # 拆毁工厂小灰通讯 country_event = { id = rg.200 diff --git a/events/RG_gray_leader_event.txt b/events/RG_gray_leader_event.txt index b672958..5c51afa 100644 --- a/events/RG_gray_leader_event.txt +++ b/events/RG_gray_leader_event.txt @@ -1137,8 +1137,8 @@ country_event = { nanites = -1000 alloys = -50000 } - remove_country_flag = gray_reforming remove_modifier = "gray_scattered" + country_event = { id = graygoo.512 } } } diff --git a/events/RG_wsg_graygoo_event.txt b/events/RG_wsg_graygoo_event.txt index 4b96d80..1913d7c 100644 --- a/events/RG_wsg_graygoo_event.txt +++ b/events/RG_wsg_graygoo_event.txt @@ -1090,8 +1090,8 @@ country_event = { nanites = -1000 alloys = -50000 } - remove_country_flag = gray_reforming remove_modifier = "gray_scattered" + country_event = { id = graygoo.512 } } }