diff --git a/common/coat_of_arms/dynamic_definitions/NEOW_cultural_coa.txt b/common/coat_of_arms/dynamic_definitions/NEOW_cultural_coa.txt index 2241b483..3e3e3050 100644 --- a/common/coat_of_arms/dynamic_definitions/NEOW_cultural_coa.txt +++ b/common/coat_of_arms/dynamic_definitions/NEOW_cultural_coa.txt @@ -20,15 +20,6 @@ d_podlachia = { } } -e_europa = { - item = { - trigger = { - NOT = { holder.religion = religion:europeanist_religion } - } - coat_of_arms = e_benelux - } -} - e_france = { item = { trigger = { @@ -67,7 +58,7 @@ k_kuban = { trigger = { holder.faith = faith:stalinist } - coat_of_arms = k_stalingrad + coat_of_arms = d_volgograd } item = { trigger = { @@ -75,13 +66,4 @@ k_kuban = { } coat_of_arms = d_kalmykia } -} - -e_nistrenia = { - item = { - trigger = { - holder.faith = faith:fracture - } - coat_of_arms = e_nistrenia_cosmist - } } \ No newline at end of file diff --git a/common/on_action/game_start.txt b/common/on_action/game_start.txt index 9f9bc330..a4945e05 100644 --- a/common/on_action/game_start.txt +++ b/common/on_action/game_start.txt @@ -100,9 +100,6 @@ on_game_start = { title:d_volgograd.holder = { trigger_event = { id = NEOW_dynamic_titles.1000 } } - title:e_europa.holder = { - trigger_event = { id = NEOW_dynamic_titles.1000 } - } title:d_podlachia = { set_coa = d_lipkastan } title:d_lucania = { set_coa = d_lucania_albanian } #title:k_ireland.holder = { diff --git a/common/on_action/religion_on_actions.txt b/common/on_action/religion_on_actions.txt index d08f92b8..610231aa 100644 --- a/common/on_action/religion_on_actions.txt +++ b/common/on_action/religion_on_actions.txt @@ -323,14 +323,36 @@ on_faith_conversion = { has_title = title:d_volgorad has_title = title:c_volgograd has_title = title:b_volgograd - has_title = title:e_france - has_title = title:e_nistrenia - has_title = title:e_europa - has_title = title:e_britannia } } trigger_event = NEOW_dynamic_titles.1000 } + if = { + limit = { + has_title = title:e_france + faith = faith:carolingian + } + trigger_event = NEOW_dynamic_titles.0013 + } + + if = { + limit = { + has_title = title:e_france + faith = faith:romanticist + } + trigger_event = NEOW_dynamic_titles.0015 + } + + if = { + limit = { + has_title = title:e_france + NOR = { + faith = faith:carolingian + faith = faith:romanticist + } + } + trigger_event = NEOW_dynamic_titles.0014 + } ###################################################### diff --git a/common/on_action/title_on_actions.txt b/common/on_action/title_on_actions.txt index 3e8b60c7..5f903d59 100644 --- a/common/on_action/title_on_actions.txt +++ b/common/on_action/title_on_actions.txt @@ -167,9 +167,7 @@ on_title_destroyed = { # scope:previous_holder = previous holder. Might be dead on_title_gain = { effect = { - - ################ N3OW Dynamic Titles ################## - + if = { limit = { OR = { @@ -177,14 +175,39 @@ on_title_gain = { scope:title = title:d_volgorad scope:title = title:c_volgograd scope:title = title:b_volgograd - scope_title = title:e_france - scope_title = title:e_nistrenia - scope_title = title:e_europa - scope_title = title:e_britannia } } trigger_event = NEOW_dynamic_titles.1000 } + + ################ N3OW Dynamic Titles ################## + + if = { + limit = { + has_title = title:e_france + faith = faith:carolingian + } + trigger_event = NEOW_dynamic_titles.0013 + } + + if = { + limit = { + has_title = title:e_france + faith = faith:romanticist + } + trigger_event = NEOW_dynamic_titles.0015 + } + + if = { + limit = { + has_title = title:e_france + NOR = { + faith = faith:carolingian + faith = faith:romanticist + } + } + trigger_event = NEOW_dynamic_titles.0014 + } ###################################################### @@ -2845,14 +2868,36 @@ on_title_gain_inheritance = { has_title = title:d_volgorad has_title = title:c_volgograd has_title = title:b_volgograd - has_title = title:e_france - has_title = title:e_nistrenia - has_title = title:e_europa - has_title = title:e_britannia } } trigger_event = NEOW_dynamic_titles.1000 } + if = { + limit = { + has_title = title:e_france + faith = faith:carolingian + } + trigger_event = NEOW_dynamic_titles.0013 + } + + if = { + limit = { + has_title = title:e_france + faith = faith:romanticist + } + trigger_event = NEOW_dynamic_titles.0015 + } + + if = { + limit = { + has_title = title:e_france + NOR = { + faith = faith:carolingian + faith = faith:romanticist + } + } + trigger_event = NEOW_dynamic_titles.0014 + } ###################################################### @@ -3016,14 +3061,36 @@ on_title_gain_usurpation = { scope:title = title:d_volgorad scope:title = title:c_volgograd scope:title = title:b_volgograd - scope:title = title:e_france - scope:title = title:e_nistrenia - scope:title = title:e_europa - scope:title = title:e_britannia } } trigger_event = NEOW_dynamic_titles.1000 } + if = { + limit = { + has_title = title:e_france + faith = faith:carolingian + } + trigger_event = NEOW_dynamic_titles.0013 + } + + if = { + limit = { + has_title = title:e_france + faith = faith:romanticist + } + trigger_event = NEOW_dynamic_titles.0015 + } + + if = { + limit = { + has_title = title:e_france + NOR = { + faith = faith:carolingian + faith = faith:romanticist + } + } + trigger_event = NEOW_dynamic_titles.0014 + } ###################################################### diff --git a/events/NEOW_dynamic_titles_events.txt b/events/NEOW_dynamic_titles_events.txt index e8cabda9..1a9045e9 100644 --- a/events/NEOW_dynamic_titles_events.txt +++ b/events/NEOW_dynamic_titles_events.txt @@ -1,104 +1,174 @@ namespace = NEOW_dynamic_titles - -NEOW_dynamic_titles.1000 = { # The Great Event +##romanticist +#France -> Gondor +NEOW_dynamic_titles.0001 = { hidden = yes immediate = { - if = { - limit = { - has_title = title:e_europa - } - if = { - limit = { - religion = religion:europeanist_religion - } - title:e_europa = { - set_title_name = cn_europa - set_title_color = { 0 51 153 } - set_definitive_form = no - } - } - else = { - title:e_europa = { - reset_title_name = yes - set_title_color = { 229 153 45 } - set_definitive_form = yes - } - } + title:k_france = { + set_title_name = k_gondor + set_color_from_title = title:k_gondor_cosmetic } - if = { - limit = { - has_title = title:e_britannia - } - if = { - limit = { - faith = faith:druidic - } - title:e_britannia = { - set_title_name = cn_tir_na_nog - set_title_color = { 10 102 40 } - set_definitive_form = yes - } - } - else = { - title:e_brittania = { - reset_title_name = yes - set_title_color = { 140 7 29 } - set_definitive_form = no - } - } + } +} +NEOW_dynamic_titles.0002 = { + hidden = yes + + immediate = { + title:k_france = { + set_title_name = k_france # Change to reset_title_name = yes if that ever gets fixed + set_color_from_title = title:d_ile_de_france } - if = { - limit = { - has_title = title:e_nistrenia - } - if = { - limit = { - faith = faith:fracture - } - title:e_nistrenia = { - set_title_name = cn_the_zone - set_title_color = { 225 235 235 } - set_definitive_form = yes - } - } - else = { - title:e_nistrenia = { - reset_title_name = yes - set_title_color = { 110 82 196 } - set_definitive_form = no - } - } + } +} + +##Carolingian +#Belgium -> Austrasia +NEOW_dynamic_titles.0003 = { + hidden = yes + + immediate = { + title:k_belgium = { + set_title_name = k_austrasia } - if = { - limit = { - has_title = title:e_france - } - if = { - limit = { - faith = faith:romanticist - } - title:e_france = { - set_title_name = e_gallia_cosmetic - set_title_color = { 8 165 126 } - } - } - if = { - limit = { - faith = faith:carolingian - } - title:e_france = { - set_title_name = e_carolingia_cosmetic - set_title_color = { 255 216 0 } - } - } - else = { - title:e_france = { - reset_title_name = yes - set_title_color = { 20 17 114 } - } - } + } +} +NEOW_dynamic_titles.0004 = { + hidden = yes + + immediate = { + title:k_belgium = { + set_title_name = k_belgium # Change to reset_title_name = yes if that ever gets fixed } + } +} +#Luxembourg -> Moselle +NEOW_dynamic_titles.0005 = { + hidden = yes + + immediate = { + title:k_lotharingia = { + set_title_name = k_moselle + } + } +} +NEOW_dynamic_titles.0006 = { + hidden = yes + + immediate = { + title:k_lotharingia = { + set_title_name = k_lotharingia # Change to reset_title_name = yes if that ever gets fixed + } + } +} +#Netherlands -> Teisterbant +NEOW_dynamic_titles.0007 = { + hidden = yes + + immediate = { + title:k_frisia = { + set_title_name = k_teisterbant + } + } +} +NEOW_dynamic_titles.0008 = { + hidden = yes + + immediate = { + title:k_frisia = { + set_title_name = k_frisia # Change to reset_title_name = yes if that ever gets fixed + } + } +} +#Benelux -> Lotharingia +NEOW_dynamic_titles.0009 = { + hidden = yes + + immediate = { + title:e_benelux = { + set_title_name = e_lotharingia + } + } +} +NEOW_dynamic_titles.0010 = { + hidden = yes + + immediate = { + title:e_benelux = { + set_title_name = e_benelux # Change to reset_title_name = yes if that ever gets fixed + } + } +} +# E_France -> Numenor +NEOW_dynamic_titles.0011 = { + hidden = yes + + immediate = { + title:e_france = { + set_title_name = e_numenor + set_color_from_title = title:e_numenor_cosmetic + } + } +} +NEOW_dynamic_titles.0012 = { + hidden = yes + + immediate = { + title:e_france = { + set_title_name = e_france # Change to reset_title_name = yes if that ever gets fixed + set_color_from_title = title:d_ile_de_france + } + } +} + +NEOW_dynamic_titles.0013 = { #Carolingia + hidden = yes + + immediate = { + title:e_france = { + set_title_name = e_carolingia_cosmetic + set_title_color = { 255 216 0 } + } + } +} + +NEOW_dynamic_titles.0014 = { # Default France + hidden = yes + + immediate = { + title:e_france = { + set_title_name = e_france + set_title_color = { 20 17 114 } + } + } +} + +NEOW_dynamic_titles.0015 = { # Gallia + hidden = yes + + immediate = { + title:e_france = { + set_title_name_dynamic = e_gallia_cosmetic + set_title_color = { 8 165 126 } + } + } +} + +#Holder for various dynamic titles in the future, this is for " Union"s +#NEOW_dynamic_titles.0013 = { +# hidden = yes +# +# immediate = { +# title:e_france = { +# set_title_name_dynamic = capital_union_key +# } +# } +#} + +NEOW_dynamic_titles.1000 = { # Gallia + hidden = yes + + immediate = { if = { limit = { has_title = title:k_kuban diff --git a/localization/english/replace/titles_cultural_names_l_english.yml b/localization/english/replace/titles_cultural_names_l_english.yml index ddcae3fb..78ab3345 100644 --- a/localization/english/replace/titles_cultural_names_l_english.yml +++ b/localization/english/replace/titles_cultural_names_l_english.yml @@ -7194,15 +7194,9 @@ cn_lub_a_act__n_crn_:0 "Lubáň" - ### N3OW COSMETIC TITLES ### cn_stalingrad:0 "Stalingrad" - cn_stalingrad_adj:0 "Stalingrader" - cn_the_zone:0 "Zone" - cn_the_zone_adj:0 "Zone" + cn_stalingrad_adj: "Stalingrader" + cn_kalmykia:0 "Kalmykia" - cn_europa:0 "Europa" - cn_europa_adj:0 "Europan" - cn_tir_na_nog:0 "Tír na nÓg" - cn_tir_na_nog_adj:0 "Otherworlder" \ 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 dca15d56..f2000a36 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -2055,8 +2055,8 @@ c_madeira_adj:0 "Madeiran" b_madeira:0 "Funchal" #### Europa - e_europa:0 "Benelux" - e_europa_adj:0 "Beneluxer" + e_europa:0 "Europa" + e_europa_adj:0 "European" ### Frisia/Netherlands k_frisia_article:0 "the " k_frisia:0 "Netherlands" @@ -19736,8 +19736,8 @@ c_bodrog_adj:0 "Bodrogian" c_borsod:0 "Borsod" c_borsod_adj:0 "Borsodi" - c_csongrad:0 "Bács-Kiskun" - c_csongrad_adj:0 "Bács-Kiskunian" + c_csongrad:0 "Csongrad" + c_csongrad_adj:0 "Csongradian" c_dathina:0 "Dathina" c_dathina_adj:0 "Dathinan" c_dhafra:0 "Dhafra" @@ -26997,19 +26997,4 @@ c_kovaszna_adj:0 "Kovásznan" c_mures:0 "Maros" c_mures_adj:0 "Marosian" - - # Hungary - - c_csongrad_csanad:0 "Csongrád-Csanád" - c_csongrad_csanad_adj:0 "Csongrád-Csanádian" - c_hajdu_bihar:0 "Hajdú–Bihar" - c_hajdu_bihar_adj:0 "Hajdú–Biharian" - c_szolnok:0 "Szolnok" - c_szolnok_adj:0 "Szolnokian - c_sombor:0 "Sombor" - c_sombor_adj:0 "Somborian" - c_baranja:0 "Baranja" - c_baranja_adj:0 "Baranjian" - d_szekesfehervar:0 "Székesfehérvár" - d_szekesfehervar_adj:0 "Székesfehérvárian"