diff --git a/common/global_ship_designs/!_RG_event_ship_designs_distant_stars_overwrite.txt b/common/global_ship_designs/!_RG_event_ship_designs_distant_stars_overwrite.txt index 3ebb75f..8188035 100644 --- a/common/global_ship_designs/!_RG_event_ship_designs_distant_stars_overwrite.txt +++ b/common/global_ship_designs/!_RG_event_ship_designs_distant_stars_overwrite.txt @@ -10,7 +10,7 @@ ship_design = { component = { slot = "PLANET_KILLER_GUN_01" - template = "PLANET_KILLER_NEUTRON" + template = "RG_PLANET_KILLER_SMALL" } component = { slot = "TITAN_01" diff --git a/common/on_actions/RG_on_actions.txt b/common/on_actions/RG_on_actions.txt index 4774f0b..8fb5b31 100644 --- a/common/on_actions/RG_on_actions.txt +++ b/common/on_actions/RG_on_actions.txt @@ -51,6 +51,7 @@ on_monthly_pulse_country = { rg.8 #领袖等级检测更新 rg.16 #陆军压制舰更新 # rg.22 #小灰复活检测 + rg.23 #月检移除L星门认知防止收容失效 # rg_skill.9 } } diff --git a/common/scripted_effects/RG_scripted_effects.txt b/common/scripted_effects/RG_scripted_effects.txt index c72fc51..9ca9552 100644 --- a/common/scripted_effects/RG_scripted_effects.txt +++ b/common/scripted_effects/RG_scripted_effects.txt @@ -2082,4 +2082,72 @@ rg_timeline_attract_field_init = { #德萨努 remove_global_flag = gray_goo_empire_set } +} + +RG_const_auto_build_effect_event = { + if = { + limit = { + solar_system = { + #星系必须完成扫描 + is_surveyed = { + who = root.controller + status = yes + } + #星系内不能有其他自动工蜂 + NOT = { any_fleet_in_system = { any_controlled_ship = { is_ship_size = RG_armed_constructor_ship } } } + } + } + #创建自动工蜂国家 + if = { + limit = { + NOT = { exists = event_target:RG_const_country } + } + create_country = { + name = RG_const_country + type = RG_gray_friendly + auto_delete = no + flag = root.controller + effect = { + save_global_event_target_as = RG_const_country + establish_communications_no_message = root.controller + set_faction_hostility = { + target = root.controller + set_friendly = yes + } + #对野怪国家中立 + every_country = { + limit = { + OR = { + is_amoeba_country_type = yes + is_tiyanki_country_type = yes + is_crystal_country_type = yes + is_drone_country_type = yes + } + } + set_faction_hostility = { + target = prev + set_neutral = yes + } + } + } + } + controller = { + add_intel = { + who = event_target:RG_const_country + amount = 1000 + } + } + } + #释放工蜂 + switch = { + trigger = has_component + RG_AUTOCONST_HANGER = { + RG_const_auto_build_effect = { + count = 1 + starbase_time = 30 + station_time = 150 + } + } + } + } } \ No newline at end of file diff --git a/events/RG_combat_skill_events.txt b/events/RG_combat_skill_events.txt index 17eeaf7..5c7f7b2 100644 --- a/events/RG_combat_skill_events.txt +++ b/events/RG_combat_skill_events.txt @@ -139,6 +139,11 @@ ship_event = { immediate = { if = { limit = { + owner = { + NOT = { + is_same_value = origin_rg_gray_country + } + } solar_system = { NOT = { #星系内不能有敌舰 any_fleet_in_system = { @@ -148,71 +153,48 @@ ship_event = { } } } - if = { - limit = { - solar_system = { - #星系必须完成扫描 - is_surveyed = { - who = root.controller - status = yes - } - #星系内不能有其他自动工蜂 - NOT = { any_fleet_in_system = { any_controlled_ship = { is_ship_size = RG_armed_constructor_ship } } } + #创建自动工程船暂存国家 + RG_const_auto_build_effect_event = yes + } + else_if = { + limit = { + owner = { + is_same_value = origin_rg_gray_country + NOT = { + has_global_flag = l_cluster_opened } } - #创建自动工蜂国家 - if = { - limit = { - NOT = { exists = event_target:RG_const_country } - } - create_country = { - name = RG_const_country - type = RG_gray_friendly - auto_delete = no - flag = root.controller - effect = { - save_global_event_target_as = RG_const_country - establish_communications_no_message = root.controller - set_faction_hostility = { - target = root.controller - set_friendly = yes - } - #对野怪国家中立 - every_country = { - limit = { - OR = { - is_amoeba_country_type = yes - is_tiyanki_country_type = yes - is_crystal_country_type = yes - is_drone_country_type = yes - } - } - set_faction_hostility = { - target = prev - set_neutral = yes - } - } - } - } - controller = { - add_intel = { - who = event_target:RG_const_country - amount = 1000 - } - } - } - #释放工蜂 - switch = { - trigger = has_component - RG_AUTOCONST_HANGER = { - RG_const_auto_build_effect = { - count = 1 - starbase_time = 30 - station_time = 150 + solar_system = { + has_star_flag = lcluster + NOT = { #星系内不能有敌舰 + any_fleet_in_system = { + exists = controller + controller = { is_hostile = root.controller } } } } } + #创建自动工程船暂存国家 + RG_const_auto_build_effect_event = yes + } + else_if = { + limit = { + owner = { + is_same_value = origin_rg_gray_country # 是小灰起源 + has_global_flag = l_cluster_opened # L星门已开启 + } + solar_system = { + # has_star_flag = lcluster + NOT = { #星系内不能有敌舰 + any_fleet_in_system = { + exists = controller + controller = { is_hostile = root.controller } + } + } + } + } + #创建自动工程船暂存国家 + RG_const_auto_build_effect_event = yes } #循环检查 ship_event = { diff --git a/events/RG_events.txt b/events/RG_events.txt index 861347b..edf1cb1 100644 --- a/events/RG_events.txt +++ b/events/RG_events.txt @@ -869,6 +869,28 @@ country_event = { } } +# looping check for escape lcluster +country_event = { + id = rg.23 + hide_window = yes + + is_triggered_only = yes + + trigger = { + is_same_value = event_target:origin_rg_gray_country + has_country_flag = origin_rg_gray + } + + immediate = { + if = { + limit = { + has_event_chain = "l_cluster_chain" + } + end_event_chain = "l_cluster_chain" + } + } +} + # 拆毁工厂小灰通讯 country_event = { id = rg.200