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 b78207792..4efc18dd7 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 @@ -16145,61 +16145,122 @@ c_tyne_and_wear={ d_buckingham={ - pattern="pattern_horizontal_split_01.dds" - color1=blue - color2=green_light - color3=red + pattern="pattern_checkers_02.dds" + color1=red + color2=blue + color3=blue colored_emblem={ color1=yellow - color2=yellow - texture="ce_crown_head.dds" + texture="ce_harp.dds" instance={ - position={ 0.250000 0.750000 } - scale={ 0.333000 0.333000 } - } - - instance={ - position={ 0.750000 0.750000 } - scale={ 0.333000 0.333000 } - depth=1.010000 - } - - instance={ - scale={ 0.333000 0.333000 } - depth=2.010000 - } - - instance={ - position={ 0.250000 0.250000 } - scale={ 0.333000 0.333000 } - depth=3.010000 - } - - instance={ - position={ 0.750000 0.250000 } - scale={ 0.333000 0.333000 } - depth=4.010000 + position={ 0.320000 0.730000 } + scale={ 0.480000 0.480000 } + depth=7.010000 + rotation=348 } } colored_emblem={ - color1=green_light + color1=yellow + color2=yellow + texture="ce_moors_head_02.dds" + instance={ + position={ 0.150000 0.640000 } + scale={ 0.200000 0.200000 } + depth=1.010000 + } + + } + + colored_emblem={ + color1=yellow + color2=black + color3=blue + texture="ce_leopard_passant_guardant.dds" + instance={ + position={ 0.700000 0.840000 } + scale={ 0.420000 0.420000 } + depth=2.010000 + } + + } + + colored_emblem={ + color1=red + color2=blue + texture="ce_quarterly.dds" + instance={ + depth=11.010000 + } + + } + + colored_emblem={ + color1=red + color2=blue + texture="ce_lion_rampant.dds" + instance={ + position={ 0.720000 0.250000 } + scale={ 0.290000 0.290000 } + depth=5.010000 + } + + } + + colored_emblem={ + color1=yellow + color2=blue + color3=black + texture="ce_leopard_passant_guardant.dds" + instance={ + position={ 0.700000 0.720000 } + scale={ 0.420000 0.420000 } + depth=3.010000 + } + + instance={ + position={ 0.700000 0.580000 } + scale={ 0.420000 0.420000 } + depth=4.010000 + } + + instance={ + position={ 0.290000 0.400000 } + scale={ 0.420000 0.420000 } + depth=8.010000 + } + + instance={ + position={ 0.290000 0.100000 } + scale={ 0.420000 0.420000 } + depth=9.010000 + } + + instance={ + position={ 0.290000 0.250000 } + scale={ 0.420000 0.420000 } + depth=10.010000 + } + + } + + colored_emblem={ + color1=yellow texture="ce_block_02.dds" instance={ + position={ 1.000000 0.000000 } depth=6.010000 } } colored_emblem={ - color1=blue - color2=white - texture="ce_waves_03.dds" + color1=red + texture="ce_double_tressure.dds" instance={ - scale={ -1.000000 1.000000 } - depth=5.010000 - rotation=315 + position={ 0.720000 0.270000 } + scale={ 0.490000 0.490000 } } } diff --git a/common/culture/cultures/NEOW_iranian.txt b/common/culture/cultures/NEOW_iranian.txt index b3797e264..6f447dbdb 100644 --- a/common/culture/cultures/NEOW_iranian.txt +++ b/common/culture/cultures/NEOW_iranian.txt @@ -1,305 +1,3 @@ - -persian = { - color = { 0.1 0.6 0.8 } - - ethos = ethos_courtly - heritage = heritage_iranian - language = language_iranian - martial_custom = martial_custom_male_only - - head_determination = head_determination_domain - traditions = { - tradition_gardening - tradition_futuwaa - tradition_ce1_ritual_washing - } - - # FP3 traditions - dlc_tradition = { - trait = tradition_fp3_irrigation_experts - requires_dlc_flag = legacy_of_persia - fallback = tradition_dryland_dwellers - } - dlc_tradition = { - trait = tradition_fp3_beacon_of_learning - requires_dlc_flag = legacy_of_persia - fallback = tradition_philosopher_culture - } - dlc_tradition = { - trait = tradition_fp3_enlightened_magnates - requires_dlc_flag = legacy_of_persia - fallback = tradition_poetry - } - - name_list = name_list_persian - - coa_gfx = { iranian_group_coa_gfx } - building_gfx = { iranian_building_gfx } - clothing_gfx = { iranian_clothing_gfx mena_clothing_gfx } - unit_gfx = { iranian_unit_gfx } - house_coa_frame = house_frame_12 - house_coa_mask_offset = { 0.0 -0.04 } - house_coa_mask_scale = { 0.95 0.95 } - - ethnicities = { - 44 = arab - 28 = mediterranean - 28 = turkic_west - } -} - - -lur = { - color = { 0.0 0.5 0.7 } - - ethos = ethos_courtly - heritage = heritage_iranian - language = language_iranian - martial_custom = martial_custom_male_only - - head_determination = head_determination_domain - traditions = { - tradition_gardening - tradition_futuwaa - tradition_ce1_ritual_washing - } - - # FP3 traditions - dlc_tradition = { - trait = tradition_fp3_irrigation_experts - requires_dlc_flag = legacy_of_persia - fallback = tradition_dryland_dwellers - } - dlc_tradition = { - trait = tradition_fp3_beacon_of_learning - requires_dlc_flag = legacy_of_persia - fallback = tradition_philosopher_culture - } - dlc_tradition = { - trait = tradition_fp3_enlightened_magnates - requires_dlc_flag = legacy_of_persia - fallback = tradition_poetry - } - - name_list = name_list_persian - - coa_gfx = { iranian_group_coa_gfx } - building_gfx = { iranian_building_gfx } - clothing_gfx = { iranian_clothing_gfx mena_clothing_gfx } - unit_gfx = { iranian_unit_gfx } - house_coa_frame = house_frame_12 - house_coa_mask_offset = { 0.0 -0.04 } - house_coa_mask_scale = { 0.95 0.95 } - - ethnicities = { - 44 = arab - 28 = mediterranean - 28 = turkic_west - } -} - -baloch = { - color = { 0.1 0.15 0.5 } - - ethos = ethos_stoic #FP3 change based on research - heritage = heritage_iranian - language = language_iranian - martial_custom = martial_custom_male_only - head_determination = head_determination_domain - traditions = { - tradition_futuwaa - tradition_desert_nomads - tradition_esteemed_hospitality - tradition_isolationist - } - - # FP3 traditions - dlc_tradition = { - trait = tradition_fp3_jirga - requires_dlc_flag = legacy_of_persia - } - - name_list = name_list_baloch - - coa_gfx = { iranian_group_coa_gfx } - building_gfx = { iranian_building_gfx } - clothing_gfx = { iranian_clothing_gfx mena_clothing_gfx } - unit_gfx = { iranian_unit_gfx } - house_coa_frame = house_frame_12 - house_coa_mask_offset = { 0.0 -0.04 } - house_coa_mask_scale = { 0.95 0.95 } - - ethnicities = { - 100 = arab - } -} - -daylamite = { - color = { 0 0.35 0.6 } - - ethos = ethos_bellicose - heritage = heritage_iranian - language = language_iranian - martial_custom = martial_custom_male_only - head_determination = head_determination_domain - traditions = { - tradition_swords_for_hire - tradition_stalwart_defenders - tradition_mountaineers - tradition_isolationist - } - - # FP3 traditions - dlc_tradition = { - trait = tradition_fp3_pragmatic_creed - requires_dlc_flag = legacy_of_persia - fallback = tradition_futuwaa - } - - name_list = name_list_daylamite - - coa_gfx = { iranian_group_coa_gfx } - building_gfx = { iranian_building_gfx } - clothing_gfx = { iranian_clothing_gfx mena_clothing_gfx } - unit_gfx = { iranian_unit_gfx } - house_coa_frame = house_frame_12 - house_coa_mask_offset = { 0.0 -0.04 } - house_coa_mask_scale = { 0.95 0.95 } - - ethnicities = { - 41 = arab - 59 = turkic_west - } -} -pomerien = { - color = { 1.0 0.8 1 } - created = 700.1.1 - - history_loc_override = bactrian_heritage_loc - - ethos = ethos_spiritual - heritage = heritage_iranian - language = language_iranian - martial_custom = martial_custom_male_only - head_determination = head_determination_domain - traditions = { - tradition_caravaneers - tradition_futuwaa - tradition_city_keepers #FP3 addition - } - - # FP3 traditions - dlc_tradition = { - trait = tradition_fp3_irrigation_experts - requires_dlc_flag = legacy_of_persia - fallback = tradition_dryland_dwellers - } - dlc_tradition = { - trait = tradition_fp3_beacon_of_learning - requires_dlc_flag = legacy_of_persia - fallback = tradition_philosopher_culture - } - - name_list = name_list_tajik - - coa_gfx = { iranian_group_coa_gfx } - building_gfx = { iranian_building_gfx } - clothing_gfx = { iranian_clothing_gfx mena_clothing_gfx } - unit_gfx = { iranian_unit_gfx } - house_coa_frame = house_frame_12 - house_coa_mask_offset = { 0.0 -0.04 } - house_coa_mask_scale = { 0.95 0.95 } - - ethnicities = { - 40 = arab - 30 = mediterranean - 30 = turkic_west - } -} -tajik = { - color = { 0.7 0.6 1 } - created = 700.1.1 - - history_loc_override = bactrian_heritage_loc - - ethos = ethos_spiritual - heritage = heritage_iranian - language = language_iranian - martial_custom = martial_custom_male_only - head_determination = head_determination_domain - traditions = { - tradition_caravaneers - tradition_futuwaa - tradition_city_keepers #FP3 addition - } - - # FP3 traditions - dlc_tradition = { - trait = tradition_fp3_irrigation_experts - requires_dlc_flag = legacy_of_persia - fallback = tradition_dryland_dwellers - } - dlc_tradition = { - trait = tradition_fp3_beacon_of_learning - requires_dlc_flag = legacy_of_persia - fallback = tradition_philosopher_culture - } - - name_list = name_list_tajik - - coa_gfx = { iranian_group_coa_gfx } - building_gfx = { iranian_building_gfx } - clothing_gfx = { iranian_clothing_gfx mena_clothing_gfx } - unit_gfx = { iranian_unit_gfx } - house_coa_frame = house_frame_12 - house_coa_mask_offset = { 0.0 -0.04 } - house_coa_mask_scale = { 0.95 0.95 } - - ethnicities = { - 40 = arab - 30 = mediterranean - 30 = turkic_west - } -} - -afghan = { # a.k.a. Pashtun - color = { 0.4 0.3 1 } - - ethos = ethos_communal - heritage = heritage_iranian - language = language_scythian - martial_custom = martial_custom_male_only - head_determination = head_determination_domain - traditions = { - tradition_eye_for_an_eye #FP3 change from Loyal Subjects - tradition_esteemed_hospitality - tradition_mountain_homes - tradition_futuwaa - } - - # FP3 traditions - dlc_tradition = { - trait = tradition_fp3_jirga - requires_dlc_flag = legacy_of_persia - } - - name_list = name_list_afghan - - coa_gfx = { iranian_group_coa_gfx } - building_gfx = { iranian_building_gfx } - clothing_gfx = { iranian_clothing_gfx mena_clothing_gfx } - unit_gfx = { iranian_unit_gfx } - house_coa_frame = house_frame_12 - house_coa_mask_offset = { 0.0 -0.04 } - house_coa_mask_scale = { 0.95 0.95 } - - ethnicities = { - 35 = arab - 43 = turkic_west - 22 = turkic - } -} - kurd = { color = { 226 192 90 } diff --git a/common/culture/cultures/NEOW_karluk.txt b/common/culture/cultures/NEOW_karluk.txt index cec32603b..5e2a14693 100644 --- a/common/culture/cultures/NEOW_karluk.txt +++ b/common/culture/cultures/NEOW_karluk.txt @@ -37,7 +37,7 @@ NEOW_uzbek = { # } NEOW_uyghur = { # - color = rgb{36 51 57} + color = rgb{26 51 77} ethos = ethos_bureaucratic heritage = heritage_kipchak @@ -73,43 +73,7 @@ NEOW_uyghur = { # } NEOW_hazara = { # - color = rgb{46 71 97} - - ethos = ethos_bureaucratic - heritage = heritage_kipchak - language = NEOW_language_kipchak_cuman - martial_custom = martial_custom_male_only - traditions = { - tradition_language_scholars - tradition_republican_legacy - tradition_esteemed_hospitality - tradition_practiced_pirates - } - dlc_tradition = { - trait = tradition_devoted_horsemanship - requires_dlc_flag = khans_of_the_steppe - fallback = tradition_horse_lords - } - - - name_list = name_list_NEOW_turkish - - coa_gfx = { turkic_group_coa_gfx steppe_coa_gfx } - building_gfx = { steppe_building_gfx } - clothing_gfx = { turkic_clothing_gfx mongol_clothing_gfx } - unit_gfx = { mongol_unit_gfx } - - ethnicities = { - 20 = slavic_blond - 20 = slavic_brown_hair - 20 = slavic_dark_hair - 15 = mediterranean_byzantine - 25 = mediterranean - } -} - -NEOW_aimaq = { # - color = rgb{06 31 57} + color = rgb{26 51 77} ethos = ethos_bureaucratic heritage = heritage_kipchak diff --git a/common/landed_titles/iran.txt b/common/landed_titles/iran.txt index c8854eb67..7bcadb2e0 100644 --- a/common/landed_titles/iran.txt +++ b/common/landed_titles/iran.txt @@ -1868,6 +1868,11 @@ e_persia = { province = 4359 color = { 120 180 30 } + } + b_shughnan = { + province = 4363 + + color = { 125 175 25 } } } c_wakhan = { diff --git a/history/provinces/e_persia.txt b/history/provinces/e_persia.txt index 06f0d8c7a..5f89eee78 100644 --- a/history/provinces/e_persia.txt +++ b/history/provinces/e_persia.txt @@ -199,7 +199,7 @@ ###c_rivsharan 4223 = { #Dizah - culture = afghan + culture = tajik religion = rahbari holding = castle_holding 1087.1.1 = { @@ -277,7 +277,7 @@ ##d_ghur ################################### ###c_ghur 4225 = { #Firuzkuh #AKA Chagcharan - culture = NEOW_aimaq + culture = afghan religion = rahbari holding = castle_holding special_building_slot = minarets_and_remains_of_jam_01 @@ -321,7 +321,7 @@ ##d_herat ################################### ###c_herat 4215 = { #Herat - culture = tajik + culture = afghan religion = azariqa holding = castle_holding @@ -513,12 +513,12 @@ holding = castle_holding } 4357 = { #munjan - culture = pomerien + culture = afghan religion = rahbari holding = castle_holding } 4362 = { #wakan - culture = pomerien + culture = afghan religion = rahbari holding = castle_holding } @@ -1244,7 +1244,7 @@ ###c_arrajan 4305 = { #Arrajan - culture = lur + culture = persian religion = rahbari holding = castle_holding 800.1.1 = { religion = rahbari } @@ -1273,13 +1273,13 @@ ###c_istakhr 4118 = { #Istakhr #Early Muslim town, Zoroastrian stronghold, abandoned in 10th century in favor of Shiraz - culture = lur + culture = kurd religion = rahbari holding = castle_holding special_building = tomb_of_cyrus_01 1160.1.1 = { religion = rahbari - culture = lur + culture = persian } 1178.1.1 = { religion = rahbari @@ -1437,7 +1437,7 @@ ###c_sardan 4122 = { #Lurijan - culture = lur + culture = persian religion = rahbari holding = castle_holding @@ -1474,7 +1474,7 @@ ###c_tustar 4256 = { #Tustar - culture = bedouin + culture = persian religion = rahbari holding = castle_holding 890.1.1 = { religion = rahbari } @@ -1567,7 +1567,7 @@ ###c_saimara 4261 = { #Saburkhawasht #actually Khorramabad, Saburkhawasht or Shapurkhast was the name of a Sasanian city in the same place that was destroyed in the late 7th century. A prominent castle in the same area was Dez-e Siah, "the Black Fortress", where the governors of Lurestan ruled from the mid-12th century; since this is a castle holding, I went with that name. - culture = lur + culture = persian religion = rahbari holding = castle_holding special_building = falak_ol_aflak_citadel_01 @@ -1577,7 +1577,7 @@ } } 4786 = { #As-saimara - culture = lur + culture = persian religion = rahbari holding = city_holding } @@ -1634,41 +1634,6 @@ } } -# 4507 - Ghazna -4507 = { # 4507 - Zabulistan - - # Misc - culture = afghan - religion = rahbari - - # History - - 1000.1.1 = { - religion = rahbari - } - 1178.1.1 = { - religion = rahbari - } -} - -# 4499 - Ghazna -4499 = { # 4499 - rukaj - - # Misc - culture = afghan - religion = rahbari - - # History - - 1000.1.1 = { - religion = rahbari - } - 1178.1.1 = { - religion = rahbari - } -} - - # 4345 - Panjhir 4345 = { # 4345 - Panjhir diff --git a/holder for later/common/landed_titles/central_asia.txt b/holder for later/common/landed_titles/central_asia.txt index 42899ddf9..ce862a2e0 100644 --- a/holder for later/common/landed_titles/central_asia.txt +++ b/holder for later/common/landed_titles/central_asia.txt @@ -649,11 +649,7 @@ e_turan = { } c_shughnan = { color = { 125 175 25 } - b_shughnan = { - province = 4363 - color = { 125 175 25 } - } b_alichur = { province = 4364 diff --git a/localization/english/replace/culture/cultures_l_english.yml b/localization/english/replace/culture/cultures_l_english.yml index ee25141ed..4e3d35fb8 100644 --- a/localization/english/replace/culture/cultures_l_english.yml +++ b/localization/english/replace/culture/cultures_l_english.yml @@ -410,12 +410,9 @@ kurdish:0 "Kurdish" kurdish_prefix:0 "Kurdo" kurdish_collective_noun:1 "Kurds" - afghan:0 "Pashtun" - afghan_prefix:0 "Pashtun" - afghan_collective_noun:1 "Pashtuns" - lur:0 "Lur" - lur_prefix:0 "Lur" - lur_collective_noun:1 "Lurs" + afghan:0 "Afghan" + afghan_prefix:0 "Afghan" + afghan_collective_noun:1 "Afghans" baloch:0 "Baloch" baloch_prefix:0 "Baloch" baloch_collective_noun:1 "Balochs" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index b35aa0a29..7e5b0f54b 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -107,8 +107,8 @@ b_buckingham:0 "Brackley" b_corby:0 "Corby" ## Buckingham/Windsor - d_buckingham:0 "Thames Valley" - d_buckingham_adj:0 "Thamesfolk" + d_buckingham:0 "Windsor" + d_buckingham_adj:0 "Windsorian" # Bekshire c_berkshire:0 "Berkshire" c_berkshire_adj:0 "Berkshirite"