From 30adb92badc1e8d0d44a0a5b8ef0d247290f5bbb Mon Sep 17 00:00:00 2001 From: name Date: Tue, 24 Sep 2024 22:05:13 -0400 Subject: [PATCH 1/3] Update guest_management.txt --- common/courtier_guest_management/guest_management.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/courtier_guest_management/guest_management.txt b/common/courtier_guest_management/guest_management.txt index 99c461268b..dcdd299020 100644 --- a/common/courtier_guest_management/guest_management.txt +++ b/common/courtier_guest_management/guest_management.txt @@ -35,8 +35,8 @@ } else_if = { limit = { guest_vassal_candidate_trigger = yes } + multiply = 2 } - multiply = 2 } } modifier = { @@ -587,7 +587,7 @@ add = { if = { limit = { - scope:host = { has_royal_court = yes } + scope:host = { has_royal_court = yes has_dlc_feature = royal_court } } if = { limit = { @@ -642,6 +642,7 @@ if = { limit = { has_royal_court = yes + has_dlc_feature = royal_court } if = { limit = { @@ -692,6 +693,7 @@ if = { limit = { has_royal_court = yes + has_dlc_feature = royal_court } if = { limit = { From db264d0315b97c497fede325ddb142e50c152b54 Mon Sep 17 00:00:00 2001 From: name Date: Wed, 25 Sep 2024 02:24:37 -0400 Subject: [PATCH 2/3] customizable_localization --- .../00_activity_loc.txt | 12 + .../00_animal_custom_loc.txt | 49 +- .../00_appropriate_generic_words.txt | 290 ++++++---- .../00_artifact_custom_loc.txt | 109 +++- .../00_diarchy_custom_loc.txt | 5 +- .../00_divinity_custom_loc.txt | 20 +- .../00_food_custom_loc.txt | 235 ++++++++ .../00_generic_character_words.txt | 52 +- .../00_love_letter_custom_loc.txt | 7 - .../00_pet_custom_loc.txt | 526 ++++++++++++++++-- .../00_regional_custom_localization.txt | 147 +++++ .../00_relations.txt | 348 +++++++++++- .../00_rich_presence_flavor_status.txt | 236 +++++++- .../00_title_custom_loc.txt | 233 ++++++++ .../01_ep1_custom_loc.txt | 325 ++++++++++- .../04_ep2_hunt_custom_loc.txt | 5 +- .../05_bp2_custom_loc.txt | 15 +- .../99_fr_custom_loc.txt | 376 +++++++++---- 18 files changed, 2662 insertions(+), 328 deletions(-) diff --git a/common/customizable_localization/00_activity_loc.txt b/common/customizable_localization/00_activity_loc.txt index f8b1ca6d35..30f22a8af1 100644 --- a/common/customizable_localization/00_activity_loc.txt +++ b/common/customizable_localization/00_activity_loc.txt @@ -40,6 +40,12 @@ } localization_key = activity_adult_education_success } + + ##Camp Party + text = { + trigger = { has_activity_type = activity_camp_party } + localization_key = activity_camp_party_success + } } GetActivitySpecialTypeDesc = { # Only used for Pilgrimages @@ -70,6 +76,12 @@ GetActivitySpecialTypeDesc = { # Only used for Pilgrimages localization_key = pilgrimage_worldliness_desc } + ##Camp Party + text = { + trigger = { has_activity_type = activity_camp_party } + localization_key = activity_camp_party_success_desc + } + } GetAnimalSightingDescriptionType = { diff --git a/common/customizable_localization/00_animal_custom_loc.txt b/common/customizable_localization/00_animal_custom_loc.txt index 6c75698d2f..de68ee8154 100644 --- a/common/customizable_localization/00_animal_custom_loc.txt +++ b/common/customizable_localization/00_animal_custom_loc.txt @@ -47,12 +47,11 @@ SmallAnimal = { trigger = { location = { OR = { - #geographical_region = world_europe_south - geographical_region = world_europe_north - #geographical_region = world_europe_south_east - geographical_region = world_europe_west - #geographical_region = world_europe_east - geographical_region = world_asia_minor + #Warcraft + geographical_region = world_eastern_kingdoms + geographical_region = world_kalimdor + geographical_region = world_northrend + geographical_region = world_broken_isles } } } @@ -60,6 +59,44 @@ SmallAnimal = { } } +SmallAnimalPlural = { + type = character + + random_valid = yes + + #Bunny + text = { + localization_key = small_animal_plural_rabbit + } + #Squirrel + text = { + localization_key = small_animal_plural_squirrel + } + #Bird + text = { + localization_key = small_animal_plural_bird + } + #Mouse + text = { + localization_key = small_animal_plural_mouse + } + #Hedgehog + text = { + trigger = { + location = { + OR = { + #Warcraft + geographical_region = world_eastern_kingdoms + geographical_region = world_kalimdor + geographical_region = world_northrend + geographical_region = world_broken_isles + } + } + } + localization_key = small_animal_plural_hedgehog + } +} + HateCatsDogs = { type = character diff --git a/common/customizable_localization/00_appropriate_generic_words.txt b/common/customizable_localization/00_appropriate_generic_words.txt index 0e55ff98e5..8d4838b88d 100644 --- a/common/customizable_localization/00_appropriate_generic_words.txt +++ b/common/customizable_localization/00_appropriate_generic_words.txt @@ -426,6 +426,13 @@ GetRandomRegionalSmallGame = { } } +GetRandomRegionalSmallGamePlural = { + type = character + random_valid = yes + parent = GetRandomRegionalSmallGame + suffix = "_plural" +} + GetRandomRegionalBird = { type = character @@ -456,11 +463,10 @@ GetRandomRegionalBird = { trigger = { location = { OR = { - geographical_region = world_europe - geographical_region = world_asia_minor - geographical_region = world_africa_north_west - geographical_region = world_steppe - geographical_region = world_tibet + geographical_region = world_kalimdor + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles } } } @@ -470,11 +476,10 @@ GetRandomRegionalBird = { trigger = { location = { OR = { - geographical_region = world_india - geographical_region = world_asia_minor - geographical_region = world_africa - geographical_region = world_steppe - geographical_region = world_tibet + geographical_region = world_kalimdor + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles } } } @@ -484,10 +489,11 @@ GetRandomRegionalBird = { trigger = { location = { OR = { - geographical_region = world_europe - geographical_region = world_steppe - geographical_region = world_tibet - geographical_region = world_africa_north + geographical_region = world_kalimdor + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles + geographical_region = world_pandaria } } } @@ -497,11 +503,11 @@ GetRandomRegionalBird = { trigger = { location = { OR = { - geographical_region = world_europe - geographical_region = world_steppe - geographical_region = world_india - geographical_region = world_africa_north - geographical_region = world_asia_minor + geographical_region = world_kalimdor + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles + geographical_region = world_pandaria } } } @@ -511,10 +517,8 @@ GetRandomRegionalBird = { trigger = { location = { OR = { - geographical_region = world_europe - geographical_region = world_middle_east_persia - geographical_region = world_tibet - geographical_region = world_india + geographical_region = world_kalimdor + geographical_region = world_pandaria } } } @@ -524,13 +528,11 @@ GetRandomRegionalBird = { trigger = { location = { OR = { - # Summer - geographical_region = world_asia_minor - geographical_region = world_africa_north_west - #Winter - geographical_region = world_india - geographical_region = world_africa_west - geographical_region = world_africa_east + geographical_region = world_kalimdor + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles + geographical_region = world_pandaria } } } @@ -569,11 +571,10 @@ GetRandomRegionalWildDaytimeBird = { trigger = { location = { OR = { - geographical_region = world_europe - geographical_region = world_asia_minor - geographical_region = world_africa_north_west - geographical_region = world_steppe - geographical_region = world_tibet + geographical_region = world_kalimdor + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles } } } @@ -583,12 +584,10 @@ GetRandomRegionalWildDaytimeBird = { trigger = { location = { OR = { - geographical_region = world_india - geographical_region = world_europe_west_iberia - geographical_region = world_asia_minor - geographical_region = world_africa - geographical_region = world_steppe - geographical_region = world_tibet + geographical_region = world_kalimdor + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles } } } @@ -598,10 +597,11 @@ GetRandomRegionalWildDaytimeBird = { trigger = { location = { OR = { - geographical_region = world_europe - geographical_region = world_steppe - geographical_region = world_tibet - geographical_region = world_africa_north + geographical_region = world_kalimdor + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles + geographical_region = world_pandaria } } } @@ -611,11 +611,11 @@ GetRandomRegionalWildDaytimeBird = { trigger = { location = { OR = { - geographical_region = world_europe - geographical_region = world_steppe - geographical_region = world_india - geographical_region = world_africa_north - geographical_region = world_asia_minor + geographical_region = world_kalimdor + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles + geographical_region = world_pandaria } } } @@ -625,10 +625,8 @@ GetRandomRegionalWildDaytimeBird = { trigger = { location = { OR = { - geographical_region = world_europe - geographical_region = world_middle_east_persia - geographical_region = world_tibet - geographical_region = world_india + geographical_region = world_kalimdor + geographical_region = world_pandaria } } } @@ -638,13 +636,11 @@ GetRandomRegionalWildDaytimeBird = { trigger = { location = { OR = { - # Summer - geographical_region = world_asia_minor - geographical_region = world_africa_north_west - #Winter - geographical_region = world_india - geographical_region = world_africa_west - geographical_region = world_africa_east + geographical_region = world_kalimdor + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles + geographical_region = world_pandaria } } } @@ -662,9 +658,8 @@ GetRandomRegionalWildDaytimeBird = { trigger = { location = { OR = { - geographical_region = world_europe_west_britannia - geographical_region = world_europe_north - #geographical_region = sea_north_atlantic + geographical_region = world_kalimdor + geographical_region = world_pandaria } } } @@ -683,10 +678,8 @@ GetRandomRegionalWood = { text = { trigger = { OR = { - geographical_region = world_europe - geographical_region = world_asia_minor - geographical_region = world_africa_north_west - geographical_region = world_steppe + geographical_region = world_kalimdor + geographical_region = world_pandaria } } localization_key = birch @@ -694,8 +687,9 @@ GetRandomRegionalWood = { text = { trigger = { OR = { - geographical_region = world_europe_north - geographical_region = world_asia_minor + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles } } localization_key = pine @@ -703,9 +697,8 @@ GetRandomRegionalWood = { text = { trigger = { OR = { - geographical_region = world_europe - geographical_region = world_steppe - geographical_region = world_asia_minor + geographical_region = world_northrend + geographical_region = world_broken_isles } } localization_key = poplar @@ -713,8 +706,9 @@ GetRandomRegionalWood = { text = { trigger = { OR = { - geographical_region = world_india - geographical_region = world_tibet + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles } } localization_key = teak @@ -722,30 +716,29 @@ GetRandomRegionalWood = { text = { trigger = { OR = { - geographical_region = world_india - geographical_region = world_tibet + geographical_region = world_pandaria + geographical_region = world_kalimdor } } localization_key = sandalwood } text = { trigger = { - geographical_region = world_africa + geographical_region = world_kalimdor } localization_key = ebony } text = { trigger = { - geographical_region = world_africa + geographical_region = world_kalimdor } localization_key = baobab } text = { trigger = { OR = { - geographical_region = world_india - geographical_region = world_tibet - geographical_region = world_africa + geographical_region = world_pandaria + geographical_region = world_kalimdor } } localization_key = palm @@ -760,10 +753,11 @@ GetRandomAppropriateTree = { text = { trigger = { OR = { - geographical_region = world_europe - geographical_region = world_asia_minor - geographical_region = world_africa_north_west - geographical_region = world_india + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles + geographical_region = world_pandaria + geographical_region = world_kalimdor } NOT = { terrain = jungle } } @@ -773,10 +767,11 @@ GetRandomAppropriateTree = { text = { trigger = { OR = { - geographical_region = world_europe - geographical_region = world_asia_minor - geographical_region = world_africa_north_west - geographical_region = world_steppe + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles + geographical_region = world_pandaria + geographical_region = world_kalimdor } NOT = { terrain = jungle } } @@ -785,8 +780,8 @@ GetRandomAppropriateTree = { text = { trigger = { OR = { - geographical_region = world_europe_north - geographical_region = world_asia_minor + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend } } localization_key = pine @@ -794,9 +789,8 @@ GetRandomAppropriateTree = { text = { trigger = { OR = { - geographical_region = world_europe - geographical_region = world_steppe - geographical_region = world_asia_minor + geographical_region = world_pandaria + geographical_region = world_kalimdor } } localization_key = poplar @@ -804,8 +798,7 @@ GetRandomAppropriateTree = { text = { trigger = { OR = { - geographical_region = world_india - geographical_region = world_tibet + geographical_region = world_pandaria } } localization_key = teak @@ -813,30 +806,32 @@ GetRandomAppropriateTree = { text = { trigger = { OR = { - geographical_region = world_india - geographical_region = world_tibet + geographical_region = world_pandaria + geographical_region = world_kalimdor } } localization_key = sandalwood } text = { trigger = { - geographical_region = world_africa + geographical_region = world_kalimdor } localization_key = ebony } text = { trigger = { - geographical_region = world_africa + geographical_region = world_kalimdor } localization_key = baobab } text = { trigger = { OR = { - geographical_region = world_india - geographical_region = world_tibet - geographical_region = world_africa + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + geographical_region = world_broken_isles + geographical_region = world_pandaria + geographical_region = world_kalimdor } } localization_key = palm @@ -944,25 +939,16 @@ GetRandomMigratoryBird = { # Summer AND = { middle_of_year_season_trigger = yes - OR = { - geographical_region = world_asia_minor - geographical_region = world_africa_north_west - #geographical_region = sea_ionian_sea - #geographical_region = sea_aegean_sea - #geographical_region = sea_black_sea - #geographical_region = sea_caspian_sea - } + #OR = { + geographical_region = world_pandaria + #} } #Winter AND = { end_of_year_season_trigger = yes - OR = { - geographical_region = world_india - geographical_region = world_africa_west - geographical_region = world_africa_east - #geographical_region = sea_south_atlantic - #geographical_region = sea_indian_ocean - } + #OR = { + geographical_region = world_kalimdor + #} } } } @@ -973,8 +959,8 @@ GetRandomMigratoryBird = { trigger = { root.location = { OR = { - geographical_region = world_europe_west_britannia - geographical_region = world_europe_north + geographical_region = world_northrend + geographical_region = world_broken_isles #geographical_region = sea_north_atlantic } } @@ -1272,3 +1258,65 @@ GetRandomRegionalDangerSingular = { localization_key = danger_bog } } + +GetScientificObjects = { + type = character + + random_valid = yes + + #a bunch of wood species + text = { + localization_key = scientific_objects_wood_species + } + #a handful of insects + text = { + localization_key = scientific_objects_insects + } + #some small critters + text = { + localization_key = scientific_objects_small_critters + } + #a cluster of rocks + text = { + localization_key = scientific_objects_rocks + } +} + +GetMarginalia = { + type = character + + random_valid = yes + + + text = { + localization_key = marginalia_reptile + } + + text = { + localization_key = marginalia_blob + } + + text = { + localization_key = marginalia_knight + } + + text = { + localization_key = marginalia_horse_creature + } + + text = { + localization_key = marginalia_cat + } + + text = { + localization_key = marginalia_horned_man + } + + text = { + localization_key = marginalia_hounds + } + + text = { + localization_key = marginalia_sad_humans + } +} \ No newline at end of file diff --git a/common/customizable_localization/00_artifact_custom_loc.txt b/common/customizable_localization/00_artifact_custom_loc.txt index 6e46d1ce7a..dbda6bb39c 100644 --- a/common/customizable_localization/00_artifact_custom_loc.txt +++ b/common/customizable_localization/00_artifact_custom_loc.txt @@ -2002,11 +2002,71 @@ InspiredPersonQuality = { } } +#Call this effect (set_up_horned_mythical_creature_effect = yes) in the line before creating the artifact that sports this custom_loc +#Remember to clear the var:horned_mythical_creature in your after = { ... } HornedMythicalCreature = { #For Horn Trinkets type = character - # Warcraft - #rhino + #Tarasque + text = { + trigger = { var:horned_mythical_creature ?= flag:tarasque } + localization_key = horned_mythical_creature_tarasque + } + #Indrik + text = { + trigger = { var:horned_mythical_creature ?= flag:indrik } + localization_key = horned_mythical_creature_indrik + } + #Ophiotaurus + text = { + trigger = { var:horned_mythical_creature ?= flag:ophiotaurus } + localization_key = horned_mythical_creature_ophiotaurus + } + #Monocerus + text = { + trigger = { var:horned_mythical_creature ?= flag:monocerus } + localization_key = horned_mythical_creature_monocerus + } + #Centicore + text = { + trigger = { var:horned_mythical_creature ?= flag:centicore } + localization_key = horned_mythical_creature_centicore + } + #Erchitu + text = { + trigger = { var:horned_mythical_creature ?= flag:erchitu } + localization_key = horned_mythical_creature_erchitu + } + #Hadhayosh + text = { + trigger = { var:horned_mythical_creature ?= flag:hadhayosh } + localization_key = horned_mythical_creature_hadhayosh + } + #Bulgu + text = { + trigger = { var:horned_mythical_creature ?= flag:bulgu } + localization_key = horned_mythical_creature_bulgu + } + #Catoblepas + text = { + trigger = { var:horned_mythical_creature ?= flag:catoblepas } + localization_key = horned_mythical_creature_catoblepas + } + #Keewakw + text = { + trigger = { var:horned_mythical_creature ?= flag:keewakw } + localization_key = horned_mythical_creature_keewakw + } +} + +#Call this effect (set_up_regional_mythical_creature_effect = yes) in the line before creating the artifact that sports this custom_loc +#Remember to clear the var:regional_mythical_creature_trinket in your after = { ... } +RegionalMythicalCreature = { + type = character + random_valid = yes + + #Britannia + ##Water Leper text = { trigger = { exists = var:horned_mythical_creature @@ -2578,3 +2638,48 @@ ArtifactBaseWeaponType = { localization_key = weapon_sword_inspiration_name } } + +#Generates artifact description out of Marco Polo quotes +ArtifactMarcoPoloIntro = { + type = artifact + random_valid = yes + text = { + localization_key = marco_polo_quote_intro_1 + } + text = { + localization_key = marco_polo_quote_intro_2 + } + +} + +ArtifactMarcoPoloDesc = { + type = artifact + random_valid = yes + text = { + localization_key = marco_polo_quote_desc_1 + } + text = { + localization_key = marco_polo_quote_desc_2 + } + text = { + localization_key = marco_polo_quote_desc_3 + } + text = { + localization_key = marco_polo_quote_desc_4 + } + text = { + localization_key = marco_polo_quote_desc_5 + } + +} + +ArtifactMarcoPoloEnd = { + type = artifact + random_valid = yes + text = { + localization_key = marco_polo_quote_end_1 + } + text = { + localization_key = marco_polo_quote_end_2 + } +} diff --git a/common/customizable_localization/00_diarchy_custom_loc.txt b/common/customizable_localization/00_diarchy_custom_loc.txt index a3593f01c5..9b2bc47806 100644 --- a/common/customizable_localization/00_diarchy_custom_loc.txt +++ b/common/customizable_localization/00_diarchy_custom_loc.txt @@ -1,4 +1,7 @@ -GetDiarchyArticle = { +################################################## +# #General + +GetDiarchyArticle = { type = character # Fallback: "a". diff --git a/common/customizable_localization/00_divinity_custom_loc.txt b/common/customizable_localization/00_divinity_custom_loc.txt index 4df83c73d9..07504ac717 100644 --- a/common/customizable_localization/00_divinity_custom_loc.txt +++ b/common/customizable_localization/00_divinity_custom_loc.txt @@ -82,6 +82,24 @@ MyPriestTitle = { } } +PriestTitle = { + type = character + + text = { + trigger = { is_female = no } + localization_key = male_priest_title + } + text = { + trigger = { is_female = yes } + localization_key = female_priest_title + } + text = { + trigger = { always = no } + localization_key = neuter_priest_title + fallback = yes + } +} + # For use when refering to a priest of unspecified gender, or the concept of priests in general. DefaultPriestTitle = { type = character @@ -590,7 +608,7 @@ GetActualBishopTitle = { } text = { trigger = { - is_landed = yes + is_playable_character = yes } localization_key = ruler_title_name } diff --git a/common/customizable_localization/00_food_custom_loc.txt b/common/customizable_localization/00_food_custom_loc.txt index a5dbed7f78..df6208710d 100644 --- a/common/customizable_localization/00_food_custom_loc.txt +++ b/common/customizable_localization/00_food_custom_loc.txt @@ -14,6 +14,7 @@ #GetExpensiveDessertInTheFace #GetExpensiveDrink #GetExpensiveDrink_Singular +#RegionalFish #NOTE! All of these nouns should work with "a" (not "an") RegionalDrink = { @@ -1370,3 +1371,237 @@ GetExpensiveDrink_Singular = { } } } + +GetRegionalFish = { + type = character + + random_valid = yes + + # Sturgeon is always available + text = { + localization_key = fish_sturgeon + } + + # Ocean fishes + text = { + trigger = { + has_character_flag = ocean + } + localization_key = fish_mackerel + } + + text = { + trigger = { + has_character_flag = ocean + } + localization_key = fish_bass + } + + text = { + trigger = { + has_character_flag = ocean + } + localization_key = fish_sea-bream + } + + text = { + trigger = { + has_character_flag = ocean + } + localization_key = fish_cod + } + + text = { + trigger = { + has_character_flag = ocean + } + localization_key = fish_pollock + } + + text = { + trigger = { + has_character_flag = ocean + } + localization_key = fish_red_snapper + } + + text = { + trigger = { + has_character_flag = ocean + } + localization_key = fish_trout + } + + text = { + trigger = { + has_character_flag = ocean + } + localization_key = fish_scamp + } + + text = { + trigger = { + has_character_flag = ocean + } + localization_key = fish_tuna + } + + text = { + trigger = { + has_character_flag = ocean + } + localization_key = fish_whitefish + } + + text = { + trigger = { + has_character_flag = ocean + } + localization_key = fish_ling + } + + text = { + trigger = { + has_character_flag = ocean + } + localization_key = fish_nemo + } + + # North Atlantic fishes + text = { + trigger = { + } + localization_key = fish_salmon + } + + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_eel + } + + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_smelt + } + + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_plaice + } + + text = { + localization_key = fish_flounder + } + + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_herring + } + + # Mediterranean fish + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_wrasse + } + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_anchovy + } + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_grouper + } + + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_seahorse + } + + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_angler_fish + } + + # African fish + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_needlefish + } + + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_squeaker + } + + # Indian fish + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_arowana + } + + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_barramundi + } + + text = { + trigger = { + NOT = { + has_character_flag = ocean + } + } + localization_key = fish_croaker + } +} diff --git a/common/customizable_localization/00_generic_character_words.txt b/common/customizable_localization/00_generic_character_words.txt index b989fe34a5..026937d780 100644 --- a/common/customizable_localization/00_generic_character_words.txt +++ b/common/customizable_localization/00_generic_character_words.txt @@ -418,7 +418,7 @@ LadyLordWomanMan = { text = { trigger = { OR = { - is_landed = yes + is_playable_character = yes is_lowborn = no } is_female = yes @@ -429,7 +429,7 @@ LadyLordWomanMan = { text = { trigger = { OR = { - is_landed = yes + is_playable_character = yes is_lowborn = no } is_male = yes @@ -440,7 +440,7 @@ LadyLordWomanMan = { text = { trigger = { NOR = { - is_landed = yes + is_playable_character = yes is_lowborn = no } is_female = yes @@ -451,7 +451,7 @@ LadyLordWomanMan = { text = { trigger = { NOR = { - is_landed = yes + is_playable_character = yes is_lowborn = no } is_male = yes @@ -920,3 +920,47 @@ ThisIsYou = { localization_key = THIS_IS_YOU_KEY } } + +WomanManOpposite = { + type = character + + text = { + trigger = { + is_male = yes + } + localization_key = gender_woman + } + + text = { + trigger = { + is_female = yes + } + localization_key = gender_man + } + + text = { + localization_key = gender_person + } +} + +WomanManPossessiveOpposite = { + type = character + + text = { + trigger = { + is_male = yes + } + localization_key = gender_womans + } + + text = { + trigger = { + is_female = yes + } + localization_key = gender_mans + } + + text = { + localization_key = gender_persons + } +} diff --git a/common/customizable_localization/00_love_letter_custom_loc.txt b/common/customizable_localization/00_love_letter_custom_loc.txt index 054b9addb7..184c3f56dd 100644 --- a/common/customizable_localization/00_love_letter_custom_loc.txt +++ b/common/customizable_localization/00_love_letter_custom_loc.txt @@ -897,13 +897,6 @@ love_letter_knowledge_object = { localization_key = ll_knowledge_depths_of_love } - text = { - trigger = { - var:love_letter_quality >= 1 - } - localization_key = ll_knowledge_depths_of_love - } - text = { trigger = { var:love_letter_quality >= 1 diff --git a/common/customizable_localization/00_pet_custom_loc.txt b/common/customizable_localization/00_pet_custom_loc.txt index a895a2a49e..8ce0133c6d 100644 --- a/common/customizable_localization/00_pet_custom_loc.txt +++ b/common/customizable_localization/00_pet_custom_loc.txt @@ -65,22 +65,26 @@ CatStoryName = { } localization_key = cat_name } - #text = { - # trigger = { - # OR = { - # AND = { - # exists = var:story_cycle_cat_name - # var:story_cycle_cat_name = flag:cat_name_gyb - # NOT = { exists = var:book_topic_cat_name } - # } - # AND = { - # exists = var:book_topic_cat_name - # var:book_topic_cat_name = flag:cat_name_gyb - # } - # } - # } - # localization_key = cat_name_gyb - #} + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_gyb + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_gyb + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_gyb + } + } + } + localization_key = cat_name_gyb + } text = { trigger = { OR = { @@ -141,38 +145,46 @@ CatStoryName = { } localization_key = cat_name_flame } - #text = { - # trigger = { - # OR = { - # AND = { - # exists = var:story_cycle_cat_name - # var:story_cycle_cat_name = flag:cat_name_meone - # NOT = { exists = var:book_topic_cat_name } - # } - # AND = { - # exists = var:book_topic_cat_name - # var:book_topic_cat_name = flag:cat_name_meone - # } - # } - # } - # localization_key = cat_name_meone - #} - #text = { - # trigger = { - # OR = { - # AND = { - # exists = var:story_cycle_cat_name - # var:story_cycle_cat_name = flag:cat_name_cruibne - # NOT = { exists = var:book_topic_cat_name } - # } - # AND = { - # exists = var:book_topic_cat_name - # var:book_topic_cat_name = flag:cat_name_cruibne - # } - # } - # } - # localization_key = cat_name_cruibne - #} + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_meone + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_meone + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_meone + } + } + } + localization_key = cat_name_meone + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_cruibne + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_cruibne + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_cruibne + } + } + } + localization_key = cat_name_cruibne + } text = { trigger = { OR = { @@ -838,6 +850,29 @@ DogStoryGirlBoy = { } } +CatStoryGirlBoy = { + type = character + + text = { + trigger = { + any_owned_story = { + story_type = story_cycle_pet_cat + var:cat_gender = flag:female + } + } + localization_key = girl + } + text = { + trigger = { + any_owned_story = { + story_type = story_cycle_pet_cat + var:cat_gender = flag:male + } + } + localization_key = boy + } +} + DogStorySheHe = { type = character @@ -883,3 +918,398 @@ DogStoryFemaleMale = { localization_key = dog_gender_male } } + +#We need to do something with the pet story cycle, I can't live like this - had to do a combined trigger for cat and dog names +CatOrDogStoryName = { + type = character + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_dog_name + var:story_cycle_dog_name = flag:custom + } + AND = { + exists = var:sacrificed_dog_name + var:sacrificed_dog_name = flag:custom + } + } + } + localization_key = dog_name + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_dog_name + var:story_cycle_dog_name = flag:dog_name_amiable + NOT = { exists = var:book_topic_dog_name } + } + AND = { + exists = var:book_topic_dog_name + var:book_topic_dog_name = flag:dog_name_amiable + } + AND = { + exists = var:sacrificed_dog_name + var:sacrificed_dog_name = flag:dog_name_amiable + } + } + } + localization_key = dog_name_amiable + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_dog_name + var:story_cycle_dog_name = flag:dog_name_nosewise + NOT = { exists = var:book_topic_dog_name } + } + AND = { + exists = var:book_topic_dog_name + var:book_topic_dog_name = flag:dog_name_nosewise + } + AND = { + exists = var:sacrificed_dog_name + var:sacrificed_dog_name = flag:dog_name_nosewise + } + } + } + localization_key = dog_name_nosewise + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_dog_name + var:story_cycle_dog_name = flag:dog_name_holdfast + NOT = { exists = var:book_topic_dog_name } + } + AND = { + exists = var:book_topic_dog_name + var:book_topic_dog_name = flag:dog_name_holdfast + } + AND = { + exists = var:sacrificed_dog_name + var:sacrificed_dog_name = flag:dog_name_holdfast + } + } + } + localization_key = dog_name_holdfast + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_dog_name + var:story_cycle_dog_name = flag:dog_name_gray + NOT = { exists = var:book_topic_dog_name } + } + AND = { + exists = var:book_topic_dog_name + var:book_topic_dog_name = flag:dog_name_gray + } + AND = { + exists = var:sacrificed_dog_name + var:sacrificed_dog_name = flag:dog_name_gray + } + } + } + localization_key = dog_name_gray + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_dog_name + var:story_cycle_dog_name = flag:dog_name_choplicker + NOT = { exists = var:book_topic_dog_name } + } + AND = { + exists = var:book_topic_dog_name + var:book_topic_dog_name = flag:dog_name_choplicker + } + AND = { + exists = var:sacrificed_dog_name + var:sacrificed_dog_name = flag:dog_name_choplicker + } + } + } + localization_key = dog_name_choplicker + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_dog_name + var:story_cycle_dog_name = flag:dog_name_shadow + NOT = { exists = var:book_topic_dog_name } + } + AND = { + exists = var:book_topic_dog_name + var:book_topic_dog_name = flag:dog_name_shadow + } + AND = { + exists = var:sacrificed_dog_name + var:sacrificed_dog_name = flag:dog_name_shadow + } + } + } + localization_key = dog_name_shadow + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_dog_name + var:story_cycle_dog_name = flag:dog_name_snow + NOT = { exists = var:book_topic_dog_name } + } + AND = { + exists = var:book_topic_dog_name + var:book_topic_dog_name = flag:dog_name_snow + } + AND = { + exists = var:sacrificed_dog_name + var:sacrificed_dog_name = flag:dog_name_snow + } + } + } + localization_key = dog_name_snow + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:custom + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:custom + } + } + } + localization_key = cat_name + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_gyb + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_gyb + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_gyb + } + } + } + localization_key = cat_name_gyb + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_mite + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_mite + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_mite + } + } + } + localization_key = cat_name_mite + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_gray + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_gray + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_gray + } + } + } + localization_key = cat_name_gray + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_flame + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_flame + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_flame + } + } + } + localization_key = cat_name_flame + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_meone + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_meone + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_meone + } + } + } + localization_key = cat_name_meone + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_cruibne + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_cruibne + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_cruibne + } + } + } + localization_key = cat_name_cruibne + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_snow + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_snow + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_snow + } + } + } + localization_key = cat_name_snow + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_shadow + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_shadow + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_shadow + } + } + } + localization_key = cat_name_shadow + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_paws + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_paws + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_paws + } + } + } + localization_key = cat_name_paws + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_mittens + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_mittens + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_mittens + } + } + } + localization_key = cat_name_mittens + } + text = { + trigger = { + OR = { + AND = { + exists = var:story_cycle_cat_name + var:story_cycle_cat_name = flag:cat_name_spooky + NOT = { exists = var:book_topic_cat_name } + } + AND = { + exists = var:book_topic_cat_name + var:book_topic_cat_name = flag:cat_name_spooky + } + AND = { + exists = var:sacrificed_cat_name + var:sacrificed_cat_name = flag:cat_name_spooky + } + } + } + localization_key = cat_name_spooky + } +} \ No newline at end of file diff --git a/common/customizable_localization/00_regional_custom_localization.txt b/common/customizable_localization/00_regional_custom_localization.txt index 3749b7e725..4ab5a2e10d 100644 --- a/common/customizable_localization/00_regional_custom_localization.txt +++ b/common/customizable_localization/00_regional_custom_localization.txt @@ -2063,3 +2063,150 @@ RegionalShipPlural = { parent = RegionalShipType suffix = "_plural" } + +RegionalPoxAnimal = { + type = character + random_valid = yes + + #Goat + text = { + localization_key = regional_farm_animal_goat + } + + #Chicken + text = { + localization_key = regional_farm_animal_chicken + } + + #Cow + text = { + localization_key = regional_farm_animal_cow + } + + #Sheep + text = { + localization_key = regional_farm_animal_sheep + } + + #Pig + text = { + localization_key = regional_farm_animal_pig + } + + #Yak + text = { + trigger = { + capital_province = { + OR = { + geographical_region = world_pandaria + } + } + } + localization_key = regional_farm_animal_yak + } + + #Monkey + text = { + trigger = { + capital_province = { + OR = { + geographical_region = world_pandaria + geographical_region = world_kalimdor + } + } + } + localization_key = animal_monkey + } +} + +WritingInstrument = { + type = character + random_valid = yes + + text = { # Quills, European + trigger = { + trigger_if = { + limit = { + exists = capital_province + } + capital_province = { + OR = { + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + } + } + } + trigger_else_if = { + limit = { + exists = liege_or_court_owner.capital_province + } + liege_or_court_owner.capital_province = { + OR = { + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + } + } + } + trigger_else_if = { + limit = { exists = location } + location = { + OR = { + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + } + } + } + trigger_else = { + always = no + } + } + localization_key = quill + } + + text = { # Pens, non-European. Made from bamboo, reeds, whatever. Just a bit of wood sharpened to a point and dipped in ink. + localization_key = pen + fallback = yes + } +} + +GetKnightErrantAnimal = { + type = character + + text = { + trigger = { + location = { + OR = { + geographical_region = world_eastern_kingdoms + geographical_region = world_northrend + } + } + } + localization_key = GetKnightErrantAnimal_swan + } + text = { + trigger = { + location = { + OR = { + geographical_region = world_pandaria + geographical_region = world_kalimdor + } + } + } + localization_key = GetKnightErrantAnimal_tiger + } + text = { + trigger = { + location = { + OR = { + geographical_region = world_pandaria + geographical_region = world_kalimdor + } + } + } + localization_key = GetKnightErrantAnimal_lion + } + text = { # Basically everywhere + localization_key = GetKnightErrantAnimal_hart + fallback = yes + } +} diff --git a/common/customizable_localization/00_relations.txt b/common/customizable_localization/00_relations.txt index fc0b4fbe0e..1156a48425 100644 --- a/common/customizable_localization/00_relations.txt +++ b/common/customizable_localization/00_relations.txt @@ -3,6 +3,11 @@ RelationToMe = { type = character + text = { + localization_key = relation_you + trigger = { scope:second = root } + } + text = { localization_key = relation_motherwife trigger = { @@ -1322,6 +1327,15 @@ RelationToMe = { } } + text = { + localization_key = relation_foe + trigger = { + scope:second = { + is_at_war_with = root + } + } + } + text = { #intrigue-mentor localization_key = relation_mentor trigger = { @@ -2124,6 +2138,15 @@ RelationToMe = { } } + text = { + localization_key = relation_ally + trigger = { + scope:second = { + is_allied_to = root + } + } + } + text = { localization_key = relation_kinswoman trigger = { @@ -2189,9 +2212,32 @@ RelationToMe = { } } + text = { + localization_key = relation_follower_female + trigger = { + is_landed_or_landless_administrative = no + scope:second = { + is_courtier_of = root + is_female = yes + } + } + } + + text = { + localization_key = relation_follower_male + trigger = { + is_landed_or_landless_administrative = no + scope:second = { + is_courtier_of = root + is_male = yes + } + } + } + text = { localization_key = relation_courtier_female trigger = { + is_landed_or_landless_administrative = yes scope:second = { is_courtier_of = root is_female = yes @@ -2202,6 +2248,29 @@ RelationToMe = { text = { localization_key = relation_courtier_male trigger = { + is_landed_or_landless_administrative = yes + scope:second = { + is_courtier_of = root + is_male = yes + } + } + } + + text = { + localization_key = follower_female + trigger = { + is_landless_adventurer = yes + scope:second = { + is_courtier_of = root + is_female = yes + } + } + } + + text = { + localization_key = follower_male + trigger = { + is_landless_adventurer = yes scope:second = { is_courtier_of = root is_male = yes @@ -2522,6 +2591,11 @@ RelationToMe = { RelationToMePossessive = { type = character + text = { + localization_key = CHARACTER_NAME_MY + trigger = { scope:second = root } + } + text = { localization_key = relation_motherwife_possessive trigger = { @@ -3664,6 +3738,33 @@ RelationToMePossessive = { } } + text = { + localization_key = relation_fellow_vassal_female_nemesis_possessive + trigger = { + scope:second = { + is_female = yes + has_relation_nemesis = root + is_independent_ruler = no + } + is_independent_ruler = no + liege = scope:second.liege + } + } + + text = { + localization_key = relation_fellow_vassal_female_rival_possessive + trigger = { + scope:second = { + is_female = yes + has_relation_rival = root + NOT = { has_relation_nemesis = root } + is_independent_ruler = no + } + is_independent_ruler = no + liege = scope:second.liege + } + } + text = { localization_key = relation_vassal_male_nemesis_possessive trigger = { @@ -3691,6 +3792,33 @@ RelationToMePossessive = { } } + text = { + localization_key = relation_fellow_vassal_male_nemesis_possessive + trigger = { + scope:second = { + is_female = no + has_relation_nemesis = root + is_independent_ruler = no + } + is_independent_ruler = no + liege = scope:second.liege + } + } + + text = { + localization_key = relation_fellow_vassal_male_rival_possessive + trigger = { + scope:second = { + is_female = no + has_relation_rival = root + NOT = { has_relation_nemesis = root } + is_independent_ruler = no + } + is_independent_ruler = no + liege = scope:second.liege + } + } + text = { localization_key = relation_nemesis_female_possessive trigger = { @@ -4077,6 +4205,30 @@ RelationToMePossessive = { } } + text = { + localization_key = relation_fellow_vassal_female_possessive + trigger = { + scope:second = { + is_female = yes + is_independent_ruler = no + } + is_independent_ruler = no + liege = scope:second.liege + } + } + + text = { + localization_key = relation_fellow_vassal_male_possessive + trigger = { + scope:second = { + is_female = no + is_independent_ruler = no + } + is_independent_ruler = no + liege = scope:second.liege + } + } + text = { localization_key = relation_councillor_female_possessive trigger = { @@ -4628,6 +4780,28 @@ RelationToMePossessive = { } } + text = { + localization_key = relation_follower_female_possessive + trigger = { + is_landed_or_landless_administrative = yes + scope:second = { + is_courtier_of = root + is_female = yes + } + } + } + + text = { + localization_key = relation_follower_male_possessive + trigger = { + is_landed_or_landless_administrative = yes + scope:second = { + is_courtier_of = root + is_male = yes + } + } + } + text = { localization_key = relation_courtier_female_possessive trigger = { @@ -4970,6 +5144,11 @@ RelationToMePossessive = { RelationToMeShort = { type = character + text = { + localization_key = relation_you + trigger = { scope:second = root } + } + text = { localization_key = relation_motherwife trigger = { @@ -5157,7 +5336,6 @@ RelationToMeShort = { this = root } } - is_alive = no is_concubine = no } } @@ -5178,7 +5356,6 @@ RelationToMeShort = { this = root } } - is_alive = no is_concubine = no } } @@ -6107,6 +6284,37 @@ RelationToMeShort = { } } + text = { + localization_key = duke_viceroyalty_female_byzantine_group + trigger = { + #culture = culture:greek + scope:second = { + is_female = yes + government_allows = administrative + } + any_vassal_or_below = { + this = scope:second + government_allows = administrative + } + } + } + + + text = { + localization_key = duke_viceroyalty_male_byzantine_group + trigger = { + #culture = culture:greek + scope:second = { + is_female = no + government_allows = administrative + } + any_vassal_or_below = { + this = scope:second + government_allows = administrative + } + } + } + text = { localization_key = relation_vassal_female trigger = { @@ -6131,6 +6339,30 @@ RelationToMeShort = { } } + text = { + localization_key = relation_fellow_vassal_female + trigger = { + scope:second = { + is_female = yes + is_independent_ruler = no + } + is_independent_ruler = no + liege = scope:second.liege + } + } + + text = { + localization_key = relation_fellow_vassal_male + trigger = { + scope:second = { + is_female = no + is_independent_ruler = no + } + is_independent_ruler = no + liege = scope:second.liege + } + } + text = { localization_key = relation_councillor_female trigger = { @@ -6554,6 +6786,28 @@ RelationToMeShort = { } } + text = { + localization_key = relation_follower_female + trigger = { + is_landed_or_landless_administrative = no + scope:second = { + is_courtier_of = root + is_female = yes + } + } + } + + text = { + localization_key = relation_follower_male + trigger = { + is_landed_or_landless_administrative = no + scope:second = { + is_courtier_of = root + is_male = yes + } + } + } + text = { localization_key = relation_courtier_female trigger = { @@ -7285,7 +7539,7 @@ MyCharacterIntroductionNoComma = { trigger = { is_councillor_of = scope:second has_council_position = councillor_court_chaplain - is_landed = yes + is_playable_character = yes NOR = { is_spouse_of = scope:second is_close_or_extended_family_of = scope:second @@ -7359,7 +7613,7 @@ YourCharacterIntroductionNoComma = { trigger = { is_councillor_of = scope:second has_council_position = councillor_court_chaplain - is_landed = yes + is_playable_character = yes NOR = { is_spouse_of = scope:second is_close_or_extended_family_of = scope:second @@ -7432,7 +7686,7 @@ HerHisCharacterIntroductionNoComma = { trigger = { is_councillor_of = scope:second has_council_position = councillor_court_chaplain - is_landed = yes + is_playable_character = yes NOR = { is_spouse_of = scope:second is_close_or_extended_family_of = scope:second @@ -7507,7 +7761,7 @@ NamePossessiveCharacterIntroductionNoComma = { trigger = { is_councillor_of = scope:second has_council_position = councillor_court_chaplain - is_landed = yes + is_playable_character = yes NOR = { is_spouse_of = scope:second is_close_or_extended_family_of = scope:second @@ -8485,6 +8739,73 @@ GetMumDad = { } } +StammerLetterMotherFather = { + type = character + + text = { + trigger = { is_female = yes } + localization_key = stammer_m + } + + text = { + trigger = { is_female = no } + localization_key = stammer_f + } +} + +GetYourConsortType = { + type = character + + # Wife. + text = { + trigger = { + is_female = yes + is_spouse_of = scope:second + } + localization_key = consort_wife + } + # Husband. + text = { + trigger = { + is_female = no + is_spouse_of = scope:second + } + localization_key = consort_husband + } + # Betrothed. + text = { + trigger = { betrothed ?= scope:second } + localization_key = consort_betrothed + } + # Concubinist. + text = { + trigger = { concubinist ?= scope:second } + localization_key = consort_concubinist + } + # Concubine. + text = { + trigger = { is_concubine_of = scope:second } + localization_key = consort_concubine + } + # Soulmate. + text = { + trigger = { has_relation_soulmate = scope:second } + localization_key = consort_soulmate + } + # Lover. + text = { + trigger = { has_relation_lover = scope:second } + localization_key = consort_lover + } + # They're just chambermates. + ## Fallback: should never be true. + text = { + trigger = { always = yes } + fallback = yes + localization_key = consort_good_friend + } +} + # For affectionate gendered references by age — so children and much younger characters are girl/boy, else, woman/man. GetWomanManGirlBoy = { type = character @@ -8546,3 +8867,18 @@ GetWomanManGirlBoy = { } } } + +# Doesn't include the apostrophe so that you can capitalise or not as you wish. +GetErIm = { + type = character + + text = { + trigger = { is_female = yes } + localization_key = abbreviated_er + } + + text = { + trigger = { is_female = no } + localization_key = abbreviated_im + } +} diff --git a/common/customizable_localization/00_rich_presence_flavor_status.txt b/common/customizable_localization/00_rich_presence_flavor_status.txt index f993f8befd..5216e50cd4 100644 --- a/common/customizable_localization/00_rich_presence_flavor_status.txt +++ b/common/customizable_localization/00_rich_presence_flavor_status.txt @@ -1,14 +1,92 @@ rich_presence_flavor_status = { type = character - text = { + text = { # Barbershop trigger = { is_game_view_open = barbershop } localization_key = rich_presence_barbershop } - - text = { + + text = { # Ergotism + trigger = { + has_trait = ergotism + } + localization_key = rich_presence_epidemic_ergotism + } + + text = { # Bubonic Plague + trigger = { + has_trait = bubonic_plague + } + localization_key = rich_presence_epidemic_bubonic_plague + } + + text = { # Epidemic + trigger = { + any_sub_realm_county = { + any_county_province = { + any_province_epidemic = { + count >= 1 + outbreak_intensity >= major + } + } + } + } + localization_key = rich_presence_epidemic + } + + text = { # Consumption + trigger = { + has_trait = consumption + } + localization_key = rich_presence_epidemic_consumption + } + + text = { # Typhus + trigger = { + has_trait = typhus + } + localization_key = rich_presence_epidemic_typhus + } + + text = { # Smallpox + trigger = { + has_trait = smallpox + } + localization_key = rich_presence_epidemic_smallpox + } + + text = { # Dysentery + trigger = { + has_trait = dysentery + } + localization_key = rich_presence_epidemic_dysentery + } + + # text = { # Seljuk Invasion + # trigger = { + # any_character_war = { + # using_cb = fp3_seljuk_invasion_cb + # } + # } + # localization_key = rich_presence_fp3_seljuk_invasion_cb + # } + + text = { # Legend + trigger = { + any_sub_realm_county = { + title_province = { + any_province_legend = { + legend_protagonist = root + } + } + } + } + localization_key = rich_presence_legend + } + + text = { # Great Holy War trigger = { is_in_ongoing_great_holy_war = yes } @@ -59,7 +137,16 @@ localization_key = rich_presence_prison } - text = { + text = { # Activity - Chariot + trigger = { + involved_activity ?= { + has_activity_type = activity_chariot_race + } + } + localization_key = rich_presence_chariot + } + + text = { # Activity - Pilgrimage trigger = { involved_activity ?= { has_activity_type = activity_pilgrimage @@ -182,7 +269,144 @@ localization_key = rich_presence_dying } - text = { + #Warcraft + text = { # Age 90+ + trigger = { + age >= age_90_value + } + localization_key = rich_presence_very_old + } + + # text = { # Suspicious Caliph + # trigger = { + # has_character_modifier = fp3_struggle_caliph_super_suspicious_modifier + # } + # localization_key = rich_presence_caliph_super_suspicious + # } + + # text = { # Post-Iranian Struggle - Rebuilding + # trigger = { + # house ?= { has_house_modifier = fp3_house_modifier_rebuilding_efforts } + # } + # localization_key = rich_presence_house_modifier_rebuilding_efforts + # } + + # text = { # Post-Iranian Struggle - New Frontiers + # trigger = { + # house ?= { has_house_modifier = fp3_house_modifier_frontier_ambitions } + # } + # localization_key = rich_presence_house_modifier_frontier_ambitions + # } + + # text = { # Post-Iranian Struggle - Destroyed Caliphate + # trigger = { + # house ?= { has_house_modifier = fp3_house_modifier_destroyed_the_caliphate } + # } + # localization_key = rich_presence_house_modifier_destroyed_the_caliphate + # } + + # text = { # Iranian Struggle Ending - Strengthening Caliphate + # trigger = { + # any_realm_county = { + # any_county_province = { geographical_region = world_persian_empire } + # } + # global_var:fp3_struggle_ending ?= flag:fp3_struggle_strengthen_caliphate_ending + # } + # localization_key = rich_presence_fp3_struggle_strengthen_caliphate_ending + # } + + # text = { # Iranian Struggle Ending - Rekindle Iran + # trigger = { + # any_realm_county = { + # any_county_province = { geographical_region = world_persian_empire } + # } + # global_var:fp3_struggle_ending ?= flag:fp3_struggle_rekindle_iran_ending + # } + # localization_key = rich_presence_fp3_struggle_rekindle_iran_ending + # } + + text = { # Kinslayer + trigger = { + has_trait = kinslayer + } + localization_key = rich_presence_kinslayer + } + + text = { # Cannibal + trigger = { + has_trait = cannibal + } + localization_key = rich_presence_cannibal + } + + text = { # Religious Head + trigger = { + faith.religious_head ?= { + this = root + } + } + localization_key = rich_presence_religion_head + } + + # text = { # Roman Empire + # trigger = { + # has_title = title:e_roman_empire + # } + # localization_key = rich_presence_rome + # } + + text = { # Incest + trigger = { + any_spouse = { + is_close_family_of = root + } + } + localization_key = rich_presence_loves_family_too_much + } + + text = { # Torturer + trigger = { + has_trait = torturer + } + localization_key = rich_presence_torturer + } + + text = { # Seducer + trigger = { + has_trait = seducer + } + localization_key = rich_presence_seduction + } + + text = { # Nemeses + trigger = { + num_of_relation_nemesis > 0 + } + localization_key = rich_presence_enemies + } + + text = { # Councillor + trigger = { + is_councillor = yes + } + localization_key = rich_presence_councillor + } + + text = { # Dog + trigger = { + has_named_dog_trigger = yes + } + localization_key = rich_presence_dog + } + + text = { # Cat + trigger = { + has_named_cat_trigger = yes + } + localization_key = rich_presence_cat + } + + text = { # House Feud setup_scope = { random_owned_story = { limit = { @@ -223,8 +447,10 @@ localization_key = rich_presence_house_unity_antagonistic } + text = { trigger = { + government_has_flag = government_is_clan OR = { any_tax_collector = { count = 0 } any_tax_collector = { diff --git a/common/customizable_localization/00_title_custom_loc.txt b/common/customizable_localization/00_title_custom_loc.txt index 4bfef529de..ea6a02b1e9 100644 --- a/common/customizable_localization/00_title_custom_loc.txt +++ b/common/customizable_localization/00_title_custom_loc.txt @@ -206,6 +206,7 @@ GetInOrOutsideRealm = { text = { localization_key = not_in_realm_current_situation trigger = { + NOT = { government_has_flag = government_is_landless_adventurer } scope:second = { is_independent_ruler = no any_liege_or_above = { @@ -217,6 +218,25 @@ GetInOrOutsideRealm = { text = { localization_key = in_realm_current_situation + trigger = { + NOT = { government_has_flag = government_is_landless_adventurer } + } + } + + text = { + localization_key = independent_realm_landless_current_situation + trigger = { + government_has_flag = government_is_landless_adventurer + scope:second.top_liege = scope:second + } + } + + text = { + localization_key = vassal_realm_landless_current_situation + trigger = { + government_has_flag = government_is_landless_adventurer + scope:second.top_liege != scope:second + } } } @@ -275,3 +295,216 @@ GetIncumbentOrNone_Possessive = { fallback = yes } } + +GetTierBaseTitleFemale = { + type = landed_title + + text = { + localization_key = emperor_female + trigger = { tier = tier_empire } + } + text = { + localization_key = king_female + trigger = { tier = tier_kingdom } + } + text = { + localization_key = duke_female + trigger = { tier = tier_duchy } + } + text = { + localization_key = count_female + trigger = { tier = tier_county } + } + text = { + localization_key = baron_female + trigger = { tier = tier_barony } + } +} + +GetTierBaseTitleMale = { + type = landed_title + + text = { + localization_key = emperor + trigger = { tier = tier_empire } + } + text = { + localization_key = king + trigger = { tier = tier_kingdom } + } + text = { + localization_key = duke + trigger = { tier = tier_duchy } + } + text = { + localization_key = count + trigger = { tier = tier_county } + } + text = { + localization_key = baron + trigger = { tier = tier_barony } + } +} + +GetTierBase = { + type = landed_title + + text = { + localization_key = empire + trigger = { tier = tier_empire } + } + text = { + localization_key = kingdom + trigger = { tier = tier_kingdom } + } + text = { + localization_key = duchy + trigger = { tier = tier_duchy } + } + text = { + localization_key = county + trigger = { tier = tier_county } + } + text = { + localization_key = barony + trigger = { tier = tier_barony } + } +} + +GetTierBasePlural = { + type = landed_title + + text = { + localization_key = game_concept_empires + trigger = { tier = tier_empire } + } + text = { + localization_key = game_concept_kingdoms + trigger = { tier = tier_kingdom } + } + text = { + localization_key = game_concept_duchies + trigger = { tier = tier_duchy } + } + text = { + localization_key = game_concept_counties + trigger = { tier = tier_county } + } + text = { + localization_key = game_concept_baronies + trigger = { tier = tier_barony } + } +} + +GetTierBaseConcept = { + type = landed_title + + text = { + localization_key = concept_empire + trigger = { tier = tier_empire } + } + text = { + localization_key = concept_kingdom + trigger = { tier = tier_kingdom } + } + text = { + localization_key = concept_duchy + trigger = { tier = tier_duchy } + } + text = { + localization_key = concept_county + trigger = { tier = tier_county } + } + text = { + localization_key = concept_barony + trigger = { tier = tier_barony } + } +} + +GetCoRulerDiffGenderBestTitle = { + type = character + + # If our liege has a primary spouse, and that spouse isn't a ruler, try to take their title. + text = { + localization_key = GetCoRulerDiffGenderBestTitle_Spouse + trigger = { + liege.primary_spouse ?= { is_ruler = no } + } + } + # Else, fall back on doing it by tier. + ## Empire. + text = { + localization_key = councillor_spouse_empress + trigger = { + is_female = yes + liege.highest_held_title_tier >= tier_empire + } + } + text = { + localization_key = councillor_spouse_emperor + trigger = { + is_male = yes + liege.highest_held_title_tier >= tier_empire + } + } + ## Kingdom. + text = { + localization_key = councillor_spouse_queen + trigger = { + is_female = yes + liege.highest_held_title_tier >= tier_kingdom + } + } + text = { + localization_key = councillor_spouse_king + trigger = { + is_male = yes + liege.highest_held_title_tier >= tier_kingdom + } + } + ## Duchy. + text = { + localization_key = councillor_spouse_duchess + trigger = { + is_female = yes + liege.highest_held_title_tier >= tier_duchy + } + } + text = { + localization_key = councillor_spouse_duke + trigger = { + is_male = yes + liege.highest_held_title_tier >= tier_duchy + } + } + ## County. + text = { + localization_key = councillor_spouse_countess + trigger = { + is_female = yes + liege.highest_held_title_tier >= tier_county + } + } + text = { + localization_key = councillor_spouse_count + trigger = { + is_male = yes + liege.highest_held_title_tier >= tier_county + } + } + ## Barony. + text = { + localization_key = councillor_spouse_baroness + trigger = { + is_female = yes + liege.highest_held_title_tier >= tier_barony + } + } + text = { + localization_key = councillor_spouse_baron + trigger = { + is_male = yes + liege.highest_held_title_tier >= tier_barony + } + } +} diff --git a/common/customizable_localization/01_ep1_custom_loc.txt b/common/customizable_localization/01_ep1_custom_loc.txt index 02d1c496a7..a18ace137e 100644 --- a/common/customizable_localization/01_ep1_custom_loc.txt +++ b/common/customizable_localization/01_ep1_custom_loc.txt @@ -281,6 +281,14 @@ InspirationTypeDescription = { } localization_key = research_inspiration_description } + text = { + trigger = { + inspiration = { + has_inspiration_type = religious_inspiration + } + } + localization_key = religious_inspiration_description + } #Alchemy is added as separate instances here since they need different sentence starters text = { trigger = { @@ -393,6 +401,12 @@ InspirationTypeDescriptionPast = { } localization_key = research_inspiration_description_past } + text = { + trigger = { + var:created_artifact_type = flag:major_religious_inspiration + } + localization_key = religious_inspiration_description_past + } } # Artisan (in here instead of by the other artifact custom locs because this one is only of use in the inspiration since it's not one single effect used in the completion event but many different ones, depending) @@ -467,6 +481,11 @@ InspirationArtisanType = { } localization_key = inspiration_artisan_type_urn } + + text = { + trigger = { var:artifact_artisan_type = flag:artisan_type_icon } + localization_key = inspiration_artisan_type_icon + } } # Smith (in here instead of by the other artifact custom locs because this one is only of use in the inspiration since it's not one single effect used in the completion event but many different ones, depending) @@ -500,6 +519,14 @@ InspirationSmithType = { } localization_key = inspiration_smith_type_goblet } + + text = { # + trigger = { + var:artifact_smith_type = flag:smith_type_aquamanile + } + localization_key = inspiration_smith_type_aquamanile + } + text = { # trigger = { var:artifact_smith_type = flag:smith_type_incense_burner_sculpture @@ -1073,7 +1100,7 @@ GetLocalRole = { localization_key = local_role_monk } text = { - trigger = { is_landed = yes } + trigger = { is_playable_character = yes } localization_key = local_role_landed } text = { @@ -1188,6 +1215,12 @@ GetInspirationOwnerType = { } localization_key = inspiration_owner_type_researcher } + text = { + trigger = { + inspiration = { has_inspiration_type = religious_inspiration } + } + localization_key = inspiration_owner_type_theologian + } text = { trigger = { always = no } fallback = yes @@ -1273,7 +1306,12 @@ GetInspirationTypeTool = { } text = { trigger = { - inspiration = { has_inspiration_type = research_inspiration } + inspiration = { + OR = { + has_inspiration_type = research_inspiration + has_inspiration_type = religious_inspiration + } + } } localization_key = inspiration_type_tool_books } @@ -1361,7 +1399,12 @@ GetInspirationTypeStation = { } text = { trigger = { - inspiration = { has_inspiration_type = research_inspiration } + inspiration = { + OR = { + has_inspiration_type = research_inspiration + has_inspiration_type = religious_inspiration + } + } } localization_key = inspiration_type_station_library } @@ -1476,7 +1519,12 @@ GetInspirationTypeVerb = { } text = { trigger = { - inspiration = { has_inspiration_type = alchemy_inspiration } + inspiration = { + OR = { + has_inspiration_type = alchemy_inspiration + has_inspiration_type = religious_inspiration + } + } } localization_key = inspiration_type_verb_study } @@ -1626,6 +1674,13 @@ GetInspirationMaterialType = { } localization_key = inspiration_type_material_clay } + text = { + trigger = { + inspiration = { has_inspiration_type = artisan_inspiration } + var:artifact_artisan_type = flag:artisan_type_icon + } + localization_key = inspiration_type_material_wood + } text = { trigger = { inspiration = { has_inspiration_type = alchemy_inspiration } @@ -1676,6 +1731,11 @@ InspirationArtisanBaseType = { trigger = { var:artifact_artisan_type = flag:artisan_type_urn } localization_key = inspiration_artisan_base_type_urn } + + text = { + trigger = { var:artifact_artisan_type = flag:artisan_type_icon } + localization_key = inspiration_artisan_base_type_icon + } } InspirationSmithBaseType = { @@ -1711,6 +1771,7 @@ InspirationArtisanToolType = { NOR = { var:artifact_artisan_type = flag:artisan_type_sculpture var:artifact_artisan_type = flag:artisan_type_urn + var:artifact_artisan_type = flag:artisan_type_icon } } localization_key = inspiration_type_tool_plane @@ -1721,6 +1782,7 @@ InspirationArtisanToolType = { NOR = { var:artifact_artisan_type = flag:artisan_type_sculpture var:artifact_artisan_type = flag:artisan_type_urn + var:artifact_artisan_type = flag:artisan_type_icon } } localization_key = inspiration_type_tool_saw @@ -1731,6 +1793,7 @@ InspirationArtisanToolType = { NOR = { var:artifact_artisan_type = flag:artisan_type_sculpture var:artifact_artisan_type = flag:artisan_type_urn + var:artifact_artisan_type = flag:artisan_type_icon } } localization_key = inspiration_type_tool_awl @@ -1746,6 +1809,11 @@ InspirationArtisanToolType = { localization_key = inspiration_type_tool_hammer } + text = { + trigger = { var:artifact_artisan_type = flag:artisan_type_icon } + localization_key = inspiration_type_tool_paint_brush + } + text = { trigger = { always = no } fallback = yes @@ -1766,6 +1834,12 @@ InspirationArtisanJobType = { localization_key = inspiration_artisan_job_type_potter } + text = { + trigger = { var:artifact_artisan_type = flag:artisan_type_icon } + localization_key = inspiration_artisan_job_type_painter + } + + text = { trigger = { NOR = { @@ -1824,80 +1898,79 @@ InspirationBannerType = { } } - -GetTargetCourtPosition = {#Warcraft +GetTargetCourtPosition = { type = character text = { - trigger = { var:target_court_position = flag:royal_architect } + trigger = { var:target_court_position ?= flag:royal_architect } localization_key = court_position_architect } text = { - trigger = { var:target_court_position = flag:seneschal } + trigger = { var:target_court_position ?= flag:seneschal } localization_key = court_position_seneschal } text = { - trigger = { var:target_court_position = flag:court_tutor } + trigger = { var:target_court_position ?= flag:court_tutor } localization_key = court_position_tutor } text = { - trigger = { var:target_court_position = flag:high_almoner } + trigger = { var:target_court_position ?= flag:high_almoner } localization_key = court_position_almoner } text = { - trigger = { var:target_court_position = flag:court_physician } + trigger = { var:target_court_position ?= flag:court_physician } localization_key = court_position_physician } text = { - trigger = { var:target_court_position = flag:antiquarian } + trigger = { var:target_court_position ?= flag:antiquarian } localization_key = court_position_antiquarian } text = { - trigger = { var:target_court_position = flag:master_of_horse } + trigger = { var:target_court_position ?= flag:master_of_horse } localization_key = court_position_horse } text = { - trigger = { var:target_court_position = flag:bodyguard } + trigger = { var:target_court_position ?= flag:bodyguard } localization_key = court_position_bodyguard } text = { - trigger = { var:target_court_position = flag:champion } + trigger = { var:target_court_position ?= flag:champion } localization_key = court_position_champion } text = { - trigger = { var:target_court_position = flag:master_of_hunt } + trigger = { var:target_court_position ?= flag:master_of_hunt } localization_key = court_position_hunt } text = { - trigger = { var:target_court_position = flag:court_poet } + trigger = { var:target_court_position ?= flag:court_poet } localization_key = court_position_poet } text = { - trigger = { var:target_court_position = flag:court_musician } + trigger = { var:target_court_position ?= flag:court_musician } localization_key = court_position_musician } text = { - trigger = { var:target_court_position = flag:cupbearer } + trigger = { var:target_court_position ?= flag:cupbearer } localization_key = court_position_cupbearer } text = { - trigger = { var:target_court_position = flag:lady_in_waiting } + trigger = { var:target_court_position ?= flag:lady_in_waiting } localization_key = court_position_lady } text = { - trigger = { var:target_court_position = flag:chief_eunuch } + trigger = { var:target_court_position ?= flag:chief_eunuch } localization_key = court_position_eunuch } text = { - trigger = { var:target_court_position = flag:court_gardener } + trigger = { var:target_court_position ?= flag:court_gardener } localization_key = court_position_gardener } text = { - trigger = { var:target_court_position = flag:court_artificer } + trigger = { var:target_court_position ?= flag:court_artificer } localization_key = court_position_artificer } text = { - trigger = { var:target_court_position = flag:cultural_emissary } + trigger = { var:target_court_position ?= flag:cultural_emissary } localization_key = court_position_emissary } #text = { @@ -1914,12 +1987,40 @@ GetTargetCourtPosition = {#Warcraft #} # Warcraft text = { - trigger = { var:target_court_position = flag:travel_leader } + trigger = { var:target_court_position ?= flag:travel_leader } localization_key = court_position_travel_leader } + text = { + trigger = { var:target_court_position ?= flag:keeper_of_swans } + localization_key = court_position_keeper_of_swans + } + text = { + trigger = { var:target_court_position ?= flag:chronicler } + localization_key = court_position_chronicler + } + text = { + trigger = { var:target_court_position ?= flag:charioteer } + localization_key = court_position_charioteer + } + text = { + trigger = { var:target_court_position ?= flag:bookmaker } + localization_key = court_position_bookmaker + } + text = { + trigger = { var:target_court_position ?= flag:executioner } + localization_key = court_position_executioner + } + text = { + trigger = { var:target_court_position ?= flag:food_taster } + localization_key = court_position_food_taster + } + text = { + trigger = { var:target_court_position ?= flag:court_jester } + localization_key = court_position_court_jester + } } -GetTargetCourtPositionDesc = {#Warcraft +GetTargetCourtPositionDesc = { type = character text = { @@ -2011,4 +2112,176 @@ GetTargetCourtPositionDesc = {#Warcraft trigger = { var:target_court_position = flag:travel_leader } localization_key = court_position_desc_travel_leader } + text = { + trigger = { var:target_court_position = flag:keeper_of_swans } + localization_key = court_position_desc_keeper_of_swans + } + text = { + trigger = { var:target_court_position ?= flag:chronicler } + localization_key = court_position_desc_chronicler + } + text = { + trigger = { var:target_court_position ?= flag:charioteer } + localization_key = court_position_desc_charioteer + } + text = { + trigger = { var:target_court_position ?= flag:bookmaker } + localization_key = court_position_desc_bookmaker + } + text = { + trigger = { var:target_court_position ?= flag:executioner } + localization_key = court_position_desc_executioner + } + text = { + trigger = { var:target_court_position ?= flag:food_taster } + localization_key = court_position_desc_food_taster + } + text = { + trigger = { var:target_court_position ?= flag:court_jester } + localization_key = court_position_desc_court_jester + } +} + +GetCourtPositionSubject = { + type = character + random_valid = yes + + text = { + trigger = { has_court_position = champion_court_position } + localization_key = court_position_subject_swords + } + # text = { + # trigger = { has_court_position = garuda_court_position } + # localization_key = court_position_subject_honor + # } + text = { + trigger = { has_court_position = bodyguard_court_position } + localization_key = court_position_subject_patrols + } + # text = { + # trigger = { has_court_position = akolouthos_court_position } + # localization_key = court_position_subject_raiding + # } + text = { + trigger = { has_court_position = master_assassin_court_position } + localization_key = court_position_subject_daggers + } + text = { + trigger = { has_court_position = court_gardener_court_position } + localization_key = court_position_subject_flowers + } + text = { + trigger = { has_court_position = court_physician_court_position } + localization_key = court_position_subject_poultices + } + text = { + trigger = { has_court_position = court_artificer_court_position } + localization_key = court_position_subject_anvils + } + text = { + trigger = { has_court_position = antiquarian_court_position } + localization_key = court_position_subject_relics + } + text = { + trigger = { has_court_position = court_poet_court_position } + localization_key = court_position_subject_rhyming + } + text = { + trigger = { has_court_position = court_scholar_court_position } + localization_key = court_position_subject_astrology + } + text = { + trigger = { has_court_position = chronicler_court_position} + localization_key = court_position_subject_metaphors + } + text = { + trigger = { has_court_position = cultural_emissary_court_position } + localization_key = court_position_subject_delegations + } + text = { + trigger = { has_court_position = executioner_court_position } + localization_key = court_position_subject_axes + } + text = { + trigger = { has_court_position = keeper_of_swans_court_position } + localization_key = court_position_subject_waterfowl + } + text = { + trigger = { has_court_position = travel_leader_court_position } + localization_key = court_position_subject_caravans + } + text = { + trigger = { has_court_position = wet_nurse_court_position } + localization_key = court_position_subject_cribs + } + text = { + trigger = { has_court_position = court_tutor_court_position } + localization_key = court_position_subject_teaching + } + text = { + trigger = { has_court_position = food_taster_court_position } + localization_key = court_position_subject_poisons + } + text = { + trigger = { has_court_position = master_of_hunt_court_position } + localization_key = court_position_subject_archery + } + text = { + trigger = { has_court_position = royal_architect_court_position } + localization_key = court_position_subject_archways + } + text = { + trigger = { has_court_position = high_almoner_court_position } + localization_key = court_position_subject_poor_houses + } + text = { + trigger = { has_court_position = seneschal_court_position } + localization_key = court_position_subject_sculleries + } + text = { + trigger = { has_court_position = cupbearer_court_position } + localization_key = court_position_subject_goblets + } + text = { + trigger = { has_court_position = chief_eunuch_court_position } + localization_key = court_position_subject_discretion + } + text = { + trigger = { has_court_position = court_jester_court_position } + localization_key = court_position_subject_jokes + } + text = { + trigger = { has_court_position = court_musician_court_position } + localization_key = court_position_subject_melody + } + text = { + trigger = { has_court_position = cave_hermit_court_position } + localization_key = court_position_subject_isolation + } + text = { + trigger = { has_court_position = master_of_horse_court_position } + localization_key = court_position_subject_saddles + } + text = { + trigger = { has_court_position = lady_in_waiting_court_position } + localization_key = court_position_subject_etiquette + } + # text = { + # trigger = { has_court_position = chief_qadi_court_position } + # localization_key = court_position_subject_statutes + # } + text = { + trigger = { has_court_position = charioteer_court_position } + localization_key = court_position_subject_race_horses + } + text = { + trigger = { has_court_position = bookmaker_court_position } + localization_key = court_position_subject_betting_odds + } + text = { + trigger = { always = no } + fallback = yes + localization_key = court_position_subject_work + } } + diff --git a/common/customizable_localization/04_ep2_hunt_custom_loc.txt b/common/customizable_localization/04_ep2_hunt_custom_loc.txt index 2adc723e70..e6110ae5a8 100644 --- a/common/customizable_localization/04_ep2_hunt_custom_loc.txt +++ b/common/customizable_localization/04_ep2_hunt_custom_loc.txt @@ -2716,7 +2716,6 @@ GetTerrainType = { trigger = { OR = { terrain = plains - terrain = hills terrain = steppe } } @@ -2727,7 +2726,6 @@ GetTerrainType = { trigger = { OR = { terrain = plains - terrain = hills terrain = steppe } } @@ -2738,6 +2736,7 @@ GetTerrainType = { trigger = { OR = { terrain = mountains + terrain = hills terrain = desert_mountains } } @@ -2758,6 +2757,7 @@ GetTerrainType = { trigger = { OR = { terrain = mountains + terrain = hills terrain = desert_mountains } } @@ -2800,7 +2800,6 @@ GetTerrainType = { trigger = { OR = { terrain = mountains - terrain = hills terrain = desert_mountains } } diff --git a/common/customizable_localization/05_bp2_custom_loc.txt b/common/customizable_localization/05_bp2_custom_loc.txt index 9860e6876b..9f1d180497 100644 --- a/common/customizable_localization/05_bp2_custom_loc.txt +++ b/common/customizable_localization/05_bp2_custom_loc.txt @@ -71,18 +71,27 @@ GetHerHisOpposite = { } } -GetHerHimOpposite = { +GetRandomWomanMan = { + type = character + random_valid = yes + + text = { localization_key = CHARACTER_WOMAN } + + text = { localization_key = CHARACTER_MAN } +} + +GetWomanManOpposite = { type = character random_valid = yes text = { trigger = { is_female = yes } - localization_key = CHARACTER_HERHIM_HIM + localization_key = CHARACTER_MAN } text = { trigger = { is_male = yes } - localization_key = CHARACTER_HERHIM_HER + localization_key = CHARACTER_WOMAN } } diff --git a/common/customizable_localization/99_fr_custom_loc.txt b/common/customizable_localization/99_fr_custom_loc.txt index a350d1f9b9..c15d9ed049 100644 --- a/common/customizable_localization/99_fr_custom_loc.txt +++ b/common/customizable_localization/99_fr_custom_loc.txt @@ -21,7 +21,7 @@ # FR_EteEtesse (poète\poétesse ; Pluriel ; Sans espace avant) # FR_EtEte (secret\secrète, inquiet\inquiète ; Pluriel ; Sans espace avant) # FR_EtEtte (cet\cette; muet\muette ; Pluriel ; Sans espace avant) -# FR_EurEresse (chasseur\chasseresse ; Pluriel ; Sans espace avant) +# FR_EurEresse (chasseur\chasseresse, vengeur\vengeresse ; Pluriel ; Sans espace avant) # FR_EurRice (Pluriel ; Sans espace avant) # FR_FVe (lascif\lascive ; Pluriel ; Sans espace avant) # FR_IeuxIeille (vieux\vieille ; Sans espace avant) @@ -30,7 +30,7 @@ # FR_OnA (mon\ma, son\sa ; Sans espace avant) # FR_OnAOpp (Sans espace avant) # FR_OuOlle (fou\folle, mou\molle ; Pluriel ; Sans espace avant) -# FR_RSe (Pluriel ; Sans espace avant) +# FR_RSe (entremetteur\entremetteuse ; Pluriel ; Sans espace avant) # FR_Hesse (duc\duchesse ; Pluriel ; Sans espace avant) # FR_SSse (gros\grosse, las\lasse ; Sans espace avant) # FR_TTte (sot\sotte ; Pluriel ; Sans espace avant) @@ -44,8 +44,6 @@ # FR_AuxAles (vassaux\vassales, égaux\égales ; Pluriel ; Sans espace avant) # FR_Es (assis\assises ; Pluriel ; Sans espace avant) # FR_SEs (amis\amies ; Pluriel ; Sans espace avant) -# FR_EuxElles (eux\elles ; Pluriel) -# FR_IlsElles (ils\elles ; Pluriel) # FR_STes (tous\toutes ; Pluriel ; Sans espace avant) # FR_XSes (pieux\pieuses ; Pluriel ; Sans espace avant) # FR_AinIne (copain\copine ; Sans espace avant) @@ -60,7 +58,9 @@ # FR_CeluiCelle # FR_IlElle # FR_LuiElle - +# FR_LequelLaquelle +# FR_EuxElles (eux\elles ; Pluriel) +# FR_IlsElles (ils\elles ; Pluriel) # FR_EluiElle (e lui\’elle ; Sans espace avant) # FR_SilSielle (s’il\si elle) # FR_SilsSielles (s’ils\si elles ; Pluriel) @@ -80,9 +80,9 @@ # FR_GarconFille (Pluriel) # FR_ServiteurServante (Pluriel) -########################################### -# II. REMPLACEMENT DE COMMANDES ANGLAISES # -########################################### +################################# +# II. REMPLACEMENT DE COMMANDES # +################################# # FR_RelationToMe_OnA - mon\ma + RelationToMe # FR_RelationToMe_Le - le\la + RelationToMe # FR_RelationToMeShort_OnA - mon\ma + RelationToMeShort @@ -118,20 +118,18 @@ # FR_GetUnbelieverTerm_Gender pour GetUnbelieverTerm # FR_GetCrime_Nickname pour GetCrime # FR_GetInspirationTypeVerb_Inf pour GetInspirationTypeVerb +# FR_au_BG_GameType pour BG_GameType +# FR_de_BG_GameType pour BG_GameType +# FR_CouncilPosition_Le pour CouncilPosition +# FR_GetRandomWonContest_Le pour GetRandomWonContest +# FR_GetRealmOrDomicileConcept_FR_Le pour GetRealmOrDomicileConcept +# FR_GetCourtOwnerConcept_FR_Du pour GetCourtOwnerConcept # FR_FaithGenderedAdj - GetFaith.GetAdjective\GetFaith.GetAdherentName (scope: character) -# FR_LocalAnimal_e - "e" du féminin pour LocalAnimal -# FR_LocalAnimal_d - de\d’ pour LocalAnimal (Sans espace après) -# FR_LocalAnimal_he - "he" du féminin pour LocalAnimal (blanc/blanche) -# FR_LocalAnimal_le - devant LocalAnimal (Sans espace après) # FR_Scheme_FullAction - GetActionName - SCHEME_FULL_ACTION_NAME -# FR_CatStory_e -# FR_CatStory_le -# FR_DogStory_e -# FR_DogStory_le ################################## -# III. ARTICLES DEVANT COMMANDES # +# III. COMMANDES SUPPLEMENTAIRES # ################################## # - Char: commande de base # - Char_L: affiche "le/la" pour "sans terre" @@ -163,7 +161,7 @@ # FR_du_Char # FR_au_Char -# FR_only_de_HouseOfWorshipPlural devant HouseOfWorshipPlural (Sans espace après) +# FR_De_HouseOfWorshipPlural devant HouseOfWorshipPlural (Sans espace après) # FR_GetInspirationOwnerType_OnA devant GetInspirationOwnerType (Sans espace avant ; Sans espace après) # FR_GetInspirationTypeRoom_Le devant GetInspirationTypeRoom (Sans espace après) # FR_GetInspirationTypeRoom_Du devant GetInspirationTypeRoom (Sans espace après) @@ -175,13 +173,99 @@ # FR_GetInspirationTypeObject_Le devant GetInspirationTypeObject (Sans espace apres) # FR_InspirationSmithBaseType_OnA devant InspirationSmithBaseType (Sans espace avant ; Sans espace apres) # FR_InspirationSmithBaseType_Le devant InspirationSmithBaseType (Sans espace apres) +# FR_Le_GetVersusRound devant GetVersusRound + +# FR_Artifact_OnA devant une commande d'artefact (Avec espace apres) +# FR_Le_ArtifactType devant le type d'artefact (Sans espace apres) +# FR_E_ArtifactType pour le type d'artefact + +# FR_ActivityShort_template +# FR_Le_ActivityShort devant l'activité GetShortName (Sans espace apres) +# FR_Au_ActivityShort devant l'activité GetShortName (Sans espace apres) +# FR_Du_ActivityShort devant l'activité GetShortName (Sans espace apres) +# FR_E_Activity devant l'activité GetName ou GetShortName (Sans espace apres) +# FR_ActivityFull_template +# FR_Le_ActivityFull devant l'activité GetName (Sans espace apres) +# FR_Au_ActivityFull devant l'activité GetName (Sans espace apres) +# FR_Du_ActivityFull devant l'activité GetName (Sans espace apres) + +# FR_ActivityPhase_template +# FR_Le_ActivityPhase +# FR_Du_ActivityPhase +# FR_Au_ActivityPhase +# FR_E_ActivityPhase + +# FR_Le_ArtifactAnimalType +# FR_Du_ArtifactAnimalType +# FR_Au_ArtifactAnimalType +# FR_De_ArtifactAnimalType +# FR_E_ArtifactAnimalType +# FR_Le_GetAnimalType +# FR_Du_GetAnimalType +# FR_Au_GetAnimalType +# FR_De_GetAnimalType devant GetAnimalType ou GetAnimalPlural +# FR_E_GetAnimalType pour GetAnimalType ou GetAnimalPlural +# FR_Le_GetAnimalTypeCaptive +# FR_Du_GetAnimalTypeCaptive +# FR_Au_GetAnimalTypeCaptive +# FR_De_GetAnimalTypeCaptive +# FR_E_GetAnimalTypeCaptive +# FR_Le_GetAnimalTypeGamebird +# FR_Du_GetAnimalTypeGamebird +# FR_Au_GetAnimalTypeGamebird +# FR_De_GetAnimalTypeGamebird +# FR_E_GetAnimalTypeGamebird +# FR_Le_GetAnimalTypeKill +# FR_Du_GetAnimalTypeKill +# FR_Au_GetAnimalTypeKill +# FR_De_GetAnimalTypeKill +# FR_E_GetAnimalTypeKill +# FR_Le_GetAnimalTypeMismanaged +# FR_Du_GetAnimalTypeMismanaged +# FR_Au_GetAnimalTypeMismanaged +# FR_De_GetAnimalTypeMismanaged +# FR_E_GetAnimalTypeMismanaged +# FR_Le_GetAnimalTypeTame +# FR_Du_GetAnimalTypeTame +# FR_Au_GetAnimalTypeTame +# FR_De_GetAnimalTypeTame +# FR_E_GetAnimalTypeTame +# FR_Le_GetAnimalTypeWaterfowl +# FR_Du_GetAnimalTypeWaterfowl +# FR_Au_GetAnimalTypeWaterfowl +# FR_De_GetAnimalTypeWaterfowl +# FR_E_GetAnimalTypeWaterfowl +# FR_Le_GetRaptorType +# FR_Du_GetRaptorType +# FR_Au_GetRaptorType +# FR_De_GetRaptorType +# FR_E_GetRaptorType +# FR_Le_GetRegionalDeerType +# FR_Du_GetRegionalDeerType +# FR_Au_GetRegionalDeerType +# FR_De_GetRegionalDeerType +# FR_E_GetRegionalDeerType +# FR_Le_GetRegionalEagleType +# FR_Du_GetRegionalEagleType +# FR_Au_GetRegionalEagleType +# FR_De_GetRegionalEagleType +# FR_E_GetRegionalEagleType +# FR_Le_GetRegionalWolfType +# FR_Du_GetRegionalWolfType +# FR_Au_GetRegionalWolfType +# FR_De_GetRegionalWolfType +# FR_E_GetRegionalWolfType +# FR_Le_RegionalFerociousAnimal +# FR_Du_RegionalFerociousAnimal +# FR_Au_RegionalFerociousAnimal +# FR_De_RegionalFerociousAnimal +# FR_E_RegionalFerociousAnimal +# FR_E_GetRandomRegionalSmallGame ################################################################## ################################################################## -# log_loc_errors = no # peut être ajouté pour masquer les erreurs - -FR_gender_fake = { # all gender custom commands are based on it +FR_gender_template = { # all basic gendered character custom commands are based on it type = character log_loc_errors = no text = { @@ -212,307 +296,307 @@ FR_gender_fake = { # all gender custom commands are based on it FR_AlAla = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = AlAla } FR_AuAla = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = AuAla } FR_AuxAles = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = AuxAles } FR_CeluiCelle = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = CeluiCelle } FR_DDe = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = DDe } FR_DuDela = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = DuDela } FR_E = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = E } FR_EauElle = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EauElle } FR_EauxElles = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EauxElles } FR_EEsse = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EEsse } FR_EEtte = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EEtte } FR_EfEve = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EfEve } FR_EluiElle = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EluiElle } FR_EOpp = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EOpp } FR_EpouxEpouse = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EpouxEpouse } FR_EpouxEpouseOpp = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EpouxEpouseOpp } FR_ErEre = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = ErEre } FR_Eresse = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = Eresse } FR_Es = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = Es } FR_SEs = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = SEs } FR_EteEtesse = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EteEtesse } FR_EtEte = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EtEte } FR_EtEtte = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EtEtte } FR_EurEresse = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EurEresse } FR_EurRice = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EurRice } FR_EuxElles = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = EuxElles } FR_FVe = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = FVe } FR_GarconFille = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = GarconFille } FR_He = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = He } FR_Hesse = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = Hesse } FR_IeuxIeille = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = IeuxIeille } FR_IlElle = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = IlElle } FR_IlsElles = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = IlsElles } FR_LeLa = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = LeLa } FR_LeLaOpp = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = LeLaOpp } FR_LLa = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = LLa } FR_LLle = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = LLle } FR_LuiElle = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = LuiElle } FR_MonseigneurMadame = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = MonseigneurMadame } FR_NNne = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = NNne } FR_OnA = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = OnA } FR_OnAOpp = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = OnAOpp } FR_OuOlle = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = OuOlle } FR_PaternelMaternel = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = PaternelMaternel } FR_RSe = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = RSe } FR_SeigneurDame = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = SeigneurDame } FR_ServiteurServante = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = ServiteurServante } FR_SieurDame = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = SieurDame } FR_SilSielle = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = SilSielle } FR_SilsSielles = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = SilsSielles } FR_SSse = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = SSse } FR_STes = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = STes } FR_XSes = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = XSes } FR_Te = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = Te } FR_TTte = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = TTte } FR_XCe = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = XCe } FR_XSe = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = XSe } FR_XSeOpp = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = XSeOpp } FR_XSse = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = XSse } FR_AinIne = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = AinIne } FR_LequelLaquelle = { log_loc_errors = no - parent = FR_gender_fake + parent = FR_gender_template suffix = LequelLaquelle } ############################################# @@ -817,6 +901,18 @@ FR_GetRandomRegionalWildDaytimeBird_Plural = { suffix = _FR_Plural } +FR_GetRealmOrDomicileConcept_FR_Le = { + log_loc_errors = no + parent = GetRealmOrDomicileConcept + suffix = _FR_Le +} + +FR_GetCourtOwnerConcept_FR_Du = { + log_loc_errors = no + parent = GetCourtOwnerConcept + suffix = _FR_Du +} + ############################################# ############################################# FR_FaithGenderedAdj = { @@ -1436,91 +1532,91 @@ FR_Scheme_FullAction = { log_loc_errors = no text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = abduct } localization_key = CustomLoc_FR_Scheme_FullAction_abduct_you } text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = befriend } localization_key = CustomLoc_FR_Scheme_FullAction_befriend_you } text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = claim_throne } localization_key = CustomLoc_FR_Scheme_FullAction_claim_throne_you } text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = convert_to_witchcraft } localization_key = CustomLoc_FR_Scheme_FullAction_convert_to_witchcraft_you } text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = courting } localization_key = CustomLoc_FR_Scheme_FullAction_courting_you } text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = elope } localization_key = CustomLoc_FR_Scheme_FullAction_elope_you } text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = fabricate_hook } localization_key = CustomLoc_FR_Scheme_FullAction_fabricate_hook_you } text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = learn_language } localization_key = CustomLoc_FR_Scheme_FullAction_learn_language_you } text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = murder } localization_key = CustomLoc_FR_Scheme_FullAction_murder_you } text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = overthrow_regent } localization_key = CustomLoc_FR_Scheme_FullAction_overthrow_regent_you } text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = seduce } localization_key = CustomLoc_FR_Scheme_FullAction_seduce_you } text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = steal_back_artifact } localization_key = CustomLoc_FR_Scheme_FullAction_steal_back_artifact_you } text = { trigger = { - scheme_target = { is_local_player = yes } + scheme_target_character = { is_local_player = yes } scheme_type = sway } localization_key = CustomLoc_FR_Scheme_FullAction_sway_you @@ -2662,3 +2758,93 @@ FR_Le_GetVersusRound = { parent = GetVersusRound suffix = _FR_Le } + +FR_ResidenceBuilding_OnA = { + log_loc_errors = no + parent = ResidenceBuilding + suffix = _FR_On +} + +FR_ResidenceBuilding_Le = { + log_loc_errors = no + parent = ResidenceBuilding + suffix = _FR_Le +} + +FR_ResidenceBuilding_Du = { + log_loc_errors = no + parent = ResidenceBuilding + suffix = _FR_Du +} + +FR_ResidenceBuilding_Au = { + log_loc_errors = no + parent = ResidenceBuilding + suffix = _FR_Au +} + +FR_GetCourt_Le = { + log_loc_errors = no + parent = GetCourt + suffix = _FR_Le +} + +FR_GetCourt_Du = { + log_loc_errors = no + parent = GetCourt + suffix = _FR_Du +} + +FR_GetCourt_Au = { + log_loc_errors = no + parent = GetCourt + suffix = _FR_Au +} + +FR_GetCourt_OnA = { + log_loc_errors = no + parent = GetCourt + suffix = _FR_On +} + +FR_GetCourtConcept_Le = { + log_loc_errors = no + parent = GetCourtConcept + suffix = _FR_Le +} + +FR_GetCourtConcept_Au = { + log_loc_errors = no + parent = GetCourtConcept + suffix = _FR_Au +} + +FR_GetCourtyard_Le = { + log_loc_errors = no + parent = GetCourtyard + suffix = _FR_Le +} + +FR_GetDoor_Le = { + log_loc_errors = no + parent = GetDoor + suffix = _FR_Le +} + +FR_GetAdventureNamePrefixes_Pl = { + log_loc_errors = no + parent = GetAdventureNamePrefixes + suffix = _FR_Pl +} + +FR_GetAdventureNameSuffix_Du = { + log_loc_errors = no + parent = GetAdventureNameSuffix + suffix = _FR_Du +} + +FR_GetCourtTypeConcept_Au = { + log_loc_errors = no + parent = GetCourtTypeConcept + suffix = _FR_Au +} From 32bd28123b306b3302b56007764dff2e2e108f01 Mon Sep 17 00:00:00 2001 From: name Date: Wed, 25 Sep 2024 02:34:55 -0400 Subject: [PATCH 3/3] override_death_effect --- .../story_cycles/wc_story_cycle_thunder_king.txt | 2 +- .../hold_court_events_general.txt | 6 +++--- .../tour_activity/tour_general_events.txt | 10 +++++----- .../tour_activity/tour_phase_tour_grounds.txt | 10 +++++----- .../tour_activity/tour_travel_events.txt | 6 +++--- .../tour_activity/tour_travel_events_dan.txt | 14 +++++++------- events/death_events/death_management_events.txt | 4 ++-- events/dlc/ce1/epidemic_events_2.txt | 2 +- events/dlc/ce1/legend_spread_events_8.txt | 2 +- events/dlc/ep2/ep2_tournament_events.txt | 10 +++++----- .../dlc/ep2/wedding_events/ep2_wedding_events.txt | 6 +++--- events/factions/faction_demands.txt | 2 +- events/wc_events/wc_forsaken_events.txt | 8 ++++---- events/yearly_events/yearly_events_4.txt | 2 +- 14 files changed, 42 insertions(+), 42 deletions(-) diff --git a/common/story_cycles/wc_story_cycle_thunder_king.txt b/common/story_cycles/wc_story_cycle_thunder_king.txt index 067d030889..1fb224e612 100644 --- a/common/story_cycles/wc_story_cycle_thunder_king.txt +++ b/common/story_cycles/wc_story_cycle_thunder_king.txt @@ -140,7 +140,7 @@ } effect = { story_owner = { - death = { death_reason = death_battle } + override_death_effect = { death_reason = death_battle } } end_story = yes } diff --git a/events/activities/hold_court_activity/hold_court_events_general.txt b/events/activities/hold_court_activity/hold_court_events_general.txt index 1d959d4d77..d5db191a07 100644 --- a/events/activities/hold_court_activity/hold_court_events_general.txt +++ b/events/activities/hold_court_activity/hold_court_events_general.txt @@ -23174,7 +23174,7 @@ hold_court.7050 = { show_chance = no desc = hold_court.7050.b.victory scope:lunatic_soldier = { - death = { + override_death_killer_effect = { killer = root death_reason = death_duel } @@ -23198,7 +23198,7 @@ hold_court.7050 = { 50 = { show_chance = no desc = hold_court.7050.b.defeat - death = { + override_death_killer_effect = { killer = scope:lunatic_soldier death_reason = death_duel } @@ -23297,7 +23297,7 @@ hold_court.7051 = { if = { limit = { scope:sc_victor = { this = scope:lunatic_soldier } } scope:lunatic_soldier = { - death = { + override_death_effect = { death_reason = death_suicide } } diff --git a/events/activities/tour_activity/tour_general_events.txt b/events/activities/tour_activity/tour_general_events.txt index aa653f3016..5fdf610748 100644 --- a/events/activities/tour_activity/tour_general_events.txt +++ b/events/activities/tour_activity/tour_general_events.txt @@ -1599,7 +1599,7 @@ tour_general.1001 = { desc = tour_general.1001.e.success.desc scope:visiting_liege = { - death = { + override_death_killer_effect = { killer = scope:stop_host_scope death_reason = death_fight } @@ -1624,7 +1624,7 @@ tour_general.1001 = { desc = tour_general.1001.e.bodyguard.desc scope:stop_host_scope = { - death = { + override_death_killer_effect = { killer = scope:tour_general_1001_bodyguard death_reason = death_fight } @@ -1654,7 +1654,7 @@ tour_general.1001 = { desc = tour_general.1001.e.success.desc scope:visiting_liege = { - death = { + override_death_killer_effect = { killer = scope:stop_host_scope death_reason = death_fight } @@ -1678,7 +1678,7 @@ tour_general.1001 = { desc = tour_general.1001.e.success.desc scope:stop_host_scope = { - death = { + override_death_killer_effect = { killer = scope:visiting_liege death_reason = death_fight } @@ -1905,7 +1905,7 @@ tour_general.1002 = { } } scope:tour_general_3001_target_courtier = { - death = { + override_death_effect = { death_reason = death_vanished } } diff --git a/events/activities/tour_activity/tour_phase_tour_grounds.txt b/events/activities/tour_activity/tour_phase_tour_grounds.txt index 7cd1baf9b5..9fcb552060 100644 --- a/events/activities/tour_activity/tour_phase_tour_grounds.txt +++ b/events/activities/tour_activity/tour_phase_tour_grounds.txt @@ -1,4 +1,4 @@ -# Events for the travel portion of the Tour grand activity +# Events for the travel portion of the Tour grand activity namespace = tour_grounds_events @@ -387,7 +387,7 @@ tour_grounds_events.1003 = { has_trait = paranoid } show_as_tooltip = { - death = { + override_death_killer_effect = { killer = scope:fake_assassin_scope death_reason = death_murder } @@ -500,7 +500,7 @@ tour_grounds_events.1003 = { } add_stress = major_stress_impact_gain show_as_tooltip = { - death = { + override_death_killer_effect = { killer = scope:fake_assassin_scope death_reason = death_murder } @@ -3686,7 +3686,7 @@ tour_grounds_events.3008 = { random_list = { 10 = { scope:trampled_child_scope = { - death = { + override_death_killer_effect = { killer = root death_reason = death_trampled_by_horse } @@ -3873,7 +3873,7 @@ tour_grounds_events.3009 = { } } scope:trampled_child_scope = { - death = { + override_death_killer_effect = { killer = root death_reason = death_trampled_by_horse } diff --git a/events/activities/tour_activity/tour_travel_events.txt b/events/activities/tour_activity/tour_travel_events.txt index 209de88661..430a2a7224 100644 --- a/events/activities/tour_activity/tour_travel_events.txt +++ b/events/activities/tour_activity/tour_travel_events.txt @@ -191,7 +191,7 @@ tour_travel.1001 = { value = scope:duel_value multiplier = -0.5 } - death = { + override_death_killer_effect = { killer = scope:angry_peasant death_reason = death_fight } @@ -612,7 +612,7 @@ tour_travel.1003 = { } } scope:rude_peasant = { - death = { + override_death_killer_effect = { killer = root death_reason = death_torture } @@ -1745,7 +1745,7 @@ tour_travel.1009 = { option = { # Have her executed! name = tour_travel.1009.b scope:wise_woman_scope = { - death = { + override_death_killer_effect = { killer = root death_reason = death_execution } diff --git a/events/activities/tour_activity/tour_travel_events_dan.txt b/events/activities/tour_activity/tour_travel_events_dan.txt index 4979e054e2..3a21322e57 100644 --- a/events/activities/tour_activity/tour_travel_events_dan.txt +++ b/events/activities/tour_activity/tour_travel_events_dan.txt @@ -1,4 +1,4 @@ -namespace = tour_travel +namespace = tour_travel # Chance to build a cool new church tour_travel.3000 = { @@ -416,16 +416,16 @@ tour_travel.3002 = { hidden_effect = { scope:widow_husband = { marry = scope:widow_peasant - death = { + override_death_effect = { death_reason = death_battle } scope:widow_father = { - death = { + override_death_effect = { death_reason = death_battle } } scope:widow_son = { - death = { + override_death_effect = { death_reason = death_battle } } @@ -1187,7 +1187,7 @@ tour_travel.3010 = { #Local shrine save_scope_as = saint_name } scope:saint_name = { - death = { death_reason = death_disappearance } + override_death_effect = { death_reason = death_disappearance } } } } @@ -1755,7 +1755,7 @@ tour_travel.3030 = { #Wrongfully accused } add_dread = miniscule_dread_gain scope:wrongfully_accused = { - death = { death_reason = death_execution } + override_death_effect = { death_reason = death_execution } } scope:accused_partner = { silent_disappearance_effect = yes } stress_impact = { @@ -1785,7 +1785,7 @@ tour_travel.3030 = { #Wrongfully accused opinion = 10 } scope:wrongfully_accused = { - death = { + override_death_effect = { death_reason = death_execution killer = root.court_position:executioner_court_position } diff --git a/events/death_events/death_management_events.txt b/events/death_events/death_management_events.txt index 35ddd2a7d5..ff300e9310 100644 --- a/events/death_events/death_management_events.txt +++ b/events/death_events/death_management_events.txt @@ -2266,7 +2266,7 @@ scripted_effect death_in_battle_scope_effect = { set_signature_weapon_effect = yes } show_as_tooltip = { - death = { + override_death_effect = { death_reason = death_battle killer = scope:battle_death_killer } @@ -2274,7 +2274,7 @@ scripted_effect death_in_battle_scope_effect = { } else = { show_as_tooltip = { - death = { death_reason = death_battle } + override_death_effect = { death_reason = death_battle } } } } diff --git a/events/dlc/ce1/epidemic_events_2.txt b/events/dlc/ce1/epidemic_events_2.txt index a135e7fc13..1c3f9b3568 100755 --- a/events/dlc/ce1/epidemic_events_2.txt +++ b/events/dlc/ce1/epidemic_events_2.txt @@ -939,7 +939,7 @@ epidemic_events.2006 = { #Dancing plague add_piety = minor_piety_gain scope:dance_victim = { - death = { + override_death_killer_effect = { death_reason = death_murder killer = root } diff --git a/events/dlc/ce1/legend_spread_events_8.txt b/events/dlc/ce1/legend_spread_events_8.txt index 682dc0c555..8c9ce9b3dd 100755 --- a/events/dlc/ce1/legend_spread_events_8.txt +++ b/events/dlc/ce1/legend_spread_events_8.txt @@ -4062,7 +4062,7 @@ legend_spread_events.8172 = { localization_key = legend_chapter_accept_mortality_conclusion } } - death = { + override_death_effect = { death_reason = death_peaceful } diff --git a/events/dlc/ep2/ep2_tournament_events.txt b/events/dlc/ep2/ep2_tournament_events.txt index 83024dcab7..7a474b2229 100644 --- a/events/dlc/ep2/ep2_tournament_events.txt +++ b/events/dlc/ep2/ep2_tournament_events.txt @@ -3520,7 +3520,7 @@ ep2_tournament_events.1004 = { left_icon = root right_icon = scope:comely_stray scope:comely_stray = { - death = { death_reason = death_wounds } + override_death_effect = { death_reason = death_wounds } } } } @@ -3586,7 +3586,7 @@ ep2_tournament_events.1005 = { } } - death = { + override_death_effect = { death_reason = death_tournament_melee_throat } @@ -8635,7 +8635,7 @@ ep2_tournament_events.2006 = { hidden_effect = { tournament_contest_versus_resignation_effect = { RESIGNER = root CONTEST = wrestling SKILL = pugilism } } - death = { + override_death_effect = { death_reason = death_tournament_piledriver } scope:activity = { @@ -9721,7 +9721,7 @@ ep2_tournament_events.2506 = { } } - death = { + override_death_effect = { death_reason = death_tournament_roundhouse } @@ -10735,7 +10735,7 @@ ep2_tournament_events.3504 = { } 1 = { show_chance = no - death = { + override_death_effect = { death_reason = death_tournament_quintain_hit } diff --git a/events/dlc/ep2/wedding_events/ep2_wedding_events.txt b/events/dlc/ep2/wedding_events/ep2_wedding_events.txt index cb0a702529..2bc498d36b 100644 --- a/events/dlc/ep2/wedding_events/ep2_wedding_events.txt +++ b/events/dlc/ep2/wedding_events/ep2_wedding_events.txt @@ -6924,7 +6924,7 @@ ep2_wedding.1170 = { } } scope:murderee = { - death = { + override_death_killer_effect = { killer = root death_reason = death_plotting } @@ -10458,7 +10458,7 @@ ep2_wedding.1070 = { # Effect scope:1070_target = { - death = { death_reason = death_wild_animal } + override_death_effect = { death_reason = death_wild_animal } } } every_attending_character = { @@ -23475,7 +23475,7 @@ ep2_wedding.2020 = { right_icon = scope:drunk_guest title = ep2_wedding.2020.c.death scope:drunk_guest = { - death = { death_reason = death_accident } + override_death_effect = { death_reason = death_accident } } known_murder_effect = { VICTIM = scope:drunk_guest diff --git a/events/factions/faction_demands.txt b/events/factions/faction_demands.txt index cc97c5ae1d..54e4049df7 100644 --- a/events/factions/faction_demands.txt +++ b/events/factions/faction_demands.txt @@ -1367,7 +1367,7 @@ faction_demand.1102 = { } immediate = { - death = { + override_death_effect = { death_reason = death_vanished } } diff --git a/events/wc_events/wc_forsaken_events.txt b/events/wc_events/wc_forsaken_events.txt index 30e69d8b12..d8df62ae26 100644 --- a/events/wc_events/wc_forsaken_events.txt +++ b/events/wc_events/wc_forsaken_events.txt @@ -1426,12 +1426,12 @@ forsaken.9002 = { left_icon = root custom_tooltip = forsaken.9002.education_failed_tt scope:doomed_knight = { - death = { + override_death_effect = { death_reason = death_arcane_explosion } } scope:new_character = { - death = { + override_death_effect = { death_reason = death_arcane_explosion } } @@ -1466,12 +1466,12 @@ forsaken.9002 = { left_icon = root custom_tooltip = forsaken.9002.alterations_failed_tt scope:doomed_knight = { - death = { + override_death_effect = { death_reason = death_poison } } scope:new_character = { - death = { + override_death_effect = { death_reason = death_poison } } diff --git a/events/yearly_events/yearly_events_4.txt b/events/yearly_events/yearly_events_4.txt index c55692ab47..4c14006ea9 100644 --- a/events/yearly_events/yearly_events_4.txt +++ b/events/yearly_events/yearly_events_4.txt @@ -1338,7 +1338,7 @@ yearly.4021 = { } } save_scope_as = vassal_kid - death = { + override_death_effect = { death_reason = death_accident } }