From f320c739a85ffee7c3b71ce38be633c7898d5a41 Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Sun, 7 Apr 2024 19:28:01 +0800 Subject: [PATCH] revert 3.11 --- common/component_templates/RG_ship_parts.txt | 1 + common/on_actions/RG_on_actions.txt | 1 - .../RG_gray_leader_init_effects.txt | 2 +- .../scripted_effects/RG_scripted_effects.txt | 5 -- common/ship_sizes/RG_ship_sizes.txt | 51 +------------------ common/species_classes/rg_species_classes.txt | 30 ----------- descriptor.mod | 2 +- events/RG_events.txt | 36 ------------- 8 files changed, 4 insertions(+), 124 deletions(-) delete mode 100644 common/species_classes/rg_species_classes.txt diff --git a/common/component_templates/RG_ship_parts.txt b/common/component_templates/RG_ship_parts.txt index 6af3380..c4cc78f 100644 --- a/common/component_templates/RG_ship_parts.txt +++ b/common/component_templates/RG_ship_parts.txt @@ -450,6 +450,7 @@ weapon_component_template = { prerequisites = { "tech_gray_juggernaut_8" } + hidden = yes ship_limit = 1 ai_weight = { weight = 0 diff --git a/common/on_actions/RG_on_actions.txt b/common/on_actions/RG_on_actions.txt index ca2db7c..4b1adac 100644 --- a/common/on_actions/RG_on_actions.txt +++ b/common/on_actions/RG_on_actions.txt @@ -59,7 +59,6 @@ on_yearly_pulse_country = { rg_event.17 rg_event.18 rg_event.20 - rg_event.24 } } diff --git a/common/scripted_effects/RG_gray_leader_init_effects.txt b/common/scripted_effects/RG_gray_leader_init_effects.txt index 0562659..5ef1aa8 100644 --- a/common/scripted_effects/RG_gray_leader_init_effects.txt +++ b/common/scripted_effects/RG_gray_leader_init_effects.txt @@ -598,7 +598,7 @@ rg_gray_country_leader_init = { create_leader = { # 只用作看板娘 class = official - species = root + species = event_target:gray_species name = "NAME_Gray" gender = female immortal = yes diff --git a/common/scripted_effects/RG_scripted_effects.txt b/common/scripted_effects/RG_scripted_effects.txt index 9d8d8d0..e9f6f8d 100644 --- a/common/scripted_effects/RG_scripted_effects.txt +++ b/common/scripted_effects/RG_scripted_effects.txt @@ -2245,11 +2245,6 @@ rg_gray_country_after_init = { event_target:rg_gray_country = { establish_communications_no_message = event_target:gray_owner } - # 年检立绘并替换回正常立绘 - country_event = { - id = rg_event.24 - } - } rg_timeline_attract_field_init = { diff --git a/common/ship_sizes/RG_ship_sizes.txt b/common/ship_sizes/RG_ship_sizes.txt index 022e170..5549e4a 100644 --- a/common/ship_sizes/RG_ship_sizes.txt +++ b/common/ship_sizes/RG_ship_sizes.txt @@ -123,55 +123,8 @@ RG_graygoo_capitalship = { combat_disengage_chance = 1.25 class = shipclass_military construction_type = starbase_shipyard - # possible_construction = { - # always = no - # } - potential_construction = { - OR = { - is_scope_type = starbase - AND = { - is_scope_type = megastructure - OR = { - is_megastructure_type = mega_shipyard_3 - is_megastructure_type = mega_shipyard_restored - } - } - } - } - possible_construction = { - custom_tooltip = { - fail_text = starbase_citadel_trigger - OR = { - AND = { - is_scope_type = megastructure - OR = { - is_megastructure_type = mega_shipyard_3 - is_megastructure_type = mega_shipyard_restored - } - } - AND = { - is_scope_type = starbase - has_starbase_size >= starbase_citadel - } - } - } - custom_tooltip = { - fail_text = starbase_colossal_yards_trigger - OR = { - AND = { - is_scope_type = megastructure - OR = { - is_megastructure_type = mega_shipyard_3 - is_megastructure_type = mega_shipyard_restored - } - } - AND = { - is_scope_type = starbase - has_starbase_building = colossus_yards - } - } - } + always = no } combat_size_multiplier = 4 prerequisites = { @@ -196,8 +149,6 @@ RG_graygoo_capitalship = { min_upgrade_cost = { alloys = 8 } - - empire_limit = 1 } RG_gray_juggernaut = { diff --git a/common/species_classes/rg_species_classes.txt b/common/species_classes/rg_species_classes.txt deleted file mode 100644 index da49ffd..0000000 --- a/common/species_classes/rg_species_classes.txt +++ /dev/null @@ -1,30 +0,0 @@ - -# The Portraits defined here are generally not available to the character creator, but will instead appear in AI empires across the galaxy. -# 'graphical_culture' is connected to the looks used for ships and cities; see "common/graphical_culture/". -# These may be overwitten in an "extendable" manner, meaning (for example) you can create a second "HUM" with extra portraits in it. - -# playable = yes/no/trigger (default: yes) if this species class can is playable -# randomized = yes/no/trigger (default: yes) if this species class is randomized -# custom_portraits = {} -# randomized = yes/no/trigger (default: yes) to specify if portraits are randomized -# playable = yes/no/trigger (default: yes) to specify if portraits are playable -# portraits = list portrait keys -# species_trait_points base number of species trait points available for this species class -# species_max_traits maximum number of traits that species of this class can have (doesn't count those with cost == 0) -# possible ethics/government requirements; see common/governments/readme_requirements.txt -# gender = yes/no (default: yes) whether the species has a gender -# portrait_modding yes/no (default: yes) whether the portrait can be modified with e.g. genemodding or robomodding -# gray_species = { -# archetype = OTHER -# -# playable = { always = no } -# randomized = no -# -# gender = female -# -# portraits = { -# "Gray" -# } -# -# move_pop_sound_effect = "moving_pop_confirmation" -# } \ No newline at end of file diff --git a/descriptor.mod b/descriptor.mod index 5a6e047..69d67a9 100644 --- a/descriptor.mod +++ b/descriptor.mod @@ -8,5 +8,5 @@ tags={ } name="Real Gray" picture="thumbnail.png" -supported_version="3.11.*" +supported_version="3.10.*" remote_file_id="2136166095" \ No newline at end of file diff --git a/events/RG_events.txt b/events/RG_events.txt index 9cb6e75..8f62c18 100644 --- a/events/RG_events.txt +++ b/events/RG_events.txt @@ -1069,42 +1069,6 @@ country_event = { } } -# looping check for grayport -country_event = { - id = rg_event.24 - hide_window = yes - is_triggered_only = yes - trigger = { - is_same_value = event_target:gray_owner - } - immediate = { - random_owned_leader = { - limit = { - has_leader_flag = gray_governor - } - if = { - limit = { - owner = { - OR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } - } - } - set_gray_portrait = yes - } - else = { - rg_set_gray_portrait = yes - } - } - country_event = { - id = rg_event.24 - years = 1 - } - # *THIS* looping check - } -} - # 拆毁工厂小灰通讯 country_event = { id = rg_event.200