diff --git a/common/landed_titles/nistrenia.txt b/common/landed_titles/nistrenia.txt index 9215d29e..a4edc377 100644 --- a/common/landed_titles/nistrenia.txt +++ b/common/landed_titles/nistrenia.txt @@ -155,26 +155,16 @@ e_nistrenia = { } } c_salaj= { - color = { 184 65 65 } - cultural_names = { - name_list_NEOW_bavarian = cn_szilagy_h - name_list_hungarian = cn_szilagy_g - } - b_zalau = { + color = { 164 45 45 } + b_szilagy = { province = 3909 - cultural_names = { - name_list_NEOW_bavarian = cn_zillenmarkt - name_list_hungarian = cn_zilah - } - color = { 184 65 65 } + + color = { 164 45 45 } } - b_simleu = { + b_kraszna = { province = 3910 - cultural_names = { - name_list_NEOW_bavarian = cn_schomlenmarkt - name_list_hungarian = cn_szilagysomlyo - } - color = { 184 65 65 } + + color = { 164 45 45 } } } } @@ -564,26 +554,16 @@ e_nistrenia = { color = { 217 11 26 } } } - c_satu_mare = { + c_szatmar = { color = { 164 45 45 } - cultural_names = { - name_list_hungarian = cn_szatmar - name_list_NEOW_bavarian = cn_sathmar - } - b_satu_mare = { + b_szatmar = { province = 3907 - cultural_names = { - name_list_hungarian = cn_szatmarnemeti - name_list_NEOW_bavarian = cn_sathmar - } + color = { 164 45 45 } } b_tasnad = { province = 3911 - cultural_names = { - name_list_hungarian = cn_tasnad - name_list_NEOW_bavarian = cn_trestenburg - } + color = { 164 45 45 } } } diff --git a/common/on_action/game_start.txt b/common/on_action/game_start.txt index 6effdd63..01264568 100644 --- a/common/on_action/game_start.txt +++ b/common/on_action/game_start.txt @@ -97,9 +97,6 @@ on_game_start = { add_confederation_member = title:d_northumberland.holder } } - title:d_volgograd.holder = { - trigger_event = { id = NEOW_dynamic_titles.1000 } - } #title:k_ireland.holder = { # create_confederation = { # name = sinn_fein diff --git a/common/on_action/religion_on_actions.txt b/common/on_action/religion_on_actions.txt index 610231aa..91f5e86a 100644 --- a/common/on_action/religion_on_actions.txt +++ b/common/on_action/religion_on_actions.txt @@ -316,17 +316,7 @@ on_faith_conversion = { effect = { ################ N3OW Dynamic Titles ################## - if = { - limit = { - OR = { - has_title = title:k_kuban - has_title = title:d_volgorad - has_title = title:c_volgograd - has_title = title:b_volgograd - } - } - trigger_event = NEOW_dynamic_titles.1000 - } + if = { limit = { has_title = title:e_france diff --git a/common/on_action/title_on_actions.txt b/common/on_action/title_on_actions.txt index 5f903d59..bd025b41 100644 --- a/common/on_action/title_on_actions.txt +++ b/common/on_action/title_on_actions.txt @@ -168,18 +168,6 @@ on_title_destroyed = { on_title_gain = { effect = { - if = { - limit = { - OR = { - scope:title = title:k_kuban - scope:title = title:d_volgorad - scope:title = title:c_volgograd - scope:title = title:b_volgograd - } - } - trigger_event = NEOW_dynamic_titles.1000 - } - ################ N3OW Dynamic Titles ################## if = { @@ -2861,17 +2849,7 @@ on_title_gain_inheritance = { effect = { ################ N3OW Dynamic Titles ################## - if = { - limit = { - OR = { - has_title = title:k_kuban - has_title = title:d_volgorad - has_title = title:c_volgograd - has_title = title:b_volgograd - } - } - trigger_event = NEOW_dynamic_titles.1000 - } + if = { limit = { has_title = title:e_france @@ -3054,17 +3032,7 @@ on_title_gain_usurpation = { effect = { ################ N3OW Dynamic Titles ################## - if = { - limit = { - OR = { - scope:title = title:k_kuban - scope:title = title:d_volgorad - scope:title = title:c_volgograd - scope:title = title:b_volgograd - } - } - trigger_event = NEOW_dynamic_titles.1000 - } + if = { limit = { has_title = title:e_france diff --git a/common/province_terrain/01_province_properties.txt b/common/province_terrain/01_province_properties.txt index 69d88600..ca6c93b1 100644 --- a/common/province_terrain/01_province_properties.txt +++ b/common/province_terrain/01_province_properties.txt @@ -21592,8 +21592,8 @@ 3892 ={ winter_severity_bias = 0.55 } -## c_satu_mare -# b_satu_mare +## c_szatmar +# b_szatmar 3907 ={ winter_severity_bias = 0.55 } diff --git a/events/NEOW_dynamic_titles_events.txt b/events/NEOW_dynamic_titles_events.txt index faf45b4e..28f0650c 100644 --- a/events/NEOW_dynamic_titles_events.txt +++ b/events/NEOW_dynamic_titles_events.txt @@ -163,91 +163,4 @@ NEOW_dynamic_titles.0015 = { # Gallia # set_title_name_dynamic = capital_union_key # } # } -#} - -NEOW_dynamic_titles.1000 = { # Gallia - hidden = yes - - immediate = { - if = { - limit = { - has_title = title:k_kuban - } - if = { - limit = { - faith = faith:stalinist - } - title:k_kuban = { - set_title_name = cn_stalingrad - set_title_color = { 230 20 50 } - } - } - else = { - title:k_kuban = { - set_title_name = k_kuban - set_title_color = { 111 45 80 } - } - } - } - if = { - limit = { - has_title = title:d_volgograd - } - if = { - limit = { - faith = faith:stalinist - } - title:d_volgograd = { - set_title_name = cn_stalingrad - set_title_color = { 230 20 50 } - } - } - else = { - title:d_volgograd = { - set_title_name = d_volgograd - set_title_color = { 143 92 21 } - } - } - } - if = { - limit = { - has_title = title:c_volgograd - } - if = { - limit = { - faith = faith:stalinist - } - title:c_volgograd = { - set_title_name = cn_stalingrad - set_title_color = { 230 20 50 } - } - } - else = { - title:c_volgograd = { - set_title_name = c_volgograd - set_title_color = { 91 95 25 } - } - } - } - if = { - limit = { - has_title = title:b_volgograd - } - if = { - limit = { - faith = faith:stalinist - } - title:b_volgograd = { - set_title_name = cn_stalingrad - set_title_color = { 91 95 25 } - } - } - else = { - title:b_volgograd = { - set_title_name = b_volgograd - set_title_color = { 91 95 25 } - } - } - } - } -} \ No newline at end of file +#} \ No newline at end of file diff --git a/history/provinces/e_nistrenia.txt b/history/provinces/e_nistrenia.txt index 814676c3..b8ab91fe 100644 --- a/history/provinces/e_nistrenia.txt +++ b/history/provinces/e_nistrenia.txt @@ -646,8 +646,8 @@ } } -###c_satu_mare -3907 = { #satu_mare +###c_szatmar +3907 = { #Szatmar culture = NEOW_pannonisch religion = greek_catholic holding = castle_holding @@ -657,7 +657,7 @@ religion = greek_catholic #1st mention in XIVth } -3909 = { #Salaj +3909 = { #Szilagy holding = castle_holding religion = genevan culture = NEOW_pannonisch diff --git a/history/titles/k_transyvania.txt b/history/titles/k_transyvania.txt index b6eb46fb..a0e59753 100644 --- a/history/titles/k_transyvania.txt +++ b/history/titles/k_transyvania.txt @@ -205,7 +205,7 @@ d_bihar= { } } -c_satu_mare= { +c_szatmar= { 2554.1.1 = { holder = nistria0059 } diff --git a/holder for later/common/landed_titles/nistrenia.txt b/holder for later/common/landed_titles/nistrenia.txt index fce1aa44..455d4e67 100644 --- a/holder for later/common/landed_titles/nistrenia.txt +++ b/holder for later/common/landed_titles/nistrenia.txt @@ -176,10 +176,10 @@ e_nistrenia = { color = { 240 85 90 } } } - c_satu_mare = { + c_szatmar = { color = { 164 45 45 } - b_satu_mare = { + b_szatmar = { province = 3907 color = { 164 45 45 } diff --git a/localization/english/replace/titles_cultural_names_l_english.yml b/localization/english/replace/titles_cultural_names_l_english.yml index e8354ab6..1f3632bd 100644 --- a/localization/english/replace/titles_cultural_names_l_english.yml +++ b/localization/english/replace/titles_cultural_names_l_english.yml @@ -7012,7 +7012,7 @@ cn_shqiperia:0 "Shqipëria" cn_epiri_i_veriut:0 "Epiri i Veriut" - #Sweden + #Finland cn_vasterbotten:0 "Västerbotten" cn_vasterbotten_adj:0 "Västerbottenian" cn_lansipohja:0 "Länsipohja" @@ -7023,26 +7023,5 @@ cn_uumaja_adj:0 "Uumaja" cn_arvidsjaur:0 "Arvidsjaur" cn_ornskoldsvik:0 "Örnsköldsvik" - - - ## Romania cn__t_cma_ara_rom_a_hat_neasc_a_brv_:0 "Țara Românească" - cn_szatmar:0 "Szatmár" - cn_szatmar_adj:0 "Szatmárian" - cn_szatmarnemeti:0 "Szatmárnémeti" - cn_sathmar:0 "Sathmar" - cn_sathmar_adj:0 "Sathmarian" - cn_tasnad:0 "Tasnád" - cn_trestenburg:0 "Trestenburg" - cn_szilagy_h:0 "Szilágy" - cn_szilagy_h_adj:0 "Szilágian" - cn_szilagy_g:0 "Szilagy" - cn_szilagy_g_adj:0 "Szilagian" - cn_zillenmarkt:0 "Zillenmarkt" - cn_zilah:0 "Zilah" - cn_schomlenmarkt:0 "Schomlenmarkt" - cn_szilagysomlyo:0 "Szilágysomlyó" - - cn_stalingrad:0 "Stalingrad" - cn_stalingrad_adj: "Stalingrader" \ No newline at end of file diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index 5b1e5607..75feb600 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -19642,7 +19642,7 @@ b_szabolcs:0 "Szabolcs" b_szaszkezd:0 "szászkézd" b_szaszregen:0 "Szászrégen" - b_satu_mare:0 "Satu Mare" + b_szatmar:0 "Szatmár" b_szek:0 "Szék" b_szekesfehervar:0 "Székesfehérvár" b_szerencs:0 "Szerencs" @@ -19652,7 +19652,7 @@ b_tabala-hijaz:0 "Tabala-hijaz" b_tabalbala:0 "Tabalbala" b_taizz:0 "Ta'izz" - b_tasnad:0 "Tășnad" + b_tasnad:0 "Tasnad" b_tawwam:0 "Tawwam" b_tawwam_west:0 "Tawwam al-Gharb" b_tayma:0 "Tayma'" @@ -19822,8 +19822,8 @@ c_surrah_adj:0 "Surrah" c_szabolcs:0 "Szabolcs" c_szabolcs_adj:0 "Szabolcsian" - c_satu_mare:0 "Satu Mare" - c_satu_mare_adj:0 "Satu Marian" + c_szatmar:0 "Szatmár" + c_szatmar_adj:0 "Szatmárian" c_szekesfehervar:0 "Székesfehérvár" c_szekesfehervar_adj:0 "Székesfehérvárian" c_tadla:0 "Tadla" @@ -26930,9 +26930,3 @@ k_kazan:0 "Tatarstan" k_kazan_adj:0 "Tatarstani" - - ##Romania - c_salaj:0 "Sălaj" - c_salaj_adj:0 "Sălajian" - b_zalau:0 "Zalău" - b_simleu:0 "Șimleu Silvaniei" diff --git a/map_data/definition.csv b/map_data/definition.csv index 150b4ebd..4c7600c6 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -3905,7 +3905,7 @@ 3904;171;210;52;Nagyhalmagy;x 3905;3;0;180;Arad;x 3906;45;3;53;Lippa;x -3907;87;6;181;Satu_Mare;x +3907;87;6;181;Szatmar;x 3908;129;9;54;Nagybanya;x 3909;171;12;182;Szilagy;x 3910;3;15;55;Kraszna;x diff --git a/map_data/donotreplace/definition.csv b/map_data/donotreplace/definition.csv index a64d4a71..c68ed99f 100644 --- a/map_data/donotreplace/definition.csv +++ b/map_data/donotreplace/definition.csv @@ -3905,7 +3905,7 @@ 3904;171;210;52;Nagyhalmagy;x 3905;3;0;180;Arad;x 3906;45;3;53;Lippa;x -3907;87;6;181;satu_mare;x +3907;87;6;181;Szatmar;x 3908;129;9;54;Nagybanya;x 3909;171;12;182;Szilagy;x 3910;3;15;55;Kraszna;x