From 5b05c6dc98de39e8e1d8486c88b5633810f829d2 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Sat, 28 Feb 2026 03:10:23 +0000 Subject: [PATCH] fixes --- .../buildings/00_estate_buildings.txt | 98 +++++++++---------- .../07_dlc_ep3_scripted_effects.txt | 27 ++--- events/dlc/ep3/ep3_laamp_events.txt | 4 +- .../english/replace/buildings_l_english.yml | 9 +- 4 files changed, 62 insertions(+), 76 deletions(-) diff --git a/common/domiciles/buildings/00_estate_buildings.txt b/common/domiciles/buildings/00_estate_buildings.txt index fc517a2d..20b26820 100644 --- a/common/domiciles/buildings/00_estate_buildings.txt +++ b/common/domiciles/buildings/00_estate_buildings.txt @@ -506,7 +506,7 @@ living_quarters_03 = { previous_building = living_quarters_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -548,7 +548,7 @@ living_quarters_04 = { previous_building = living_quarters_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -658,7 +658,7 @@ trophy_room_03 = { previous_building = trophy_room_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -699,7 +699,7 @@ trophy_room_04 = { previous_building = trophy_room_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -818,7 +818,7 @@ office_03 = { previous_building = office_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -861,7 +861,7 @@ office_04 = { previous_building = office_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -976,7 +976,7 @@ servants_quarters_03 = { previous_building = servants_quarters_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -1017,7 +1017,7 @@ servants_quarters_04 = { previous_building = servants_quarters_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -1132,7 +1132,7 @@ library_observatory_03 = { previous_building = library_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -1173,7 +1173,7 @@ library_observatory_04 = { previous_building = library_observatory_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -1216,7 +1216,7 @@ library_education_03 = { previous_building = library_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -1257,7 +1257,7 @@ library_education_04 = { previous_building = library_education_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -1377,7 +1377,7 @@ bath_03 = { previous_building = bath_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -1419,7 +1419,7 @@ bath_04 = { previous_building = bath_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -1548,7 +1548,7 @@ guest_room_03 = { previous_building = guest_room_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -1597,7 +1597,7 @@ guest_room_04 = { previous_building = guest_room_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -1945,7 +1945,7 @@ courtyard_03 = { previous_building = courtyard_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -1986,7 +1986,7 @@ courtyard_04 = { previous_building = courtyard_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -2123,7 +2123,7 @@ prison_03 = { previous_building = prison_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -2177,7 +2177,7 @@ prison_04 = { previous_building = prison_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -2319,7 +2319,7 @@ reception_hall_03 = { can_construct = { dynasty ?= { has_dynasty_perk = ep3_administrative_legacy_3 } - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -2363,7 +2363,7 @@ reception_hall_04 = { can_construct = { dynasty ?= { has_dynasty_perk = ep3_administrative_legacy_3 } - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -2692,7 +2692,7 @@ grand_solar_03 = { text = unlocked_via_event house.house_head = { has_character_flag = ep3_construct_grand_solar } } - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -2735,7 +2735,7 @@ grand_solar_04 = { text = unlocked_via_event house.house_head = { has_character_flag = ep3_construct_grand_solar } } - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } parameters = { @@ -3057,7 +3057,7 @@ temple_small_03 = { previous_building = temple_small_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -3198,7 +3198,7 @@ temple_crypt_04 = { previous_building = temple_small_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -3663,7 +3663,7 @@ temple_large_04 = { previous_building = temple_small_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -4094,7 +4094,7 @@ temple_monastery_04 = { can_construct = { faith = { has_doctrine = tenet_monasticism } - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -5236,7 +5236,7 @@ watchtower_03 = { previous_building = watchtower_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -5324,7 +5324,7 @@ watchtower_04 = { previous_building = watchtower_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -7322,7 +7322,7 @@ stable_grand_04 = { previous_building = stable_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -7581,7 +7581,7 @@ stable_kennel_04 = { previous_building = stable_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -7869,7 +7869,7 @@ stable_chariot_04 = { can_construct_potential = { culture = { has_cultural_parameter = hosts_chariot_races } - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -9460,7 +9460,7 @@ storage_warehouse_03 = { previous_building = storage_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -9544,7 +9544,7 @@ storage_warehouse_04 = { previous_building = storage_warehouse_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -9630,7 +9630,7 @@ storage_granary_03 = { previous_building = storage_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -9717,7 +9717,7 @@ storage_granary_04 = { previous_building = storage_granary_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -10682,7 +10682,7 @@ grazing_land_04 = { previous_building = grazing_land_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -11021,7 +11021,7 @@ horse_pasture_04 = { can_construct = { can_recruit_archer_cavalry_trigger = yes - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -11341,7 +11341,7 @@ camel_pasture_04 = { can_construct = { culture ?= { has_innovation = innovation_war_camels } - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -11661,7 +11661,7 @@ elephant_pasture_04 = { can_construct = { culture ?= { has_innovation = innovation_elephantry } - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -12164,7 +12164,7 @@ grain_field_03 = { previous_building = grain_field_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -12292,7 +12292,7 @@ grain_field_04 = { previous_building = grain_field_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -12827,7 +12827,7 @@ rice_field_03 = { previous_building = rice_field_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -12904,7 +12904,7 @@ rice_field_04 = { previous_building = rice_field_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -13935,7 +13935,7 @@ tea_03 = { previous_building = tea_02 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -14014,7 +14014,7 @@ tea_04 = { previous_building = tea_03 can_construct = { - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { @@ -15033,7 +15033,7 @@ silk_03 = { } culture = { has_cultural_parameter = unlocks_silk_buildings_parameter } } - domicile ?= { has_domicile_building_or_higher = estate_main_02 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_02 has_domicile_building_or_higher = minority_community_main_02 } } } cost = { @@ -15114,7 +15114,7 @@ silk_04 = { } culture = { has_cultural_parameter = unlocks_silk_buildings_parameter } } - domicile ?= { has_domicile_building_or_higher = estate_main_03 } + domicile ?= { OR = { has_domicile_building_or_higher = estate_main_03 has_domicile_building_or_higher = minority_community_main_03 } } } cost = { diff --git a/common/scripted_effects/07_dlc_ep3_scripted_effects.txt b/common/scripted_effects/07_dlc_ep3_scripted_effects.txt index cae98437..78be9a92 100644 --- a/common/scripted_effects/07_dlc_ep3_scripted_effects.txt +++ b/common/scripted_effects/07_dlc_ep3_scripted_effects.txt @@ -44,17 +44,6 @@ create_landless_adventurer_title_effect = { $FLAVOR_CHAR$ = { save_scope_as = adventurer_flavor_char } hidden_effect = { random_list = { - 1000 = { - trigger = { - scope:warrior_youth ?= scope:new_landless_adventurer - } - create_adventurer_title = { - name = minority_name - holder = scope:new_landless_adventurer - article = DEFAULT_TITLE_NAME_ARTICLE - save_scope_as = new_title - } - } 1000 = { trigger = { scope:warrior_youth ?= scope:new_landless_adventurer @@ -597,17 +586,13 @@ create_landless_minority_title_effect = { $FLAVOR_CHAR$ = { save_scope_as = minority_flavor_char } hidden_effect = { - random_list = { - 1000 = { - create_adventurer_title = { - name = minority_name - holder = scope:new_landless_adventurer - article = DEFAULT_TITLE_NAME_ARTICLE - save_scope_as = new_title - } - } + create_adventurer_title = { + name = minority_name + holder = scope:new_landless_minority + article = DEFAULT_TITLE_NAME_ARTICLE + government = landless_minority_government + save_scope_as = new_title } - scope:new_title ?= { create_landless_minority_title_history_effect = yes set_variable = { diff --git a/events/dlc/ep3/ep3_laamp_events.txt b/events/dlc/ep3/ep3_laamp_events.txt index 0a265650..ab7471ba 100644 --- a/events/dlc/ep3/ep3_laamp_events.txt +++ b/events/dlc/ep3/ep3_laamp_events.txt @@ -1281,12 +1281,12 @@ ep3_laamps.1032 = { type = letter_event opening = ep3_laamps.1032.opening desc = ep3_laamps.1032.desc - sender = scope:minority + sender = scope:minority_leader trigger = { is_ai = no } immediate = { - scope:minority = { create_landless_minority_title_tooltip_effect = yes } + scope:minority_leader = { create_landless_minority_title_tooltip_effect = yes } } option = { diff --git a/localization/english/replace/buildings_l_english.yml b/localization/english/replace/buildings_l_english.yml index b4e8e945..119ff571 100644 --- a/localization/english/replace/buildings_l_english.yml +++ b/localization/english/replace/buildings_l_english.yml @@ -2794,10 +2794,10 @@ ep3_laamps.1030.t: "On the Move Again" ep3_laamps.1030.desc: "My people no longer feel secure in this realm, as such we are leaving to ensure our safety.\n\nI am joined by my family and people, with varying degrees of enthusiasm for their new lives on the road.\n\n" ep3_laamps.1030.heir: "In my stead, my [ROOT.Char.Custom2('RelationToMeShort', SCOPE.sC('laamp_inheritor'))] and heir, [laamp_inheritor.GetFirstName], has assumed my titles as the [laamp_inheritor.GetTitleAsNameNoTooltip] of [laamp_inheritor.GetPrimaryTitle.GetNameNoTierNoTooltip]." - ep3_laamps.1030.liege: "Any lands you ruled have been given to my erstwhile liege." - ep3_laamps.1030.new: "Any lands you ruled have been given to a local knight." + ep3_laamps.1030.liege: "Any lands I ruled have been given to my erstwhile liege." + ep3_laamps.1030.new: "Any lands I ruled have been given to a local knight." ep3_laamps.1030.a: "Well, what we are we waiting for?" - ep3_laamps.1032.opening: "[adventurer.Custom2('AppropriateGreetingPositive', ROOT.Char)]" + ep3_laamps.1032.opening: "On the Move Again" ep3_laamps.1032.desc: "My people no longer feel secure in this realm, as such we are leaving. Good Day my Liege." ep3_laamps.1032.a: "A bold move, some might call foolish." become_landless_minority_decision: "Become Minority Community" @@ -2809,4 +2809,5 @@ become_landless_minority_decision_domain_size_tt: "Your [domain|E] must be no larger than #V 3#! [counties|E]" become_landless_minority_decision_title_scope_tt: "#negative_value All your [landed|E] [titles|E] and [vassals|E] pass to [THIS.Char.GetName]#!" become_landless_minority_decision_title_created_tt: "#negative_value All your [landed|E] [titles|E] pass to a new local [ruler|E]#!" - minority_name: "[host.GetCulture.GetName] Community of the [host.GetDynasty.GetName]'s" \ No newline at end of file + minority_name: "[new_landless_minority.GetCulture.GetName] Community of the [new_landless_minority.GetDynasty.GetName]'s" + laamp_become_minority_tt: "#mixed_value #BER [THIS.Char.GetShortUIName|U] will establish an $Minority Community$" \ No newline at end of file