From 50d913b5d0e5d9de408ee6b7f50636351bb73c47 Mon Sep 17 00:00:00 2001 From: "FA507RM-KALOSPA\\Kalo" Date: Thu, 1 Jun 2023 16:48:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scripted_effects/RG_special_effects.txt | 2 +- descriptor.mod | 2 +- events/RG_gray_leader_event.txt | 5 +- events/RG_wsg_graygoo_event.txt | 53 ++++--------------- 4 files changed, 16 insertions(+), 46 deletions(-) diff --git a/common/scripted_effects/RG_special_effects.txt b/common/scripted_effects/RG_special_effects.txt index 1173a3b..78e7049 100644 --- a/common/scripted_effects/RG_special_effects.txt +++ b/common/scripted_effects/RG_special_effects.txt @@ -26,7 +26,7 @@ rg_storyline_trigger = { } if = { - limit= { + limit = { exists = event_target:guardian_dragon_country } country_event = { id = rg_story.11 days = 3600 random = 12800 } diff --git a/descriptor.mod b/descriptor.mod index b5d0e6a..128f984 100644 --- a/descriptor.mod +++ b/descriptor.mod @@ -8,5 +8,5 @@ tags={ } name="Real Gray" picture="thumbnail.png" -supported_version="3.8.2" +supported_version="3.8.*" remote_file_id="2136166095" \ No newline at end of file diff --git a/events/RG_gray_leader_event.txt b/events/RG_gray_leader_event.txt index 24652e5..6b19990 100644 --- a/events/RG_gray_leader_event.txt +++ b/events/RG_gray_leader_event.txt @@ -1316,6 +1316,7 @@ country_event = { rg_create_gray_warship_1 = yes } } + option = { # 购买工程船 name = rg.4.b is_dialog_only = yes @@ -1413,10 +1414,10 @@ country_event = { set_timed_country_flag = { flag = gray_alreadybegged days = 3600 } tooltip = { add_resource = { - energy = 200 + energy = 400 alloys = 200 consumer_goods = 200 - mult = value:years_passed + mult = owner.rg_gray_level } } } diff --git a/events/RG_wsg_graygoo_event.txt b/events/RG_wsg_graygoo_event.txt index 7234845..cbe53ed 100644 --- a/events/RG_wsg_graygoo_event.txt +++ b/events/RG_wsg_graygoo_event.txt @@ -675,15 +675,6 @@ country_event = { } - option = { # help - name = rg_help - hidden_effect = { - country_event = { - id = rg_graygoo.4 - } - } - } - option = { name = marry_gray trigger = { @@ -998,14 +989,6 @@ country_event = { } - option = { # help - name = rg_help - hidden_effect = { - country_event = { - id = rg_graygoo.4 - } - } - } option = { name = marry_gray trigger = { @@ -1108,6 +1091,7 @@ country_event = { alloys = -50000 } remove_country_flag = gray_reforming + remove_modifier = "gray_scattered" } } @@ -1235,14 +1219,6 @@ country_event = { rg_create_gray_army = yes } } - option = { # help - name = rg_help - hidden_effect = { - country_event = { - id = rg_graygoo.4 - } - } - } option = { name = marry_gray @@ -1317,26 +1293,18 @@ country_event = { } allow = { - OR = { - AND = { - NOT = { has_country_flag = gray_begging } - resource_stockpile_compare = { resource = energy value >= 40000 } - resource_stockpile_compare = { resource = alloys value >= 40000 } - } - AND = { - has_country_flag = gray_begging - } + NOR = { + has_country_flag = rg_gray_level_1 } + resource_stockpile_compare = { resource = energy value >= 40000 } + resource_stockpile_compare = { resource = alloys value >= 40000 } } if = { limit = { has_country_flag = gray_begging } - add_resource = { - energy = 0 - alloys = 0 - } + remove_country_flag = gray_begging } else = { add_resource = { @@ -1347,9 +1315,9 @@ country_event = { hidden_effect = { rg_create_gray_warship_1 = yes - remove_country_flag = gray_begging } } + option = { # 购买工程船 name = rg_graygoo.4.b trigger = { @@ -1433,9 +1401,10 @@ country_event = { set_timed_country_flag = { flag = gray_alreadybegged days = 3600 } tooltip = { add_resource = { - energy = 20000 - alloys = 20000 - consumer_goods = 20000 + energy = 400 + alloys = 200 + consumer_goods = 200 + mult = owner.rg_gray_level } } }