From 90ea3f08f802ffcfeaa4f2ddb26021a7377abca9 Mon Sep 17 00:00:00 2001 From: "FA507RM-KALOSPA\\Kalo" Date: Mon, 29 May 2023 21:45:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=85=A8=E6=90=9E=E4=B8=8D=E6=87=82?= =?UTF-8?q?=E6=80=8E=E4=B9=88=E8=BF=90=E4=BD=9C=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scripted_effects/RG_scripted_effects.txt | 2 +- .../scripted_effects/RG_special_effects.txt | 18 ++++++++++-- events/!_RG_gray_goo_events.txt | 5 +--- events/RG_events.txt | 5 ++-- events/RG_gray_leader_event.txt | 28 +++++++++++++++++++ 5 files changed, 48 insertions(+), 10 deletions(-) diff --git a/common/scripted_effects/RG_scripted_effects.txt b/common/scripted_effects/RG_scripted_effects.txt index 46a9cd7..de5c915 100644 --- a/common/scripted_effects/RG_scripted_effects.txt +++ b/common/scripted_effects/RG_scripted_effects.txt @@ -2003,7 +2003,7 @@ rg_gray_country_after_init = { } rg_storyline_trigger = yes event_target:rg_gray_country = { - establish_communications_no_message = root + establish_communications_no_message = event_target:gray_owner } } diff --git a/common/scripted_effects/RG_special_effects.txt b/common/scripted_effects/RG_special_effects.txt index 8442627..1173a3b 100644 --- a/common/scripted_effects/RG_special_effects.txt +++ b/common/scripted_effects/RG_special_effects.txt @@ -16,10 +16,22 @@ rg_storyline_trigger = { # country_event = { id = rg_story.8 days = 3600 random = 12800 } # country_event = { id = rg_story.13 days = 3600 random = 12800 } # } + random_list = { + 50 = { + country_event = { id = rg_story.2 days = 3600 random = 12800 } + } + 50 = { + country_event = { id = rg_story.8 days = 3600 random = 12800 } + } + } - country_event = { id = rg_story.2 days = 3600 random = 12800 } - country_event = { id = rg_story.8 days = 3600 random = 12800 } - country_event = { id = rg_story.11 days = 3600 random = 12800 } + if = { + limit= { + exists = event_target:guardian_dragon_country + } + country_event = { id = rg_story.11 days = 3600 random = 12800 } + } + } rg_create_gray_planetkiller_testship_1 = { diff --git a/events/!_RG_gray_goo_events.txt b/events/!_RG_gray_goo_events.txt index 8b4c3dc..ce52388 100644 --- a/events/!_RG_gray_goo_events.txt +++ b/events/!_RG_gray_goo_events.txt @@ -308,11 +308,8 @@ country_event = { immediate = { rg_gray_country_after_init = yes - event_target:rg_gray_country = { - establish_communications_no_message = root - } event_target:gray_governor = { - set_owner = root + set_owner = event_target:gray_owner } } } diff --git a/events/RG_events.txt b/events/RG_events.txt index fe59575..2492875 100644 --- a/events/RG_events.txt +++ b/events/RG_events.txt @@ -40,8 +40,9 @@ country_event = { immediate = { hidden_effect = { rg_create_gray_species = yes + rg_gray_country_init = yes + rg_gray_country_after_init = rg_gray_country_after_init rg_gray_govener_init = yes - country_event = { id = graygoo.499 } create_message = { type = MESSAGE_RECRUITED_LEADER localization = "rg.2.desc" @@ -191,7 +192,7 @@ country_event = { trigger = has_country_flag RG_realgray = { custom_tooltip = "RG_realgray" - country_event = { id = graygoo.499 days = 30 } + country_event = { id = rg.2 days = 30 } give_technology = { tech = tech_minilaser_gray_1 message = no diff --git a/events/RG_gray_leader_event.txt b/events/RG_gray_leader_event.txt index 5f9cf08..e4b55c0 100644 --- a/events/RG_gray_leader_event.txt +++ b/events/RG_gray_leader_event.txt @@ -196,6 +196,7 @@ country_event = { option = { # Governor name = graygoo.500.a response_text = graygoo.500.a.response + is_dialog_only = yes trigger = { NOT = { has_country_flag = gray_governor_active } } @@ -206,6 +207,7 @@ country_event = { option = { # Warship name = graygoo.500.b response_text = graygoo.500.b.response + is_dialog_only = yes trigger = { NOT = { has_country_flag = gray_warship_active } } @@ -216,6 +218,7 @@ country_event = { option = { # Army name = graygoo.500.c response_text = graygoo.500.c.response + is_dialog_only = yes trigger = { NOT = { has_country_flag = gray_army_active } } @@ -226,6 +229,7 @@ country_event = { option = { # const name = rg_const response_text = rg_const.500.response + is_dialog_only = yes trigger = { NOT = { has_country_flag = gray_const_active } } @@ -329,6 +333,7 @@ country_event = { option = { # Warship name = graygoo.500.b response_text = graygoo.501.b.response + is_dialog_only = yes allow = { hidden_trigger = { exists = event_target:gray_governor } # To prevent exploit } @@ -339,6 +344,7 @@ country_event = { option = { # const name = rg_const response_text = rg_const.501.response + is_dialog_only = yes allow = { hidden_trigger = { exists = event_target:gray_governor } } @@ -349,6 +355,7 @@ country_event = { option = { # Army name = graygoo.500.c response_text = graygoo.501.c.response + is_dialog_only = yes allow = { hidden_trigger = { exists = event_target:gray_governor } } @@ -436,6 +443,7 @@ country_event = { option = { # Governor name = graygoo.500.a response_text = graygoo.502.a.response + is_dialog_only = yes allow = { hidden_trigger = { # To prevent exploit event_target:gray_warship = { num_ships > 0 } @@ -456,6 +464,7 @@ country_event = { option = { # const name = rg_const response_text = rg_const.502.response + is_dialog_only = yes allow = { hidden_trigger = { event_target:gray_warship = { num_ships > 0 } @@ -476,6 +485,7 @@ country_event = { option = { # Army name = graygoo.500.c response_text = graygoo.502.c.response + is_dialog_only = yes allow = { hidden_trigger = { event_target:gray_warship = { num_ships > 0 } @@ -497,6 +507,7 @@ country_event = { option = { # Juggernaut name = RG_graygoo.500.d response_text = RG_graygoo.502.d.response + is_dialog_only = yes trigger = { has_country_flag = rg_juggernaut_fired NOT = { has_country_flag = gray_warship_is_juggernaut } @@ -523,6 +534,7 @@ country_event = { option = { # Warship name = RG_graygoo.500.e response_text = RG_graygoo.502.e.response + is_dialog_only = yes trigger = { has_country_flag = rg_juggernaut_fired has_country_flag = gray_warship_is_juggernaut @@ -548,6 +560,7 @@ country_event = { option = { #升级-2 name = rg_levelup_2 + is_dialog_only = yes trigger = { event_target:gray_leader_admiral = { has_skill >= 10 } NOR = { @@ -590,6 +603,7 @@ country_event = { option = { #升级-3 name = rg_levelup_3 + is_dialog_only = yes trigger = { AND = { event_target:gray_leader_admiral = { has_skill >= 10 } @@ -634,6 +648,7 @@ country_event = { option = { # 购买主宰 name = rg.4.d + is_dialog_only = yes trigger = { NOR = { has_country_flag = gray_reforming @@ -661,6 +676,7 @@ country_event = { option = { # 开启隐形 name = rg.4.e + is_dialog_only = yes trigger = { any_owned_fleet = { AND = { @@ -685,6 +701,7 @@ country_event = { option = { # 关闭隐形 name = rg.4.f + is_dialog_only = yes trigger = { any_owned_fleet = { AND = { @@ -794,6 +811,7 @@ country_event = { option = { # Governor name = graygoo.500.a response_text = graygoo.503.a.response + is_dialog_only = yes allow = { hidden_trigger = { # To prevent exploit any_owned_army = { @@ -849,6 +867,7 @@ country_event = { option = { # Warship name = graygoo.500.b response_text = graygoo.503.b.response + is_dialog_only = yes allow = { hidden_trigger = { any_owned_army = { @@ -904,6 +923,7 @@ country_event = { option = { # const name = rg_const response_text = rg_const.503.response + is_dialog_only = yes allow = { hidden_trigger = { any_owned_army = { @@ -959,6 +979,7 @@ country_event = { option = { # 开启隐形 name = rg.4.e + is_dialog_only = yes trigger = { any_owned_fleet = { AND = { @@ -983,6 +1004,7 @@ country_event = { option = { # 关闭隐形 name = rg.4.f + is_dialog_only = yes trigger = { any_owned_fleet = { AND = { @@ -1084,6 +1106,7 @@ country_event = { option = { # Governor name = graygoo.500.a response_text = graygoo.505.a.response + is_dialog_only = yes allow = { hidden_trigger = { # To prevent exploit event_target:global_gray_constship = { num_ships > 0 } @@ -1108,6 +1131,7 @@ country_event = { option = { # Warship name = graygoo.500.b response_text = graygoo.505.b.response + is_dialog_only = yes allow = { hidden_trigger = { # To prevent exploit event_target:global_gray_constship = { num_ships > 0 } @@ -1128,6 +1152,7 @@ country_event = { option = { # Army name = graygoo.500.c response_text = graygoo.505.c.response + is_dialog_only = yes allow = { hidden_trigger = { # To prevent exploit event_target:global_gray_constship = { num_ships > 0 } @@ -1230,6 +1255,7 @@ country_event = { option = { # 购买灰风母舰 name = rg.4.a + is_dialog_only = yes trigger = { NOT = { has_country_flag = gray_reforming } } @@ -1261,6 +1287,7 @@ country_event = { } option = { # 购买工程船 name = rg.4.b + is_dialog_only = yes trigger = { NOT = { has_country_flag = gray_reforming } } @@ -1350,6 +1377,7 @@ country_event = { option = { # 没钱了，救救 name = rg.5.a + is_dialog_only = yes hidden_effect = { set_country_flag = gray_begging set_timed_country_flag = { flag = gray_alreadybegged days = 3600 }