Merge branch 'current-patch-bugfixing-dev' into next-version-dev

This commit is contained in:
Fishedotjpg 2026-03-15 18:33:23 +00:00
commit 1d07351df7
4 changed files with 237 additions and 12 deletions

View file

@ -807,7 +807,7 @@ ai_only_vassal_modify_vassal_contract_interaction = {
}
# Separate interactions are set up for Administrative - This is to help with localisation and some of the effects
admin_liege rep_liege_modify_vassal_contract_interaction = {
admin_liege_modify_vassal_contract_interaction = {
special_interaction = liege_modify_vassal_contract
interface = modify_vassal_contract
category = interaction_category_vassal
@ -815,8 +815,8 @@ admin_liege rep_liege_modify_vassal_contract_interaction = {
interface_priority = 1000
icon = icon_contract_modification_single
send_name = admin_liege rep_liege_modify_vassal_contract_interaction
desc = admin_liege rep_liege_modify_vassal_contract_interaction_desc
send_name = admin_liege_modify_vassal_contract_interaction
desc = admin_liege_modify_vassal_contract_interaction_desc
force_notification = yes
notification_text = MODIFY_VASSAL_CONTRACT_NOTIFICATION_TO_VASSAL

View file

@ -31,13 +31,89 @@
{ "dynn_Lymyllyygh" }
{ "dynn_Korhnoallyngton" }
{ "dynn_Pythgomyrhy" }
{ "dynn_Ddovyr" }
{ "dynn_Kantyrbury" }
{ "dynn_Roshystyr" }
{ "dynn_Hastyngs" }
{ "dynn_Lywys" }
{ "dynn_Takahashy" }
{ "dynn_Suzwky" }
{ "dynn_Watanaby" }
{ "dynn_Brombyksddon" }
{ "dynn_Londdon" }
{ "dynn_Soufwark" }
{ "dynn_Wystmynstyr }
{ "dynn_Ealyng }
{ "dynn_Hyllyngddon }
{ "dynn_Arun }
{ "dynn_Shyshystyr }
{ "dynn_Guylddffordd }
{ "dynn_Wokyng }
{ "dynn_Soufyndd_on_Sya }
{ "dynn_Kolshystyr }
{ "dynn_Saffron_Walddyn }
{ "dynn_Hyrtffordd }
{ "dynn_Styfynagy }
{ "dynn_Watffordd }
{ "dynn_Lwton }
{ "dynn_Byddffordd }
{ "dynn_Ampthyll }
{ "dynn_Norfampton }
{ "dynn_Braklyy }
{ "dynn_Kyttyryng }
{ "dynn_Covyntrhy }
{ "dynn_Warhwyc }
{ "dynn_Byrhmyngham }
{ "dynn_Brhomsgrhofy }
{ "dynn_Worhcystyrh }
{ "dynn_Cyddyrhmynstyrh }
{ "dynn_Strhowdd }
{ "dynn_Gloucystyrh }
{ "dynn_Lyddburhy }
{ "dynn_Hyrhyfforhdd }
{ "dynn_Lyomynstyrh }
{ "dynn_Nywporht }
{ "dynn_Abyrhgafynny }
{ "dynn_Luddlow }
{ "dynn_Wystburhy }
{ "dynn_Tylfforhdd }
{ "dynn_Shrhywsburhy }
{ "dynn_Wrycsham }
{ "dynn_Ddynbygh }
{ "dynn_Conwy }
{ "dynn_Swaddlynkoty }
{ "dynn_Dyrby }
{ "dynn_Glossop" }
{ "dynn_Stafforhdd" }
{ "dynn_Gnosall" }
{ "dynn_Stocy_on_Trhynt" }
{ "dynn_Maccllysffyylldd" }
{ "dynn_Chystyr" }
{ "dynn_Llyfyrpwll" }
{ "dynn_Llancastyrh" }
{ "dynn_Kenddail" }
{ "dynn_Whitehaiven" }
{ "dynn_Wigton" }
{ "dynn_Cairlisle" }
{ "dynn_Ainnain" }
{ "dynn_Ddumfries" }
{ "dynn_Bigair" }
{ "dynn_Lainairk" }
{ "dynn_Sainquhair" }
{ "dynn_Girvain" }
{ "dynn_Maibole" }
{ "dynn_Air" }
{ "dynn_Irvine" }
{ "dynn_Ddumbairton" }
{ "dynn_Glaisgow" }
}
dynasty_names = {
{ "dynn_Grhysllyy" }
{ "dynn_Kharhdd" }
{ "dynn_Ddurhnforhdd" }
{ "dynn_Shyps" }
{ "dynn_Shypston" }
{ "dynn_Byrhgamot" }
{ "dynn_Toynyng" }
{ "dynn_Iddlly" }
@ -64,6 +140,81 @@
{ "dynn_Lymyllyygh" }
{ "dynn_Korhnoallyngton" }
{ "dynn_Pythgomyrhy" }
{ "dynn_Ddovyr" }
{ "dynn_Kantyrbury" }
{ "dynn_Roshystyr" }
{ "dynn_Hastyngs" }
{ "dynn_Lywys" }
{ "dynn_Takahashy" }
{ "dynn_Suzwky" }
{ "dynn_Watanaby" }
{ "dynn_Brombyksddon" }
{ "dynn_Londdon" }
{ "dynn_Soufwark" }
{ "dynn_Wystmynstyr }
{ "dynn_Ealyng }
{ "dynn_Hyllyngddon }
{ "dynn_Arun }
{ "dynn_Shyshystyr }
{ "dynn_Guylddffordd }
{ "dynn_Wokyng }
{ "dynn_Soufyndd_on_Sya }
{ "dynn_Kolshystyr }
{ "dynn_Saffron_Walddyn }
{ "dynn_Hyrtffordd }
{ "dynn_Styfynagy }
{ "dynn_Watffordd }
{ "dynn_Lwton }
{ "dynn_Byddffordd }
{ "dynn_Ampthyll }
{ "dynn_Norfampton }
{ "dynn_Braklyy }
{ "dynn_Kyttyryng }
{ "dynn_Covyntrhy }
{ "dynn_Warhwyc }
{ "dynn_Byrhmyngham }
{ "dynn_Brhomsgrhofy }
{ "dynn_Worhcystyrh }
{ "dynn_Cyddyrhmynstyrh }
{ "dynn_Strhowdd }
{ "dynn_Gloucystyrh }
{ "dynn_Lyddburhy }
{ "dynn_Hyrhyfforhdd }
{ "dynn_Lyomynstyrh }
{ "dynn_Nywporht }
{ "dynn_Abyrhgafynny }
{ "dynn_Luddlow }
{ "dynn_Wystburhy }
{ "dynn_Tylfforhdd }
{ "dynn_Shrhywsburhy }
{ "dynn_Wrycsham }
{ "dynn_Ddynbygh }
{ "dynn_Conwy }
{ "dynn_Swaddlynkoty }
{ "dynn_Dyrby }
{ "dynn_Glossop" }
{ "dynn_Stafforhdd" }
{ "dynn_Gnosall" }
{ "dynn_Stocy_on_Trhynt" }
{ "dynn_Maccllysffyylldd" }
{ "dynn_Chystyr" }
{ "dynn_Llyfyrpwll" }
{ "dynn_Llancastyrh" }
{ "dynn_Kenddail" }
{ "dynn_Whitehaiven" }
{ "dynn_Wigton" }
{ "dynn_Cairlisle" }
{ "dynn_Ainnain" }
{ "dynn_Ddumfries" }
{ "dynn_Bigair" }
{ "dynn_Lainairk" }
{ "dynn_Sainquhair" }
{ "dynn_Girvain" }
{ "dynn_Maibole" }
{ "dynn_Air" }
{ "dynn_Irvine" }
{ "dynn_Ddumbairton" }
{ "dynn_Glaisgow" }
}
male_names = {

View file

@ -725,7 +725,6 @@ peasantrepublic_government = {
may_elevate_co_monarch
government_uses_legitimacy
government_uses_domain_limit
government_is_herder
government_has_herd
government_uses_domicile_but_not_adventurer
government_has_powerful_families

View file

@ -149,6 +149,11 @@
dynn_Aziza:0 "Aziza"
dynn_Azizou:0 "Azizou"
dynn_Azurmendi:0 "Azurmendi"
dynn_Arun:0 "Arun"
dynn_Ampthyll:0 "Ampthyll"
dynn_Abyrhgafynny:0 "Abyrhgafynny"
dynn_Ainnain:0 "Ainnain"
dynn_Air:0 "Air"
dynn_B_a_uml_r:0 "Bär"
dynn_B_a_uml_sge:0 "Bäsge"
dynn_B_e_act_nard:0 "Bénard"
@ -362,6 +367,12 @@
dynn_Byrhgamot:0 "Byrhgamot"
dynn_Byrne:0 "Byrne"
dynn_Bywater:0 "Bywater"
dynn_Brombyksddon:0 "Brombyksddon"
dynn_Byddffordd:0 "Byddffordd"
dynn_Braklyy:0 "Braklyy"
dynn_Byrhmyngham:0 "Byrhmyngham"
dynn_Brhomsgrhofy:0 "Brhomsgrhofy"
dynn_Bigair:0 "Bigair"
dynn_C_a_grv_rri:0 "Càrri"
dynn_Caba_n_tld_as:0 "Cabañas"
dynn_Cabrau:0 "Cabrau"
@ -462,6 +473,11 @@
dynn_Cunha:0 "Cunha"
dynn_Cunningham:0 "Cunningham"
dynn_Cusano:0 "Cusano"
dynn_Covyntrhy:0 "Covyntrhy"
dynn_Cyddyrhmynstyrh:0 "Cyddyrhmynstyrh"
dynn_Conwy:0 "Conwy"
dynn_Chystyr:0 "Chystyr"
dynn_Cairlisle:0 "Cairlisle"
dynn_D_pst_Agostino:0 "D'Agostino"
dynn_D_pst_Angelis:0 "D'Angelis"
dynn_D_pst_Angelo:0 "D'Angelo"
@ -579,6 +595,11 @@
dynn_Dussmann:0 "Dussmann"
dynn_Duval:0 "Duval"
dynn_Dworschak:0 "Dworschak"
dynn_Ddovyr:0 "Ddovyr"
dynn_Ddynbygh:0 "Ddynbygh"
dynn_Dyrby:0 "Dyrby"
dynn_Ddumfries:0 "Ddumfries"
dynn_Ddumbairton:0 "Ddumbairton"
dynn_Eastoyndd:0 "Eastoyndd"
dynn_Eastynddyng:0 "Eastynddyng"
dynn_Eberle:0 "Eberle"
@ -647,6 +668,7 @@
dynn_Evenshaug:0 "Evenshaug"
dynn_Ewen:0 "Ewen"
dynn_Exle:0 "Exle"
dynn_Ealyng:0 "Ealyng"
dynn_F_a_uml_hndrich:0 "Fähndrich"
dynn_F_u_uml_gel:0 "Fügel"
dynn_F_u_uml_nfgeld:0 "Fünfgeld"
@ -842,6 +864,12 @@
dynn_Gwilhmod:0 "Gwilhmod"
dynn_Gwilho_u_grv_:0 "Gwilhoù"
dynn_Gwivarc_pst_h:0 "Gwivarc'h"
dynn_Guylddffordd:0 "Guylddffordd"
dynn_Gloucystyrh:0 "Gloucystyrh"
dynn_Glossop:0 "Glossop"
dynn_Gnosall:0 "Gnosall"
dynn_Girvain:0 "Girvain"
dynn_Glaisgow:0 "Glaisgow"
dynn_H_a_rng_kansson:0 "Håkansson"
dynn_H_a_rng_llander:0 "Hållander"
dynn_H_a_uml_rle:0 "Härle"
@ -964,6 +992,10 @@
dynn_Hussain:0 "Hussain"
dynn_Huynh:0 "Huynh"
dynn_Hyfing:0 "Hyfing"
dynn_Hastyngs:0 "Hastyngs"
dynn_Hyllyngddon:0 "Hyllyngddon"
dynn_Hyrtffordd:0 "Hyrtffordd"
dynn_Hyrhyfforhdd:0 "Hyrhyfforhdd"
dynn_Iacono:0 "Iacono"
dynn_Iammarino:0 "Iammarino"
dynn_Iannaccone:0 "Iannaccone"
@ -993,6 +1025,7 @@
dynn_Izagirre:0 "Izagirre"
dynn_Izeta:0 "Izeta"
dynn_Izzo:0 "Izzo"
dynn_Irvine:0 "Irvine"
dynn_J_a_uml_ger:0 "Jäger"
dynn_J_o_stk_rgensen:0 "Jørgensen"
dynn_J_o_uml_nsson:0 "Jönsson"
@ -1153,6 +1186,10 @@
dynn_Kurz:0 "Kurz"
dynn_Kvalem:0 "Kvalem"
dynn_Kyburg:0 "Kyburg"
dynn_Kantyrbury:0 "Kantyrbury"
dynn_Kolshystyr:0 "Kolshystyr"
dynn_Kyttyryng:0 "Kyttyryng"
dynn_Kenddail:0 "Kenddail"
dynn_L_a_uml_mmerhirt:0 "Lämmerhirt"
dynn_L_a_uml_mmle:0 "Lämmle"
dynn_L_e_act_cuyer:0 "Lécuyer"
@ -1296,6 +1333,15 @@
dynn_Lymyllyygh:0 "Lymyllyygh"
dynn_Lynch:0 "Lynch"
dynn_Lyng:0 "Lyng"
dynn_Lywys:0 "Lywys"
dynn_Londdon:0 "Londdon"
dynn_Lwton:0 "Lwton"
dynn_Lyddburhy:0 "Lyddburhy"
dynn_Lyomynstyrh:0 "Lyomynstyrh"
dynn_Luddlow:0 "Luddlow"
dynn_Llyfyrpwll:0 "Llyfyrpwll"
dynn_Llancastyrh:0 "Llancastyrh"
dynn_Lainairk:0 "Lainairk"
dynn_M_o_stk_ller:0 "Møller"
dynn_M_o_stk_llgaard:0 "Møllgaard"
dynn_M_o_uml_ller:0 "Möller"
@ -1439,6 +1485,8 @@
dynn_Murua:0 "Murua"
dynn_Muxika:0 "Muxika"
dynn_Myles:0 "Myles"
dynn_Maccllysffyylldd:0 "Maccllysffyylldd"
dynn_Maibole:0 "Maibole"
dynn_N_e_act_el:0 "Néel"
dynn_N_pst_Diaye:0 "N'Diaye"
dynn_N_u_uml_bling:0 "Nübling"
@ -1478,6 +1526,8 @@
dynn_Nyg_a_rng_rd:0 "Nygård"
dynn_Nylander:0 "Nylander"
dynn_Nystr_o_uml_m:0 "Nyström"
dynn_Norfampton:0 "Norfampton"
dynn_Nywporht:0 "Nywporht"
dynn_Odriozola:0 "Odriozola"
dynn_Oettinger:0 "Oettinger"
dynn_Offenloch:0 "Offenloch"
@ -1730,6 +1780,7 @@
dynn_Rutgers:0 "Rutgers"
dynn_Ruthven:0 "Ruthven"
dynn_Ryan:0 "Ryan"
dynn_Roshystyr:0 "Roshystyr"
dynn_S_e_grv_govesso:0 "Sègovesso"
dynn_S_e_grv_rvi:0 "Sèrvi"
dynn_S_o_stk_r_o_stk_:0 "Sørø"
@ -1917,6 +1968,18 @@
dynn_Svensson:0 "Svensson"
dynn_Swinton:0 "Swinton"
dynn_Sy:0 "Sy"
dynn_Suzwky:0 "Suzwky"
dynn_Soufwark:0 "Soufwark"
dynn_Shyshystyr:0 "Shyshystyr"
dynn_Soufyndd_on_Sya:0 "Soufyndd-on-Sya"
dynn_Saffron_Walddyn:0 "Saffron Walddyn"
dynn_Styfynagy:0 "Styfynagy"
dynn_Strhowdd:0 "Strhowdd"
dynn_Shrhywsburhy:0 "Shrhywsburhy"
dynn_Swaddlynkoty:0 "Swaddlynkoty"
dynn_Stafforhdd:0 "Stafforhdd"
dynn_Stocy_on_Trhynt:0 "Stocy-on-Trhynt"
dynn_Sainquhair:0 "Sainquhair"
dynn_T_u_uml_nnermann:0 "Tünnermann"
dynn_Tafeit:0 "Tafeit"
dynn_Taiado:0 "Taiado"
@ -1976,6 +2039,8 @@
dynn_Turquetil:0 "Turquetil"
dynn_Turquier:0 "Turquier"
dynn_Tyakh:0 "Tyakh"
dynn_Takahashy:0 "Takahashy"
dynn_Tylfforhdd:0 "Tylfforhdd"
dynn_Ugarte:0 "Ugarte"
dynn_Uhland:0 "Uhland"
dynn_Ulmer:0 "Ulmer"
@ -2130,6 +2195,16 @@
dynn_Wright:0 "Wright"
dynn_wrihtssen:0 "Wrihtssen"
dynn_Wurm:0 "Wurm"
dynn_Watanaby:0 "Watanaby"
dynn_Wystmynstyr:0 "Wystmynstyr"
dynn_Watffordd:0 "Watffordd"
dynn_Wokyng:0 "Wokyng"
dynn_Warhwyc:0 "Warhwyc"
dynn_Worhcystyrh:0 "Worhcystyrh"
dynn_Wystburhy:0 "Wystburhy"
dynn_Wrycsham:0 "Wrycsham"
dynn_Whitehaiven:0 "Whitehaiven"
dynn_Wigton:0 "Wigton"
dynn_Yachir:0 "Yachir"
dynn_Yacoubi:0 "Yacoubi"
dynn_Yahiaoui:0 "Yahiaoui"