From b56cf3938254939706803d4aaafc6bd68b0de408 Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Sun, 22 Sep 2024 20:17:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E4=BF=AE=E5=8F=B2=E5=B1=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/buildings/RG_nano_buildings.txt | 8 + common/component_tags/RG_weapon_tags.txt | 3 +- .../RG_combat_computers.txt | 2 - common/component_templates/RG_ship_parts.txt | 35 +-- .../game_concepts/RG_tradition_concepts.txt | 8 + common/megastructures/RG_oribital_ring.txt | 2 +- common/relics/RG_relics.txt | 3 +- common/script_values/rg_script_values.txt | 28 +-- .../scripted_effects/RG_gray_goo_effects.txt | 16 +- .../scripted_effects/RG_scripted_effects.txt | 4 +- .../scripted_effects/RG_special_effects.txt | 2 +- common/scripted_effects/RG_storms_effects.txt | 4 +- common/ship_sizes/RG_ship_sizes.txt | 1 - .../!_RG_projects_distant_stars.txt | 8 + .../RG_story_special_projects.txt | 6 + events/RG_cluster_events.txt | 51 ++-- events/RG_gray_leader_event.txt | 165 +++++-------- events/RG_planet_event.txt | 30 +-- events/RG_wsg_graygoo_event.txt | 224 +++++------------- localisation/english/RG_weapon_l_english.yml | 2 +- .../simp_chinese/RG_l_simp_chinese.yml | 2 +- 21 files changed, 233 insertions(+), 371 deletions(-) diff --git a/common/buildings/RG_nano_buildings.txt b/common/buildings/RG_nano_buildings.txt index 1400e6d..b55b4b9 100644 --- a/common/buildings/RG_nano_buildings.txt +++ b/common/buildings/RG_nano_buildings.txt @@ -88,6 +88,8 @@ building_rg_nanolab_1 = { upgrades = { "building_rg_nanolab_2" } + + custom_storm_ai_weight = { } } building_rg_nanolab_2 = { @@ -174,6 +176,8 @@ building_rg_nanolab_2 = { } text = job_nanotech_researcher_effect_desc } + + custom_storm_ai_weight = { } } building_rg_nanotech_cauldron = { @@ -225,6 +229,8 @@ building_rg_nanotech_cauldron = { nanites = 25 } } + + custom_storm_ai_weight = { } } building_rg_nanite_transmuter = { @@ -279,4 +285,6 @@ building_rg_nanite_transmuter = { always = yes } } + + custom_storm_ai_weight = { } } diff --git a/common/component_tags/RG_weapon_tags.txt b/common/component_tags/RG_weapon_tags.txt index 239601c..d3f1ddf 100644 --- a/common/component_tags/RG_weapon_tags.txt +++ b/common/component_tags/RG_weapon_tags.txt @@ -9,4 +9,5 @@ weapon_type_rg_computer weapon_type_rg_secondary weapon_type_rg_torpedoe weapon_type_rg_main -weapon_type_rg_armor \ No newline at end of file +weapon_type_rg_armor +weapon_type_rg_reactor \ No newline at end of file diff --git a/common/component_templates/RG_combat_computers.txt b/common/component_templates/RG_combat_computers.txt index b1021a4..a3fa9ed 100644 --- a/common/component_templates/RG_combat_computers.txt +++ b/common/component_templates/RG_combat_computers.txt @@ -73,8 +73,6 @@ utility_component_template = { ai_tags = { screen } ai_tag_weight = 0 upgrades_to = "RG_COMBAT_COMPUTER_PICKET_BASIC" - ai_tags = { screen } - ai_tag_weight = 0 ai_weight = { weight = 1 diff --git a/common/component_templates/RG_ship_parts.txt b/common/component_templates/RG_ship_parts.txt index aa55fa9..22e8bf7 100644 --- a/common/component_templates/RG_ship_parts.txt +++ b/common/component_templates/RG_ship_parts.txt @@ -7,7 +7,6 @@ utility_component_template = { component_set = "LARGE_GRAY_MIX_ARMOR" icon = "GFX_ship_part_gray_armor" icon_frame = 1 - power = 0 power = -180 modifier = { ship_armor_add = 3840 @@ -58,7 +57,6 @@ utility_component_template = { component_set = "HUGE_GRAY_MIX_ARMOR" icon = "GFX_ship_part_gray_armor" icon_frame = 1 - power = 0 power = -180 modifier = { ship_armor_add = 7680 @@ -119,6 +117,7 @@ weapon_component_template = { } tags = { weapon_type_rg_secondary + weapon_type_energy } armor_damage = 1.2 shield_penetration = 1 @@ -134,9 +133,6 @@ weapon_component_template = { } } projectile_gfx = "gatebuilder_lance_weapon" - tags = { - weapon_type_energy - } ai_weight = { weight = 0 } @@ -169,6 +165,7 @@ weapon_component_template = { } tags = { weapon_type_rg_secondary + weapon_type_energy } armor_damage = 1.2 shield_penetration = 1 @@ -183,9 +180,6 @@ weapon_component_template = { } } projectile_gfx = "gatebuilder_lance_weapon" - tags = { - weapon_type_energy - } ai_weight = { weight = 0 } @@ -218,6 +212,7 @@ weapon_component_template = { } tags = { weapon_type_rg_secondary + weapon_type_energy } armor_damage = 1.2 shield_penetration = 1 @@ -232,9 +227,6 @@ weapon_component_template = { } } projectile_gfx = "gatebuilder_lance_weapon" - tags = { - weapon_type_energy - } ai_weight = { weight = 0 } @@ -272,6 +264,7 @@ weapon_component_template = { upgrades_to = "GRAY_BEAM_STATIC_X" tags = { weapon_type_rg_main + weapon_type_energy } resources = { category = ship_components @@ -283,9 +276,6 @@ weapon_component_template = { alloys = 4 } } - tags = { - weapon_type_energy - } projectile_gfx = "gatebuilder_lance_weapon" ai_weight = { weight = 0 @@ -323,6 +313,7 @@ weapon_component_template = { } tags = { weapon_type_rg_main + weapon_type_energy } resources = { category = ship_components @@ -335,9 +326,6 @@ weapon_component_template = { alloys = 4 } } - tags = { - weapon_type_energy - } projectile_gfx = "gatebuilder_lance_weapon" ai_weight = { weight = 0 @@ -492,6 +480,7 @@ weapon_component_template = { } tags = { weapon_type_rg_main + weapon_type_energy } resources = { category = ship_components @@ -504,9 +493,6 @@ weapon_component_template = { alloys = 2 } } - tags = { - weapon_type_energy - } projectile_gfx = "gatebuilder_titan_weapon_ex" ai_weight = { weight = 0 @@ -658,6 +644,7 @@ weapon_component_template = { } tags = { weapon_type_rg_secondary + weapon_type_kinetic } armor_damage = 1.2 shield_penetration = 1 @@ -672,9 +659,6 @@ weapon_component_template = { } } projectile_gfx = "adv_kinetic_artillery" - tags = { - weapon_type_kinetic - } ai_weight = { weight = 0 } @@ -714,6 +698,7 @@ weapon_component_template = { } tags = { weapon_type_rg_secondary + weapon_type_kinetic } armor_damage = 1.2 shield_penetration = 1 @@ -728,9 +713,6 @@ weapon_component_template = { } } projectile_gfx = "adv_kinetic_artillery" - tags = { - weapon_type_kinetic - } ai_weight = { weight = 0 } @@ -1765,7 +1747,6 @@ weapon_component_template = { icon = "GFX_ship_part_space_whale_weapon_1" icon_frame = 1 use_ship_kill_target = no - firing_arc = 15 min_range = 30 firing_arc = 25 damage = { diff --git a/common/game_concepts/RG_tradition_concepts.txt b/common/game_concepts/RG_tradition_concepts.txt index 8109501..6572eb9 100644 --- a/common/game_concepts/RG_tradition_concepts.txt +++ b/common/game_concepts/RG_tradition_concepts.txt @@ -1,4 +1,12 @@ concept_tradition_rg_nanotech = { icon = "gfx/interface/icons/traditions/tree_icons/tradition_icon_nanotech.dds" tooltip_override = "tradition_category:tradition_rg_nanotech" +} + +concept_rg_gray = { + alias = { } +} + +concept_rg_scion = { + alias = { } } \ No newline at end of file diff --git a/common/megastructures/RG_oribital_ring.txt b/common/megastructures/RG_oribital_ring.txt index 05711f3..4a5b422 100644 --- a/common/megastructures/RG_oribital_ring.txt +++ b/common/megastructures/RG_oribital_ring.txt @@ -271,7 +271,7 @@ orbital_ring_restored = { } From = { create_ship_design = { - design = "RG_ORBITAL_RING_TIER_1_STARBASE_SECTION" + design = "RG_ORBITAL_RING_TIER_1_STARBASE" } add_ship_design = last_created_design } diff --git a/common/relics/RG_relics.txt b/common/relics/RG_relics.txt index 714fd79..5f2061d 100644 --- a/common/relics/RG_relics.txt +++ b/common/relics/RG_relics.txt @@ -7,7 +7,7 @@ rg_tempest_invocator = { category = relics # Activation cost cost = { - nanties = 5000 + nanites = 5000 } } @@ -25,7 +25,6 @@ rg_tempest_invocator = { set_country_flag = "started_placing_storm" start_storm_area_placing = { - sacrifice_leader_with_ui = no cosmic_storm = graytempest_storm immediate = yes diff --git a/common/script_values/rg_script_values.txt b/common/script_values/rg_script_values.txt index 554f792..047c876 100644 --- a/common/script_values/rg_script_values.txt +++ b/common/script_values/rg_script_values.txt @@ -1,17 +1,17 @@ -rg_count_maid = { - base = 0 - complex_trigger_modifier = { - trigger = num_traits - trigger_scope = pop - parameters = { - limit = { - has_trait = rg_machine_maid_trait - } - } - mode = add - } - # max = 20 -} +# rg_count_maid = { +# base = 0 +# complex_trigger_modifier = { +# trigger = num_traits +# trigger_scope = pop +# parameters = { +# limit = { +# has_trait = rg_machine_maid_trait +# } +# } +# mode = add +# } +# # max = 20 +# } rg_maid_trait_mult = { base = 3 diff --git a/common/scripted_effects/RG_gray_goo_effects.txt b/common/scripted_effects/RG_gray_goo_effects.txt index 8c253e9..f4ab808 100644 --- a/common/scripted_effects/RG_gray_goo_effects.txt +++ b/common/scripted_effects/RG_gray_goo_effects.txt @@ -73,25 +73,25 @@ rg_global_gray_location_check = { if = { limit = { any_owned_planet = { - exists = sector.leader - sector.leader = { - has_leader_flag = gray_governor + exists = leader + leader = { + is_same_value = event_target:gray_official } } } random_owned_planet = { limit = { - exists = sector.leader - sector.leader = { - has_leader_flag = gray_governor + exists = leader + leader = { + is_same_value = event_target:gray_official } } - save_global_event_target_as = global_gray_location + save_event_target_as = global_gray_location } } else = { capital_scope = { - save_global_event_target_as = global_gray_location + save_event_target_as = global_gray_location } } } diff --git a/common/scripted_effects/RG_scripted_effects.txt b/common/scripted_effects/RG_scripted_effects.txt index 95c99c0..8449d27 100644 --- a/common/scripted_effects/RG_scripted_effects.txt +++ b/common/scripted_effects/RG_scripted_effects.txt @@ -1359,7 +1359,9 @@ RG_const_auto_build_effect = { prefix = no design = "NAME_RG_GRAY_constructor" effect = { - set_cloaking_active = yes + PREV = { + set_cloaking_active = yes + } } } } diff --git a/common/scripted_effects/RG_special_effects.txt b/common/scripted_effects/RG_special_effects.txt index 50564d1..3be8c53 100644 --- a/common/scripted_effects/RG_special_effects.txt +++ b/common/scripted_effects/RG_special_effects.txt @@ -328,7 +328,7 @@ rg_create_gray_destroyer_1 = { set_owner = root create_ship = { name = "NAME_RG_base_destroyer" - design = "RG_base_destroyer_key" + design = "NAME_RG_base_destroyer" prefix = no upgradable = no } diff --git a/common/scripted_effects/RG_storms_effects.txt b/common/scripted_effects/RG_storms_effects.txt index 65eb8a0..fa4c507 100644 --- a/common/scripted_effects/RG_storms_effects.txt +++ b/common/scripted_effects/RG_storms_effects.txt @@ -8,7 +8,7 @@ graytempest_storm_add = { inline_script = { script = cosmic_storms/StormVisuals - STORM_NAME = "graytempest_storm" + STORM_NAME = "particle_storm" } } @@ -94,7 +94,7 @@ graytempest_storm_apply_aftermath_modifier = { } } -graytempests_storm_apply_deposits = { +graytempest_storm_apply_deposits = { every_system_planet = { limit = { OR = { diff --git a/common/ship_sizes/RG_ship_sizes.txt b/common/ship_sizes/RG_ship_sizes.txt index 84595af..76f2f18 100644 --- a/common/ship_sizes/RG_ship_sizes.txt +++ b/common/ship_sizes/RG_ship_sizes.txt @@ -337,7 +337,6 @@ RG_armed_constructor_ship = { } use_shipnames_from = constructor - icon = ship_size_constructor base_buildtime = @construction_build_time num_target_locators = 2 is_space_station = no diff --git a/common/special_projects/!_RG_projects_distant_stars.txt b/common/special_projects/!_RG_projects_distant_stars.txt index 69f1b93..e81c531 100644 --- a/common/special_projects/!_RG_projects_distant_stars.txt +++ b/common/special_projects/!_RG_projects_distant_stars.txt @@ -19,6 +19,8 @@ special_project = { rg_event_effect_lcluster_open = yes } } + fail_trigger = { + } on_fail = { } on_start = { @@ -49,6 +51,8 @@ special_project = { leader = commander has_trait = RG_leader_trait_admiral_gray } + fail_trigger = { + } on_start = { owner = { country_event = { @@ -88,6 +92,8 @@ special_project = { leader = commander has_trait = RG_leader_trait_admiral_gray } + fail_trigger = { + } on_start = { owner = { country_event = { @@ -125,6 +131,8 @@ special_project = { leader = commander has_trait = RG_leader_trait_admiral_gray } + fail_trigger = { + } on_start = { owner = { country_event = { diff --git a/common/special_projects/RG_story_special_projects.txt b/common/special_projects/RG_story_special_projects.txt index 851ba86..af17466 100644 --- a/common/special_projects/RG_story_special_projects.txt +++ b/common/special_projects/RG_story_special_projects.txt @@ -10,6 +10,8 @@ special_project = { shipclass_science_ship = 1 leader = scientist } + fail_trigger = { + } on_start = { owner = { country_event = { @@ -46,6 +48,8 @@ special_project = { event_scope = country_event requirements = { } + fail_trigger = { + } on_start = { owner = { random_situation = { @@ -86,6 +90,8 @@ special_project = { event_scope = country_event requirements = { } + fail_trigger = { + } on_start = { owner = { random_situation = { diff --git a/events/RG_cluster_events.txt b/events/RG_cluster_events.txt index c320796..4b8f619 100644 --- a/events/RG_cluster_events.txt +++ b/events/RG_cluster_events.txt @@ -130,25 +130,34 @@ country_event = { orbit_distance = 30 } } - if = { - limit = { - exists = sector - } - sector = { - leader = { - unassign_leader = this - save_event_target_as = rg_cluster_sector_gov - } - } - } - else = { - root = { - random_owned_leader = { - limit = { - leader_class = official - } - save_event_target_as = rg_cluster_sector_gov + # if = { + # limit = { + # exists = sector + # } + # sector = { + # leader = { + # unassign_leader = this + # save_event_target_as = rg_cluster_sector_gov + # } + # } + # } + # else = { + # root = { + # random_owned_leader = { + # limit = { + # leader_class = official + # } + # save_event_target_as = rg_cluster_sector_gov + # } + # } + # } + + root = { + random_owned_leader = { + limit = { + leader_class = official } + save_event_target_as = rg_cluster_sector_gov } } } @@ -191,9 +200,9 @@ country_event = { set_controller = root set_capital = yes set_sector_capital = yes - sector = { - assign_leader = event_target:rg_cluster_sector_gov - } + # sector = { + # assign_leader = event_target:rg_cluster_sector_gov + # } set_name = random generate_start_buildings_and_districts = yes } diff --git a/events/RG_gray_leader_event.txt b/events/RG_gray_leader_event.txt index c701e3b..7c4e77c 100644 --- a/events/RG_gray_leader_event.txt +++ b/events/RG_gray_leader_event.txt @@ -988,44 +988,27 @@ country_event = { } custom_tooltip = { fail_text = graygoo.500.allow.a - any_owned_army = { - army_type = gray_army - if = { - limit = { - exists = planet - } - planet = { - has_ground_combat = no - } - } - } - } - } - allow = { - hidden_trigger = { - any_owned_army = { - army_type = gray_army - OR = { - exists = planet - AND = { - exists = fleet - fleet = { - num_ships > 0 + OR = { + any_owned_army = { + army_type = gray_army + if = { + limit = { + exists = planet + } + planet = { + has_ground_combat = no } } } - } - } - custom_tooltip = { - fail_text = graygoo.500.allow.a - any_owned_army = { - army_type = gray_army - if = { - limit = { - exists = fleet - } - fleet = { - is_in_combat = no + any_owned_army = { + army_type = gray_army + if = { + limit = { + exists = fleet + } + fleet = { + is_in_combat = no + } } } } @@ -1044,6 +1027,7 @@ country_event = { response_text = graygoo.503.b.response allow = { hidden_trigger = { + # To prevent exploit any_owned_army = { army_type = gray_army OR = { @@ -1059,44 +1043,27 @@ country_event = { } custom_tooltip = { fail_text = graygoo.500.allow.a - any_owned_army = { - army_type = gray_army - if = { - limit = { - exists = planet - } - planet = { - has_ground_combat = no - } - } - } - } - } - allow = { - hidden_trigger = { - any_owned_army = { - army_type = gray_army - OR = { - exists = planet - AND = { - exists = fleet - fleet = { - num_ships > 0 + OR = { + any_owned_army = { + army_type = gray_army + if = { + limit = { + exists = planet + } + planet = { + has_ground_combat = no } } } - } - } - custom_tooltip = { - fail_text = graygoo.500.allow.a - any_owned_army = { - army_type = gray_army - if = { - limit = { - exists = fleet - } - fleet = { - is_in_combat = no + any_owned_army = { + army_type = gray_army + if = { + limit = { + exists = fleet + } + fleet = { + is_in_combat = no + } } } } @@ -1115,6 +1082,7 @@ country_event = { response_text = rg_const.503.response allow = { hidden_trigger = { + # To prevent exploit any_owned_army = { army_type = gray_army OR = { @@ -1130,44 +1098,27 @@ country_event = { } custom_tooltip = { fail_text = graygoo.500.allow.a - any_owned_army = { - army_type = gray_army - if = { - limit = { - exists = planet - } - planet = { - has_ground_combat = no - } - } - } - } - } - allow = { - hidden_trigger = { - any_owned_army = { - army_type = gray_army - OR = { - exists = planet - AND = { - exists = fleet - fleet = { - num_ships > 0 + OR = { + any_owned_army = { + army_type = gray_army + if = { + limit = { + exists = planet + } + planet = { + has_ground_combat = no } } } - } - } - custom_tooltip = { - fail_text = graygoo.500.allow.a - any_owned_army = { - army_type = gray_army - if = { - limit = { - exists = fleet - } - fleet = { - is_in_combat = no + any_owned_army = { + army_type = gray_army + if = { + limit = { + exists = fleet + } + fleet = { + is_in_combat = no + } } } } @@ -1952,8 +1903,8 @@ country_event = { NOT = { has_global_flag = rg_ge_gray_portrait_manual_toggle } - set_global_flag = rg_ge_gray_portrait_manual_toggle } + set_global_flag = rg_ge_gray_portrait_manual_toggle } rg_ge_clear_portrait_select = yes event_target:gray_owner = { @@ -1970,8 +1921,8 @@ country_event = { NOT = { has_global_flag = rg_ge_gray_portrait_manual_toggle } - set_global_flag = rg_ge_gray_portrait_manual_toggle } + set_global_flag = rg_ge_gray_portrait_manual_toggle } rg_ge_clear_portrait_select = yes event_target:gray_owner = { diff --git a/events/RG_planet_event.txt b/events/RG_planet_event.txt index dbab147..d1c6adf 100644 --- a/events/RG_planet_event.txt +++ b/events/RG_planet_event.txt @@ -54,21 +54,23 @@ country_event = { has_country_flag = rg_habitat_enabled } # exists = event_target:rg_gray_habitat_target - any_owned_planet = { - is_under_colonization = no - OR = { - is_planet_class = pc_rg_grayhabitat - is_planet_class = pc_nanotech - } - free_jobs > 0 - NOR = { - free_jobs_of_type = { - job = mortal_initiate - value >= 1 + PREV = { + any_owned_planet = { + is_under_colonization = no + OR = { + is_planet_class = pc_rg_grayhabitat + is_planet_class = pc_nanotech } - free_jobs_of_type = { - category = bio_trophy - value >= 1 + free_jobs > 0 + NOR = { + free_jobs_of_type = { + job = mortal_initiate + value >= 1 + } + free_jobs_of_type = { + category = bio_trophy + value >= 1 + } } } } diff --git a/events/RG_wsg_graygoo_event.txt b/events/RG_wsg_graygoo_event.txt index 7dbffb9..970dd6d 100644 --- a/events/RG_wsg_graygoo_event.txt +++ b/events/RG_wsg_graygoo_event.txt @@ -191,68 +191,7 @@ country_event = { } } } - option = { - name = marry_gray - trigger = { - check_variable = { - which = wg_gray_affection - value > @wg_gray_affection_to_lv4 - } - NOT = { - has_country_flag = married_gray - } - } - allow = { - OR = { - AND = { - has_wg_special_authority = no - resource_stockpile_compare = { - resource = sr_living_metal - value >= 100 - } - resource_stockpile_compare = { - resource = rare_crystals - value >= 1000 - } - } - custom_tooltip = { - check_variable = { - which = wsg_rings - value >= 1 - } - fail_text = not_enough_engagement_rings - } - } - custom_tooltip = { - fail_text = gray_become_ruler - NOT = { - ruler = { - has_leader_flag = "gray_leader" - } - } - } - } - if = { - limit = { - has_wg_special_authority = yes - } - subtract_variable = { - which = wsg_rings - value = 1 - } - } - else = { - add_resource = { - sr_living_metal = -100 - rare_crystals = -1000 - } - } - hidden_effect = { - country_event = { - id = wg_affection.30000 - } - } - } + inline_script = "events/rg_wsg_marry_gray_option_500_scripts" option = { name = graygoo.500.d default_hide_option = yes @@ -892,44 +831,27 @@ country_event = { } custom_tooltip = { fail_text = graygoo.500.allow.a - any_owned_army = { - army_type = gray_army - if = { - limit = { - exists = planet - } - planet = { - has_ground_combat = no - } - } - } - } - } - allow = { - hidden_trigger = { - any_owned_army = { - army_type = gray_army - OR = { - exists = planet - AND = { - exists = fleet - fleet = { - num_ships > 0 + OR = { + any_owned_army = { + army_type = gray_army + if = { + limit = { + exists = planet + } + planet = { + has_ground_combat = no } } } - } - } - custom_tooltip = { - fail_text = graygoo.500.allow.a - any_owned_army = { - army_type = gray_army - if = { - limit = { - exists = fleet - } - fleet = { - is_in_combat = no + any_owned_army = { + army_type = gray_army + if = { + limit = { + exists = fleet + } + fleet = { + is_in_combat = no + } } } } @@ -945,6 +867,7 @@ country_event = { response_text = graygoo.503.b.response allow = { hidden_trigger = { + # To prevent exploit any_owned_army = { army_type = gray_army OR = { @@ -960,44 +883,27 @@ country_event = { } custom_tooltip = { fail_text = graygoo.500.allow.a - any_owned_army = { - army_type = gray_army - if = { - limit = { - exists = planet - } - planet = { - has_ground_combat = no - } - } - } - } - } - allow = { - hidden_trigger = { - any_owned_army = { - army_type = gray_army - OR = { - exists = planet - AND = { - exists = fleet - fleet = { - num_ships > 0 + OR = { + any_owned_army = { + army_type = gray_army + if = { + limit = { + exists = planet + } + planet = { + has_ground_combat = no } } } - } - } - custom_tooltip = { - fail_text = graygoo.500.allow.a - any_owned_army = { - army_type = gray_army - if = { - limit = { - exists = fleet - } - fleet = { - is_in_combat = no + any_owned_army = { + army_type = gray_army + if = { + limit = { + exists = fleet + } + fleet = { + is_in_combat = no + } } } } @@ -1013,6 +919,7 @@ country_event = { response_text = rg_const.503.response allow = { hidden_trigger = { + # To prevent exploit any_owned_army = { army_type = gray_army OR = { @@ -1028,44 +935,27 @@ country_event = { } custom_tooltip = { fail_text = graygoo.500.allow.a - any_owned_army = { - army_type = gray_army - if = { - limit = { - exists = planet - } - planet = { - has_ground_combat = no - } - } - } - } - } - allow = { - hidden_trigger = { - any_owned_army = { - army_type = gray_army - OR = { - exists = planet - AND = { - exists = fleet - fleet = { - num_ships > 0 + OR = { + any_owned_army = { + army_type = gray_army + if = { + limit = { + exists = planet + } + planet = { + has_ground_combat = no } } } - } - } - custom_tooltip = { - fail_text = graygoo.500.allow.a - any_owned_army = { - army_type = gray_army - if = { - limit = { - exists = fleet - } - fleet = { - is_in_combat = no + any_owned_army = { + army_type = gray_army + if = { + limit = { + exists = fleet + } + fleet = { + is_in_combat = no + } } } } diff --git a/localisation/english/RG_weapon_l_english.yml b/localisation/english/RG_weapon_l_english.yml index 3f8c796..86c1a90 100644 --- a/localisation/english/RG_weapon_l_english.yml +++ b/localisation/english/RG_weapon_l_english.yml @@ -52,7 +52,7 @@ GRAY_BEAM_STATIC_EX:0 "Gray Energy Arc" GRAY_BEAM_STATIC_EX_DESC:0 "" RG_GRAY_WEAPON_LANCE_X:0 "Gray Energy Lance" - RG_GRAY_WEAPON_LANCE_X_DESC:0 Gray Energy Lance + RG_GRAY_WEAPON_LANCE_X_DESC:0 "Gray Energy Lance" RG_GRAY_WEAPON_LANCE:0 "Gray Energy Lance" RG_GRAY_WEAPON_LANCE_DESC:0 "Gray Energy Lance" LARGE_GRAY_MIX_ARMOR:0 "Nanite Armor" diff --git a/localisation/simp_chinese/RG_l_simp_chinese.yml b/localisation/simp_chinese/RG_l_simp_chinese.yml index ed02a11..338c479 100644 --- a/localisation/simp_chinese/RG_l_simp_chinese.yml +++ b/localisation/simp_chinese/RG_l_simp_chinese.yml @@ -159,7 +159,7 @@ rg_nanite_leader:0"§Y纳米机器个体§!" rg_nanite_leader_plural:0"§Y纳米机器个体§!" rg_nanite_leader_description:0"§Y本质上是由千千万万纳米机械所组成的个体。因为能做到，所以将无所不能。§!" - rg_nanite_leader_plural_with_icon:0"£offical£ $rg_nanite_leader_plural$" + rg_nanite_leader_plural_with_icon:0"£official£ $rg_nanite_leader_plural$" concept_rg_scion: "$preset_rg_scion$" concept_rg_scion_desc: "$preset_rg_scion_desc$"