diff --git a/common/defines/rg_defines.txt b/common/defines/rg_defines.txt deleted file mode 100644 index b73d2bf..0000000 --- a/common/defines/rg_defines.txt +++ /dev/null @@ -1,3 +0,0 @@ -# NGameplay = { -# GOVERNMENT_CIVIC_POINTS_BASE = 3 # Base amount of civic points (to "pay" for government civic costs) -# } \ No newline at end of file diff --git a/common/inline_scripts/events/rg_graygoo/rg_graygoo.500.txt b/common/inline_scripts/events/rg_graygoo/rg_graygoo.500.txt index 6c3ea86..7cf04e1 100644 --- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.500.txt +++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.500.txt @@ -4,8 +4,7 @@ immediate = { after = { hidden_effect = { remove_country_flag = gray_diplomacy_engaged - #初始化衣柜 - reset_gray_cloth = yes + } } trigger = { @@ -165,7 +164,6 @@ option = { } } } -inline_script = "events/rg_wsg_marry_gray_option_500_scripts" option = { name = graygoo.500.d default_hide_option = yes diff --git a/common/inline_scripts/events/rg_graygoo/rg_graygoo.501.txt b/common/inline_scripts/events/rg_graygoo/rg_graygoo.501.txt index 31c49a8..e2b50d0 100644 --- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.501.txt +++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.501.txt @@ -42,7 +42,6 @@ immediate = { after = { hidden_effect = { remove_country_flag = gray_diplomacy_engaged - reset_gray_cloth = yes } } option = { @@ -139,7 +138,6 @@ option = { } } } -inline_script = "events/rg_wsg_marry_gray_option_scripts" option = { name = graygoo.500.d tag = hire_leader diff --git a/common/inline_scripts/events/rg_graygoo/rg_graygoo.502.txt b/common/inline_scripts/events/rg_graygoo/rg_graygoo.502.txt index ad6f764..b3168f9 100644 --- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.502.txt +++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.502.txt @@ -31,7 +31,6 @@ immediate = { after = { hidden_effect = { remove_country_flag = gray_diplomacy_engaged - reset_gray_cloth = yes } } option = { @@ -330,7 +329,6 @@ option = { } } } -inline_script = "events/rg_wsg_marry_gray_option_scripts" option = { name = graygoo.500.d tag = hire_leader diff --git a/common/inline_scripts/events/rg_graygoo/rg_graygoo.503.txt b/common/inline_scripts/events/rg_graygoo/rg_graygoo.503.txt index c11e44f..222eb24 100644 --- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.503.txt +++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.503.txt @@ -29,7 +29,6 @@ immediate = { after = { hidden_effect = { remove_country_flag = gray_diplomacy_engaged - reset_gray_cloth = yes } } option = { @@ -289,7 +288,6 @@ option = { } } } -inline_script = "events/rg_wsg_marry_gray_option_scripts" option = { name = graygoo.500.d tag = hire_leader diff --git a/common/inline_scripts/events/rg_graygoo/rg_graygoo.505.txt b/common/inline_scripts/events/rg_graygoo/rg_graygoo.505.txt index cec43ee..5cfebe9 100644 --- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.505.txt +++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.505.txt @@ -177,7 +177,6 @@ option = { } } } -inline_script = "events/rg_wsg_marry_gray_option_scripts" # option = { # 开启建造中继器 # name = rg_event.5.e # trigger = { diff --git a/common/inline_scripts/events/rg_wsg_marry_gray_option_500_scripts.txt b/common/inline_scripts/events/rg_wsg_marry_gray_option_500_scripts.txt deleted file mode 100644 index d631d06..0000000 --- a/common/inline_scripts/events/rg_wsg_marry_gray_option_500_scripts.txt +++ /dev/null @@ -1,63 +0,0 @@ -option = { - name = marry_gray - trigger = { - RG_OR_has_wsg_mod_trigger = yes - 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 - } - } -} \ No newline at end of file diff --git a/common/inline_scripts/events/rg_wsg_marry_gray_option_504_scripts.txt b/common/inline_scripts/events/rg_wsg_marry_gray_option_504_scripts.txt deleted file mode 100644 index e494882..0000000 --- a/common/inline_scripts/events/rg_wsg_marry_gray_option_504_scripts.txt +++ /dev/null @@ -1,34 +0,0 @@ -option = { - name = marry_gray - trigger = { - RG_OR_has_wsg_mod_trigger = yes - check_variable = { - which = wg_gray_affection - value > @wg_gray_affection_to_lv4 - } - NOT = { - has_country_flag = married_gray - } - } - allow = { - OR = { - has_wg_special_authority = no - custom_tooltip = { - check_variable = { - which = wsg_rings - value >= 1 - } - fail_text = not_enough_engagement_rings - } - } - } - subtract_variable = { - which = wsg_rings - value = 1 - } - hidden_effect = { - country_event = { - id = wg_affection.30000 - } - } -} \ No newline at end of file diff --git a/common/inline_scripts/events/rg_wsg_marry_gray_option_scripts.txt b/common/inline_scripts/events/rg_wsg_marry_gray_option_scripts.txt deleted file mode 100644 index 35e6653..0000000 --- a/common/inline_scripts/events/rg_wsg_marry_gray_option_scripts.txt +++ /dev/null @@ -1,37 +0,0 @@ -option = { - name = marry_gray - trigger = { - RG_OR_has_wsg_mod_trigger = yes - 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 - } - } - } - 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 }} -} \ No newline at end of file diff --git a/common/inline_scripts/pop_categories/trait_production.txt b/common/inline_scripts/pop_categories/trait_production.txt deleted file mode 100644 index 3918233..0000000 --- a/common/inline_scripts/pop_categories/trait_production.txt +++ /dev/null @@ -1,145 +0,0 @@ -produces = { - trigger = { - exists = planet - planet = { - owner = { - RG_tradition5_or_gray_owner_trigger = yes - } - rg_is_pc_nano = yes - } - OR = { - has_trait = rg_machine_maid_trait - } - } - nanites = -0.1 - multiplier = value:rg_maid_trait_mult -} - -# vanilla - -produces = { - trigger = { - OR = { - has_trait = trait_lithoid_scintillating - has_trait = trait_advanced_scintillating - } - } - rare_crystals = @lithoid_trait_resource_production - multiplier = value:lithoid_trait_mult -} - -produces = { - trigger = { - OR = { - has_trait = trait_lithoid_gaseous_byproducts - has_trait = trait_advanced_gaseous_byproducts - } - } - exotic_gases = @lithoid_trait_resource_production - multiplier = value:lithoid_trait_mult -} - -produces = { - trigger = { - OR = { - has_trait = trait_lithoid_volatile_excretions - has_trait = trait_advanced_volatile_excretions - } - } - volatile_motes = @lithoid_trait_resource_production - multiplier = value:lithoid_trait_mult -} - -produces = { - trigger = { - OR = { - has_trait = trait_notofthisworld - has_trait = trait_robot_notofthisworld - has_trait = trait_exd - } - } - physics_research = 0.5 -} - -produces = { - trigger = { - exists = planet - planet = { - has_modifier = astralnomical_interest_modifier - } - is_enslaved = no - is_robot_pop = no - } - physics_research = 1 -} - -produces = { - trigger = { - has_trait = trait_cybernetic - exists = owner - owner = { - has_country_flag = driven_neural_chorus - } - } - unity = 0.1 -} - -produces = { - trigger = { - exists = planet - planet = { - has_modifier = particle_storm_aftermath_modifier_severity_1 - } - } - volatile_motes = 0.02 -} - -produces = { - trigger = { - exists = planet - planet = { - has_modifier = particle_storm_aftermath_modifier_severity_2 - } - } - volatile_motes = 0.04 -} - -produces = { - trigger = { - exists = planet - planet = { - has_modifier = particle_storm_aftermath_modifier_severity_3 - } - } - volatile_motes = 0.06 -} - -produces = { - trigger = { - exists = planet - planet = { - has_modifier = celestial_storm_aftermath_modifier_severity_1 - } - } - rare_crystals = 0.02 -} - -produces = { - trigger = { - exists = planet - planet = { - has_modifier = celestial_storm_aftermath_modifier_severity_2 - } - } - rare_crystals = 0.04 -} - -produces = { - trigger = { - exists = planet - planet = { - has_modifier = celestial_storm_aftermath_modifier_severity_3 - } - } - rare_crystals = 0.06 -} \ No newline at end of file diff --git a/common/leader_classes/RG_leader_classes.txt b/common/leader_classes/RG_leader_classes.txt deleted file mode 100644 index 07a8899..0000000 --- a/common/leader_classes/RG_leader_classes.txt +++ /dev/null @@ -1,103 +0,0 @@ -# example_class = { -# name = -# name_plural = -# description = -# -# #all the following default to no -# can_lead_army = yes/no # Applies skill__army scaled by level to armies -# can_lead_navy = yes/no # Applies skill__navy scaled by level to fleets -# can_govern_planet = yes/no # Applies skill__planet_governor scaled by level to governed planet - # Applies skill__sector_governor scaled by level to governed sector, if governing the sector capital - # Applies skill__background_planet_governor scaled by level togoverned planet, if governing their homeworld -# can_be_envoy = yes/no -# can_research_tech = yes/no -# can_research_special_projects = yes/no -# can_crew_science_ship = yes/no -# can_research_anomalies = yes/no -# can_research_archaeology_site = yes/no -# can_survey = yes/no -# can_boost_cloaking_detection = yes/no -# can_explore_rifts = yes/no -# can_conduct_active_reconnaissance = yes/no -# can_govern_planet = yes/no -# can_have_traits = yes/no # defaults to yes, if no this class will not gain LEADER_ASSIGNED_MONTHLY_EXPERIENCE when assigned -# can_rule_empire = yes/no # defaults to yes -# recruitable = yes/no # defaults to yes -# max_trait_points = -# leader_capacity = # maximum number of leader of this type before you get maluses, 0 means no cap -# replaces_old_class = "old_class" # used for backwards compatibility. When "old_class" appears in an old save, it is converted to this class at loading -# # can appear multiple times -# -# resources = { #upkeep -# category = leader_scientists/etc -# cost = { -# ... -# } -# } -# -# ai_weight = { # used to determine which type of leader the AI prefers (frex: commanders for warlike leaders, and governor for pacifists) -# base = -# modifier = {} -# } -# -# ai_location_weight = { # used to evaluate a specific leader for an assignment to a specific location (right now only used for fleet), -# # scope is the leader, from is the leader location (can be a planet, a fleet, an army etc) -# # if the score is 0 or less, the leader will not be assigned to that location -# base = -# modifier = {} -# } -# -# minimum_ai_target = -# -# leader_background_job_weight = { -# job_name = -# # etc -# } -# } -# -# icon = 1 # 1-based index in the icon file. might be replaced by an icon name later -# -# paragon_background_selector = , used to display a background behind paragon portraits -# -# -# How the AI assigns leaders now: -# -# Step 1: Sort all possible location using the NDefines::NAI::LOCATION_WEIGHT_* values (all of them are multipliers except the galactic community which is a flat value) -# Step 2: Sort all available leaders by skill -# Step 3: for each leader in order, calculate a location weight based on the ai_location_weight of their class -# Step 4: Assign the highest leader/location pair based on the weight -# Step 5: if no leader was assigned, see if hiring a leader is possible repeating the same steps - -# rg_nanite_leader = { -# name = rg_nanite_leader -# name_plural = rg_nanite_leader_plural -# description = rg_nanite_leader_description -# -# can_lead_army = yes -# can_lead_navy = yes -# can_govern_planet = yes -# can_be_envoy = yes -# can_research_tech = yes -# can_research_special_projects = yes -# can_crew_science_ship = yes -# can_research_anomalies = yes -# can_research_archaeology_site = yes -# can_survey = yes -# can_boost_cloaking_detection = yes -# can_explore_rifts = yes -# can_conduct_active_reconnaissance = yes -# can_govern_planet = yes -# can_have_traits = yes -# can_rule_empire = yes -# recruitable = no -# max_trait_points = 3 -# leader_capacity = 3 -# -# ai_weight = { -# modifier = { -# factor = 0 -# } -# } -# icon = 4 -# paragon_background_selector = "paragon_background_selector" -# } \ No newline at end of file diff --git a/common/message_types/RG_message_types.txt b/common/message_types/RG_message_types.txt new file mode 100644 index 0000000..a40aa46 --- /dev/null +++ b/common/message_types/RG_message_types.txt @@ -0,0 +1,33 @@ +#message_type = { +# key = "CONSTRUCTION_MESSAGE_TYPE" # Message key, used from code. +# icon = "GFX_message_other_construction" # Sprite to use for gui item "message_icon_button" +# icon_frame = 1 # Frame index to use for gui item "message_frame" +# +# name = "MESSAGE_DECLARE_WAR_TITLE" # Localization key to use for title, if empty it will use "MESSAGE__TITLE" instead. +# sound = "advisor_notification_construction_complete" # Sound to play on message creation +# +# sound_is_advisor = yes # Deprecated and does nothing. +# ping = "ping_notification_green" # Ping map to use for map visualization. +# +# hidden_in_message_settings = yes # If yes, the message type is not shown in the message settings UI (default: no). +# category = diplomacy # Filter category in message settings, valid: 'diplomacy', 'military', 'economy', 'government', 'science', 'fleets', 'planets', 'leaders', 'other' (default: 'other'). +# message_setting_key = "MESSAGE_DECLARE_WAR_SETTING" # Localization key to use in message settings, if empty it will use name instead. +# default_notification = no # Is notification enabled by default (default: yes). +# default_toast = yes # Is toast enabled by default (default: no). +# default_popup = yes # Is popup enabled by default (default: no). +# default_autopause = yes # Is auto-pause enabled by default (default: no). +#} + + +message_type = { + key = "MESSAGE_TYPE_RG_GRAY_GOO_LEADER_CHAT" + icon = "GFX_toast_leader_acquired" + + name = "MESSAGE_RG_GRAY_GOO_LEADER_CHAT_TITLE" + sound = "notification" + ping = "ping_notification_red" + + default_toast = yes + + category = leaders +} \ No newline at end of file diff --git a/events/!_RG_gray_goo_event_overwrite.txt b/events/!_RG_gray_goo_event_overwrite.txt index 756c95f..ec43c12 100644 --- a/events/!_RG_gray_goo_event_overwrite.txt +++ b/events/!_RG_gray_goo_event_overwrite.txt @@ -1082,7 +1082,7 @@ country_event = { rg_gray_country_after_init = yes set_country_flag = machine_age_nanites_studied create_message = { - type = MESSAGE_RECRUITED_LEADER + type = MESSAGE_TYPE_RG_GRAY_GOO_LEADER_CHAT localization = "rg_event.2.desc" days = @toast_message_days target = event_target:rg_gray_country_leader diff --git a/events/RG_planert_killer_events.txt b/events/RG_planert_killer_events.txt index a14c26b..b18b81c 100644 --- a/events/RG_planert_killer_events.txt +++ b/events/RG_planert_killer_events.txt @@ -42,31 +42,6 @@ planet_event = { } set_update_modifiers_batch = end } -} option = { - trigger = { has_civic = civic_AG_gray_master } - name = AG_dooropen_master.option - if = { - limit = { - any_country = { - has_civic = civic_AG_gray - } - } - #do nothing - } - else_if = { - limit = { - NOT = { - any_country = { - has_civic = civic_AG_gray - } - } - has_global_flag = has_rg_mod - } - force_remove_civic = civic_AG_gray_master - } - else = { - country_event = { id = graygoo.499 } - } } # Cracked diff --git a/localisation/simp_chinese/RG_l_simp_chinese.yml b/localisation/simp_chinese/RG_l_simp_chinese.yml index f61037a..0e68f5f 100644 --- a/localisation/simp_chinese/RG_l_simp_chinese.yml +++ b/localisation/simp_chinese/RG_l_simp_chinese.yml @@ -121,3 +121,6 @@ opinion_nanophage: "神秘失踪" opinion_nanophage_our_species: "纳米同化我们的物种" + + MESSAGE_RG_GRAY_GOO_LEADER_CHAT_TITLE:"小灰" + MESSAGE_TYPE_RG_GRAY_GOO_LEADER_CHAT:"小灰的悄悄话" diff --git a/realgray-stellaris-mod.code-workspace b/realgray-stellaris-mod.code-workspace index 5d93660..5c651ee 100644 --- a/realgray-stellaris-mod.code-workspace +++ b/realgray-stellaris-mod.code-workspace @@ -15,6 +15,9 @@ { "name": "2293827000", "path": "../../../../../../../Steam/steamapps/workshop/content/281990/2293827000" + }, + { + "path": "../../../../../../../Steam/steamapps/workshop/content/281990/3412303559" } ] } \ No newline at end of file