diff --git a/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt b/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt index e2c9a00a5..f09fbeb08 100644 --- a/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt +++ b/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt @@ -18689,6 +18689,242 @@ k_pontus={ } +d_armeniac={ + pattern="pattern_solid.dds" + color1=white + color2=white + color3=green + colored_emblem={ + color1=red + texture="ce_border_circle.dds" + } + + colored_emblem={ + color1=green_light + color2=white + texture="NEOW_ce_waves_05.dds" + instance={ + position={ 0.500000 0.540000 } + depth=1.010000 + } + + } + +} + + +d_cappadocia={ + pattern="pattern_solid.dds" + color1=yellow + color2=white + color3=black + colored_emblem={ + color1=black + texture="ce_byzantine_double_eagle.dds" + instance={ + scale={ 0.970000 0.970000 } + } + + } + +} + + +d_paphlagonia={ + pattern="pattern_solid.dds" + color1=red + color2=yellow + color3=green + colored_emblem={ + color1=yellow + texture="ce_crescent_mask_02.dds" + instance={ + scale={ 0.780000 0.780000 } + depth=1.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_border_circle.dds" + } + +} + + +d_chaldea={ + pattern="pattern_solid.dds" + color1=white + color2=white + color3=blue + colored_emblem={ + color1=white + texture="ce_ordinary_chevron_2.dds" + instance={ + position={ 0.510000 0.320000 } + scale={ 0.480000 0.260000 } + depth=1.010000 + } + + } + + colored_emblem={ + color1=blue_light + color2=white + texture="NEOW_ce_waves_05.dds" + instance={ + position={ 0.500000 0.660000 } + depth=3.010000 + } + + } + + colored_emblem={ + color1=white + texture="ce_block_04.dds" + instance={ + position={ 0.500000 0.350000 } + scale={ 0.460000 0.550000 } + rotation=90 + } + + } + + colored_emblem={ + color1=red + texture="ce_escutcheon.dds" + instance={ + position={ 0.500000 0.360000 } + scale={ 0.750000 0.750000 } + depth=2.010000 + } + + } + +} + + +d_thracesia={ + pattern="pattern_solid.dds" + color1=blue_light + color2=white + color3=blue + colored_emblem={ + color1=black + texture="ce_rubh_el_hizb_arch.dds" + instance={ + scale={ 0.610000 0.610000 } + } + + } + + colored_emblem={ + color1=black + texture="ce_ordroerir.dds" + instance={ + depth=2.010000 + rotation=63 + } + + instance={ + depth=3.010000 + } + + } + + colored_emblem={ + color1=blue_light + texture="ce_circle_mask.dds" + instance={ + scale={ 0.470000 0.470000 } + depth=1.010000 + } + + } + +} + + +d_ephese={ + pattern="pattern_solid.dds" + color1=white + color2=white + color3=blue + colored_emblem={ + color1=purple + texture="ce_khmer_temple.dds" + instance={ + position={ 0.500000 0.300000 } + scale={ 0.350000 0.300000 } + } + + } + + colored_emblem={ + color1=purple + texture="ce_column.dds" + instance={ + position={ 0.500000 0.670000 } + scale={ 0.870000 0.790000 } + depth=1.010000 + } + + } + + colored_emblem={ + color1=purple + texture="ce_castle_random.dds" + instance={ + position={ 0.500000 0.820000 } + scale={ 0.700000 0.700000 } + depth=2.010000 + } + + } + +} + + +d_opsikion={ + pattern="pattern_solid.dds" + color1=red + color2=white + color3=black + colored_emblem={ + color1=blue + texture="ce_block_01.dds" + instance={ + position={ 0.500000 1.000000 } + scale={ 1.000000 0.830000 } + depth=1.010000 + } + + } + + colored_emblem={ + color1=white + texture="NEOW_ce_bosphorus.dds" + instance={ + position={ 0.500000 0.650000 } + depth=2.010000 + } + + } + + colored_emblem={ + color1=white + texture="NEOW_ce_istanbul.dds" + instance={ + position={ 0.500000 0.330000 } + scale={ 0.630000 0.630000 } + } + + } + +} + + k_mikrasia={ pattern="pattern_barruly_10.dds" color1=blue @@ -21531,6 +21767,24 @@ c_laconia={ } } +k_rumistan = { + pattern = "pattern_solid.dds" + color1 = rgb { 92 45 110 } + color2 = yellow + color3 = white + + colored_emblem = { + color1 = yellow + color2 = yellow + texture = "ce_cross_patriarchal.dds" + + instance = { + position = { 0.500000 0.500000 } + scale = { 0.820000 0.820000 } + } + } +} + d_megaliocrat_hof={ pattern="pattern_horizontal_split_01.dds" color1=grey @@ -21772,21 +22026,3 @@ e_spain={ } } -k_rumistan = { - pattern = "pattern_solid.dds" - color1 = rgb { 92 45 110 } - color2 = yellow - color3 = white - - colored_emblem = { - color1 = yellow - color2 = yellow - texture = "ce_cross_patriarchal.dds" - - instance = { - position = { 0.500000 0.500000 } - scale = { 0.820000 0.820000 } - } - } -} - diff --git a/common/culture/cultures/NEOW_caucasian.txt b/common/culture/cultures/NEOW_caucasian.txt index 6640284e2..d2ec4e475 100644 --- a/common/culture/cultures/NEOW_caucasian.txt +++ b/common/culture/cultures/NEOW_caucasian.txt @@ -1,39 +1,4 @@ -kabardian = { - color = { 145 153 38 } - - ethos = ethos_spiritual - heritage = heritage_caucasian - language = NEOW_language_circassian - martial_custom = martial_custom_male_only - traditions = { - tradition_caucasian_wolves - tradition_mountain_homes - tradition_zealous_people - tradition_highland_warriors - } - dlc_tradition = { - trait = tradition_staunch_traditionalists - requires_dlc_flag = hybridize_culture - fallback = tradition_faith_bound - } - - name_list = name_list_NEOW_turkish - - coa_gfx = { steppe_coa_gfx western_coa_gfx } - building_gfx = { mediterranean_building_gfx } - clothing_gfx = { byzantine_clothing_gfx } - unit_gfx = { eastern_unit_gfx } - - ethnicities = { - 20 = slavic_blond - 20 = slavic_brown_hair - 20 = slavic_dark_hair - 15 = mediterranean_byzantine - 25 = mediterranean - } -} - -adyghean = { +adyghean = { color = { 100 114 22 } ethos = ethos_communal @@ -41,13 +6,12 @@ adyghean = { language = NEOW_language_circassian martial_custom = martial_custom_male_only traditions = { - tradition_caucasian_wolves tradition_forest_folk tradition_hill_dwellers tradition_language_scholars } dlc_tradition = { - trait = tradition_staunch_traditionalists + trait = tradition_caucasian_wolves requires_dlc_flag = hybridize_culture fallback = tradition_faith_bound } @@ -75,13 +39,12 @@ lezgin = { language = NEOW_language_lezgin martial_custom = martial_custom_male_only traditions = { - tradition_caucasian_wolves tradition_tribe_unity tradition_religion_blending tradition_music_theory } dlc_tradition = { - trait = tradition_staunch_traditionalists + trait = tradition_caucasian_wolves requires_dlc_flag = hybridize_culture fallback = tradition_faith_bound } @@ -108,13 +71,12 @@ avar = { language = NEOW_language_avar martial_custom = martial_custom_male_only traditions = { - tradition_caucasian_wolves tradition_warrior_culture tradition_zealous_people tradition_stalwart_defenders } dlc_tradition = { - trait = tradition_staunch_traditionalists + trait = tradition_caucasian_wolves requires_dlc_flag = hybridize_culture fallback = tradition_faith_bound } @@ -141,13 +103,12 @@ dargin = { language = NEOW_language_dargwa martial_custom = martial_custom_male_only traditions = { - tradition_caucasian_wolves tradition_warrior_culture tradition_tribe_unity tradition_medicinal_plants } dlc_tradition = { - trait = tradition_staunch_traditionalists + trait = tradition_caucasian_wolves requires_dlc_flag = hybridize_culture fallback = tradition_faith_bound } @@ -174,13 +135,12 @@ nakh = { language = NEOW_language_vainakh martial_custom = martial_custom_male_only traditions = { - tradition_caucasian_wolves tradition_warrior_culture tradition_quarrelsome tradition_romanticised_banditry } dlc_tradition = { - trait = tradition_staunch_traditionalists + trait = tradition_caucasian_wolves requires_dlc_flag = hybridize_culture fallback = tradition_faith_bound } @@ -209,13 +169,12 @@ kumyk = { language = NEOW_language_kipchak_cuman martial_custom = martial_custom_male_only traditions = { - tradition_caucasian_wolves tradition_ruling_caste tradition_hill_dwellers tradition_zealous_people } dlc_tradition = { - trait = tradition_staunch_traditionalists + trait = tradition_caucasian_wolves requires_dlc_flag = hybridize_culture fallback = tradition_faith_bound } @@ -246,10 +205,10 @@ nogai = { tradition_horse_breeder } dlc_tradition = { - trait = tradition_staunch_traditionalists + trait = tradition_caucasian_wolves requires_dlc_flag = hybridize_culture fallback = tradition_faith_bound - } + } dlc_tradition = { trait = tradition_devoted_horsemanship requires_dlc_flag = khans_of_the_steppe @@ -276,13 +235,12 @@ balkar = { language = NEOW_language_kipchak_cuman martial_custom = martial_custom_male_only traditions = { - tradition_caucasian_wolves tradition_horse_lords tradition_mountain_homes tradition_warrior_culture } dlc_tradition = { - trait = tradition_staunch_traditionalists + trait = tradition_caucasian_wolves requires_dlc_flag = hybridize_culture fallback = tradition_faith_bound } @@ -310,13 +268,12 @@ karachay = { language = NEOW_language_kipchak_cuman martial_custom = martial_custom_male_only traditions = { - tradition_caucasian_wolves tradition_horse_lords tradition_hill_dwellers tradition_pastoralists } dlc_tradition = { - trait = tradition_staunch_traditionalists + trait = tradition_caucasian_wolves requires_dlc_flag = hybridize_culture fallback = tradition_faith_bound } @@ -344,14 +301,14 @@ ossetian = { language = NEOW_language_ossetian martial_custom = martial_custom_male_only traditions = { - tradition_caucasian_wolves tradition_mountaineers tradition_wedding_ceremonies tradition_religion_blending } dlc_tradition = { - trait = tradition_staunch_traditionalists + trait = tradition_caucasian_wolves requires_dlc_flag = hybridize_culture + fallback = tradition_faith_bound } name_list = name_list_NEOW_turkish @@ -382,13 +339,17 @@ NEOW_armenian = { tradition_zealous_people tradition_fervent_temple_builders tradition_hill_dwellers - tradition_highland_warriors } dlc_tradition = { trait = tradition_ep3_indomitable_azatani requires_dlc_flag = roads_to_power fallback = tradition_roman_legacy } + dlc_tradition = { + trait = tradition_caucasian_wolves + requires_dlc_flag = hybridize_culture + fallback = tradition_faith_bound + } name_list = name_list_armenian @@ -419,7 +380,11 @@ NEOW_georgian = {# all of this is pretty much a placeholder tradition_esteemed_hospitality tradition_metal_craftsmanship tradition_castle_keepers - tradition_caucasian_wolves + } + dlc_tradition = { + trait = tradition_caucasian_wolves + requires_dlc_flag = hybridize_culture + fallback = tradition_faith_bound } name_list = name_list_georgian @@ -452,13 +417,12 @@ NEOW_abkhazian = {# all of this is pretty much a placeholder tradition_fervent_temple_builders tradition_mountain_homes tradition_castle_keepers - tradition_caucasian_wolves } dlc_tradition = { - trait = tradition_fp3_fierce_independence - requires_dlc_flag = legacy_of_persia - fallback = tradition_staunch_traditionalists - } + trait = tradition_caucasian_wolves + requires_dlc_flag = hybridize_culture + fallback = tradition_faith_bound + } name_list = name_list_georgian @@ -491,13 +455,12 @@ laz = {# all of this is pretty much a placeholder tradition_fervent_temple_builders tradition_mountain_homes tradition_castle_keepers - tradition_caucasian_wolves } dlc_tradition = { - trait = tradition_fp3_fierce_independence - requires_dlc_flag = legacy_of_persia - fallback = tradition_staunch_traditionalists - } + trait = tradition_caucasian_wolves + requires_dlc_flag = hybridize_culture + fallback = tradition_faith_bound + } name_list = name_list_georgian @@ -530,13 +493,12 @@ svan = {# all of this is pretty much a placeholder tradition_fervent_temple_builders tradition_mountain_homes tradition_castle_keepers - tradition_caucasian_wolves } dlc_tradition = { - trait = tradition_fp3_fierce_independence - requires_dlc_flag = legacy_of_persia - fallback = tradition_staunch_traditionalists - } + trait = tradition_caucasian_wolves + requires_dlc_flag = hybridize_culture + fallback = tradition_faith_bound + } name_list = name_list_georgian @@ -569,13 +531,12 @@ mingrelian = {# all of this is pretty much a placeholder tradition_fervent_temple_builders tradition_mountain_homes tradition_castle_keepers - tradition_caucasian_wolves } dlc_tradition = { - trait = tradition_fp3_fierce_independence - requires_dlc_flag = legacy_of_persia - fallback = tradition_staunch_traditionalists - } + trait = tradition_caucasian_wolves + requires_dlc_flag = hybridize_culture + fallback = tradition_faith_bound + } name_list = name_list_georgian @@ -608,13 +569,12 @@ azeri = {# all of this is pretty much a placeholder tradition_fervent_temple_builders tradition_mountain_homes tradition_castle_keepers - tradition_caucasian_wolves } dlc_tradition = { - trait = tradition_fp3_fierce_independence - requires_dlc_flag = legacy_of_persia - fallback = tradition_staunch_traditionalists - } + trait = tradition_caucasian_wolves + requires_dlc_flag = hybridize_culture + fallback = tradition_faith_bound + } name_list = name_list_georgian diff --git a/common/culture/traditions/00_maa_traditions.txt b/common/culture/traditions/00_maa_traditions.txt index 4ac97cd66..d71f4fb0c 100644 --- a/common/culture/traditions/00_maa_traditions.txt +++ b/common/culture/traditions/00_maa_traditions.txt @@ -1934,8 +1934,9 @@ tradition_caucasian_wolves = { #For Georgians this replaces the Mountaineers tradition is_shown = { has_cultural_pillar = heritage_caucasian + has_dlc_feature = hybridize_culture NOR = { - has_cultural_tradition = tradition_mountaineers +# has_cultural_tradition = tradition_mountaineers has_cultural_tradition = tradition_horn_mountain_skirmishing } } @@ -1949,13 +1950,19 @@ tradition_caucasian_wolves = { } } } + NOT = { + has_cultural_tradition = tradition_fp3_fierce_independence + has_cultural_tradition = tradition_staunch_traditionalists + } } parameters = { - unlock_maa_monaspa = yes +# unlock_maa_monaspa = yes rough_terrain_expert_trait_more_common = yes mountain_trait_bonuses = yes can_recruit_mountain_specialist = yes + harder_to_hybridize = yes + harder_to_convert_county_culture = yes } province_modifier = { mountains_levy_size = 0.1 diff --git a/common/culture/traditions/00_realm_traditions.txt b/common/culture/traditions/00_realm_traditions.txt index 97bc74d7c..1da6b2425 100644 --- a/common/culture/traditions/00_realm_traditions.txt +++ b/common/culture/traditions/00_realm_traditions.txt @@ -2404,6 +2404,7 @@ tradition_staunch_traditionalists = { can_pick = { NOT = { has_cultural_tradition = tradition_fp3_fierce_independence + has_cultural_tradition = tradition_caucasian_wolves } } diff --git a/common/culture/traditions/03_fp3_traditions.txt b/common/culture/traditions/03_fp3_traditions.txt index 07b118d40..4762b1727 100644 --- a/common/culture/traditions/03_fp3_traditions.txt +++ b/common/culture/traditions/03_fp3_traditions.txt @@ -777,6 +777,7 @@ tradition_fp3_fierce_independence = { can_pick = { NOT = { has_cultural_tradition = tradition_staunch_traditionalists + has_cultural_tradition = tradition_caucasian_wolves } } diff --git a/common/on_action/game_start.txt b/common/on_action/game_start.txt index 80591cb11..f090de97e 100644 --- a/common/on_action/game_start.txt +++ b/common/on_action/game_start.txt @@ -7702,59 +7702,6 @@ on_game_start_after_lobby = { ##### heritage_caucasian ##### - culture:kabardian = { - change_cultural_acceptance = { - target = culture:adyghean - value = 30 - desc = cultural_acceptance_historical_relations - } - change_cultural_acceptance = { - target = culture:lezgin - value = 30 - desc = cultural_acceptance_historical_relations - } - change_cultural_acceptance = { - target = culture:avar - value = 30 - desc = cultural_acceptance_historical_relations - } - change_cultural_acceptance = { - target = culture:dargin - value = 30 - desc = cultural_acceptance_historical_relations - } - change_cultural_acceptance = { - target = culture:nakh - value = 30 - desc = cultural_acceptance_historical_relations - } - change_cultural_acceptance = { - target = culture:kumyk - value = 30 - desc = cultural_acceptance_historical_relations - } - change_cultural_acceptance = { - target = culture:nogai - value = 30 - desc = cultural_acceptance_historical_relations - } - change_cultural_acceptance = { - target = culture:balkar - value = 30 - desc = cultural_acceptance_historical_relations - } - change_cultural_acceptance = { - target = culture:karachay - value = 30 - desc = cultural_acceptance_historical_relations - } - change_cultural_acceptance = { - target = culture:ossetian - value = 30 - desc = cultural_acceptance_historical_relations - } - } - culture:adyghean = { change_cultural_acceptance = { target = culture:lezgin diff --git a/gfx/interface/icons/faith/mandaean.dds b/gfx/interface/icons/faith/mandaean.dds new file mode 100644 index 000000000..f81be37a6 --- /dev/null +++ b/gfx/interface/icons/faith/mandaean.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9bff98b41bfd3e3e24423b77d0382b2e32fc9375b8438a58fbd0e59c0a9d8713 +size 40128 diff --git a/history/characters/NEOW_e_nistrenia.txt b/history/characters/NEOW_e_nistrenia.txt index ad9cde97a..139603bd4 100644 --- a/history/characters/NEOW_e_nistrenia.txt +++ b/history/characters/NEOW_e_nistrenia.txt @@ -2024,7 +2024,7 @@ caucasus0004 = { name = "Zaur" dynasty = test_dynasty religion = "naqshbandi" - culture = kabardian + culture = adyghean 2495.2.14 = { birth = yes } diff --git a/history/provinces/e_nistrenia.txt b/history/provinces/e_nistrenia.txt index 18c120cfe..5bfb9fe58 100644 --- a/history/provinces/e_nistrenia.txt +++ b/history/provinces/e_nistrenia.txt @@ -2008,7 +2008,7 @@ ##d_alania ###c_cabardinia 5302 = { - culture = kabardian + culture = adyghean religion = naqshbandi holding = tribal_holding } diff --git a/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml b/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml index 0b02f5630..5e2fd2096 100644 --- a/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml +++ b/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml @@ -437,7 +437,7 @@ mingrelian_prefix:0 "Mingrelo" #Laz - laz:0 "Lazuri" + laz:0 "Laz" laz_collective_noun:0 "Laz" laz_prefix:0 "Lazo" @@ -712,11 +712,6 @@ karachay_collective_noun:0 "Karachays" karachay_prefix:0 "Karachayo" - #Kabardian - kabardian:0 "Keberdéy" - kabardian_collective_noun:0 "Kabardians" - kabardian_prefix:0 "Kabardo" - #Kalmyk kalmyk:0 "Khal'mg" kalmyk_collective_noun:0 "Kalmyks" @@ -847,21 +842,18 @@ NEOW_egyptian_prefix:0 "Egypto" NEOW_egyptian_collective_noun:0 "Egyptians" - # RŪMĪ / RUM ARAB - NEOW_rumi:0 "Rūmī" - NEOW_rumi_prefix:0 "Rūmī" - NEOW_rumi_collective_noun:0 "Rūm" - # Armenian - NEOW_armenian:0 "Hayeren" + NEOW_armenian:0 "Hay" NEOW_armenian_prefix:0 "Armeno" NEOW_armenian_collective_noun:0 "Armenians" - # Georgians + # Abkhazian NEOW_abkhazian:0 "Apsua" NEOW_abkhazian_prefix:0 "Abkhazo" NEOW_abkhazian_collective_noun:0 "Abkhazs" - NEOW_georgian:0 "Kartveli" + + # Georgian + NEOW_georgian:0 "Kartuli" NEOW_georgian_prefix:0 "Georgio" NEOW_georgian_collective_noun:0 "Georgians" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index cdc67cd19..90dd7caad 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -17762,8 +17762,8 @@ k_pechenegs_adj:0 "Pecheneg" k_perm:0 "Perm" k_perm_adj:0 "Permian" - k_persia:0 "Persia" - k_persia_adj:0 "Persian" + k_persia:0 "Irân" + k_persia_adj:0 "Iranian" k_pisa:0 "Pisa" k_pisa_adj:0 "Pisan" k_poland:0 "Poland" @@ -27573,8 +27573,8 @@ c_bandirma_adj:0 "Bandırmalı" b_pagaea:0 "Gönen" - e_caucasia:0 "Transcaucasian" - e_caucasia_adj:0 "Transcaucasia" + e_caucasia:0 "Caucasia" + e_caucasia_adj:0 "Caucasian" d_armenian_apostolic:0 "Mother See" d_armenian_apostolic_adj:0 "Armenian" @@ -27583,4 +27583,12 @@ k_rumistan:0 "Rumistan" k_rumistan_adj:0 "Rumi" k_mikrasia:0 "Mikrasía" - k_mikrasia_adj:0 "Mikrasían" \ No newline at end of file + k_mikrasia_adj:0 "Mikrasían" + e_mashriq:0 "al-Mashriq" + e_mashriq_adj:0 "Mashriqi" + k_lebanon:0 "Lebanon" + k_lebanon_adj:0 "Lebanese" + k_jordan:0 "Jordan" + k_jordan_adj:0 "Jordanian" + k_komi:0 "Komi" + k_komi_adj:0 "Komi" \ No newline at end of file