Merge branch 'next-version-dev' of https://forgejo.damimani-alex.org/damimani/N3OW into next-version-dev

This commit is contained in:
JulesFlammenkueche 2026-09-13 23:17:54 +02:00
commit 0df993d933
7 changed files with 196 additions and 164 deletions

View file

@ -612,15 +612,6 @@ e_caucasia = {
color = { 40 185 195 } color = { 40 185 195 }
} }
} }
c_talish = {
color = { 0 125 75 }
b_talish = {
province = 4534
color = { 0 125 75 }
}
}
c_naxcivan = { c_naxcivan = {
color = { 180 90 95 } color = { 180 90 95 }

View file

@ -36,7 +36,15 @@ e_persia = {
color = { 5 170 170 } color = { 5 170 170 }
capital = c_gilan capital = c_gilan
c_talish = {
color = { 0 125 75 }
b_talish = {
province = 4534
color = { 0 125 75 }
}
}
c_gilan = { c_gilan = {
color = { 15 180 165 } color = { 15 180 165 }
@ -56,49 +64,6 @@ e_persia = {
color = { 10 175 165 } color = { 10 175 165 }
} }
} }
c_zanjan = {
color = { 0 135 175 }
b_zanjan = {
province = 4325
color = { 0 135 175 }
}
b_afshar = {
province = 4326
color = { 0 135 175 }
}
b_suhravard = {
province = 4327
color = { 0 135 175 }
}
b_abhar = {
province = 4324
color = { 40 165 135 }
}
}
c_qazwin = {
color = { 40 165 135 }
b_qazvin = {
province = 4323
color = { 40 165 135 }
}
b_alamut = {
province = 4006
color = { 40 165 135 }
}
b_qasran = {
province = 4322
color = { 40 80 180 }
}
}
} }
d_tabaristan = { d_tabaristan = {
@ -902,6 +867,49 @@ e_persia = {
color = { 125 110 255 } color = { 125 110 255 }
} }
} }
c_zanjan = {
color = { 0 135 175 }
b_zanjan = {
province = 4325
color = { 0 135 175 }
}
b_afshar = {
province = 4326
color = { 0 135 175 }
}
b_suhravard = {
province = 4327
color = { 0 135 175 }
}
b_abhar = {
province = 4324
color = { 40 165 135 }
}
}
c_qazwin = {
color = { 40 165 135 }
b_qazvin = {
province = 4323
color = { 40 165 135 }
}
b_alamut = {
province = 4006
color = { 40 165 135 }
}
b_qasran = {
province = 4322
color = { 40 80 180 }
}
}
} }
d_fars = { d_fars = {
@ -1291,7 +1299,7 @@ e_persia = {
k_makran = { k_makran = {
color = { 25 105 85 } color = { 25 105 85 }
capital = c_sibi # Bannajbur capital = c_kalat # Bannajbur
d_makran = { d_makran = {
color = { 30 100 80 } color = { 30 100 80 }
@ -1329,31 +1337,25 @@ e_persia = {
} }
c_sibi = { c_sibi = {
color = { 200 145 18 } color = { 200 145 18 }
b_mastang = {
province = 4511
color = { 200 145 18 }
}
b_sibi = { b_sibi = {
province = 4513 province = 4513
color = { 200 145 18 } color = { 200 145 18 }
}
b_kohlu = {
province = 4518
color = { 152 185 96 }
} }
b_pul = { b_mekhtar = {
province = 4497 province = 4519
color = { 200 145 18 } color = { 152 185 96 }
} }
b_asfanjay = { b_zhob = {
province = 4510 province = 4520
color = { 200 145 18 } color = { 152 185 96 }
}
b_shal = {
province = 4512
color = { 200 145 18 }
} }
} }
c_kiz = { c_kiz = {
@ -1372,27 +1374,36 @@ e_persia = {
} }
c_kalat = { c_kalat = {
color = { 152 185 96 } color = { 152 185 96 }
b_qiqan = {
province = 4488
b_loralai = { color = { 5 105 65 }
province = 4517
color = { 152 185 96 }
} }
b_kohlu = { b_qusdar = {
province = 4518 province = 4479
color = { 152 185 96 } color = { 5 105 65 }
} }
b_mekhtar = { b_wad = {
province = 4519 province = 4478
color = { 152 185 96 } color = { 5 105 65 }
} }
b_zhob = { b_budin = {
province = 4520 province = 4480
color = { 152 185 96 } color = { 5 105 65 }
} }
b_gajor = {
province = 4481
color = { 5 105 65 }
}
b_qandabil = {
province = 4487
color = { 5 105 65 }
}
} }
c_khawr = { c_khawr = {
color = { 25 95 65 } color = { 25 95 65 }
@ -1425,36 +1436,30 @@ e_persia = {
} }
c_turan = { c_turan = {
color = { 5 105 65 } color = { 5 105 65 }
b_shal = {
province = 4512
b_qusdar = { color = { 200 145 18 }
province = 4479 }
b_mastang = {
province = 4511
color = { 5 105 65 } color = { 200 145 18 }
} }
b_wad = { b_pul = {
province = 4478 province = 4497
color = { 5 105 65 } color = { 200 145 18 }
} }
b_budin = { b_asfanjay = {
province = 4480 province = 4510
color = { 5 105 65 } color = { 200 145 18 }
} }
b_gajor = { b_loralai = {
province = 4481 province = 4517
color = { 5 105 65 } color = { 152 185 96 }
}
b_qandabil = {
province = 4487
color = { 5 105 65 }
}
b_qiqan = {
province = 4488
color = { 5 105 65 }
} }
} }
} }

View file

@ -1233,6 +1233,11 @@ e_mashriq = {
color = { 60 210 150 } color = { 60 210 150 }
} }
b_shaqlabadh = {
province = 4775
color = { 40 190 130 }
}
} }
c_kurdistan = { c_kurdistan = {
color = { 40 190 130 } color = { 40 190 130 }
@ -1247,11 +1252,6 @@ e_mashriq = {
color = { 40 190 130 } color = { 40 190 130 }
} }
b_shaqlabadh = {
province = 4775
color = { 40 190 130 }
}
b_bamardani = { b_bamardani = {
province = 4776 province = 4776

View file

@ -778,7 +778,7 @@
707 = { # 707 - Melitene 707 = { # 707 - Melitene
# Misc # Misc
culture = kurd culture = kapadokyali
religion = alevi religion = alevi
holding = castle_holding holding = castle_holding
@ -886,8 +886,8 @@
5717 = { # 5717 - Tatvan 5717 = { # 5717 - Tatvan
# Misc # Misc
culture = NEOW_armenian culture = kurd
religion = armenian_apostolic religion = rahbari
holding = none holding = none

View file

@ -285,14 +285,14 @@
4869 = { # 4869 - Edessa 4869 = { # 4869 - Edessa
# Misc # Misc
culture = kurd culture = syrian
religion = majlisi religion = orthodox
} }
# 4870 - HARRAN # 4870 - HARRAN
4870 = { # Misc 4870 = { # Misc
culture = kurd culture = syrian
religion = majlisi religion = orthodox
} }
# 4871 - TALL_MAUZAN # 4871 - TALL_MAUZAN
@ -822,7 +822,7 @@
# 4777 - IRBIL # 4777 - IRBIL
4777 = { #Misc 4777 = { #Misc
culture = NEOW_turkmen culture = kurd
religion = majlisi religion = majlisi
} }

View file

@ -2,7 +2,7 @@
##d_nishapur ################################### ##d_nishapur ###################################
###c_nishapur ###c_nishapur
4017 = { #Nishapur 4017 = { #Nishapur
culture = tajik culture = persian
religion = rahbari #change from Gayomarthianism, as it was a big garrison town. religion = rahbari #change from Gayomarthianism, as it was a big garrison town.
holding = castle_holding holding = castle_holding
special_building = nishapur_mines_01 special_building = nishapur_mines_01
@ -31,7 +31,7 @@
###c_tus ###c_tus
4012 = { #Tus 4012 = { #Tus
culture = tajik culture = persian
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
special_building = imam_reza_shrine_01 special_building = imam_reza_shrine_01
@ -52,7 +52,7 @@
###c_samaiqan ###c_samaiqan
4039 = { #Samaiqan 4039 = { #Samaiqan
culture = tajik culture = persian
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
1060.1.1 = { 1060.1.1 = {
@ -68,7 +68,7 @@
###c_juwain ###c_juwain
4022 = { #Jajarm 4022 = { #Jajarm
culture = tajik culture = persian
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
1060.1.1 = { 1060.1.1 = {
@ -82,7 +82,7 @@
###c_baihaq ###c_baihaq
4019 = { #Keshmar 4019 = { #Keshmar
culture = tajik culture = persian
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
1060.1.1 = { 1060.1.1 = {
@ -177,7 +177,7 @@
###c_marvarrud ###c_marvarrud
4221 = { #Marv-ar-Rud 4221 = { #Marv-ar-Rud
culture = tajik culture = afghan
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
987.1.1 = { 987.1.1 = {
@ -199,7 +199,7 @@
###c_rivsharan ###c_rivsharan
4223 = { #Dizah 4223 = { #Dizah
culture = tajik culture = afghan
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
1087.1.1 = { 1087.1.1 = {
@ -215,7 +215,7 @@
###c_guzgan ###c_guzgan
4251 = { #Yahudan #AKA Yehudiya 4251 = { #Yahudan #AKA Yehudiya
culture = tajik culture = afghan
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
987.1.1 = { 987.1.1 = {
@ -321,7 +321,7 @@
##d_herat ################################### ##d_herat ###################################
###c_herat ###c_herat
4215 = { #Herat 4215 = { #Herat
culture = tajik culture = afghan
religion = azariqa religion = azariqa
holding = castle_holding holding = castle_holding
@ -422,7 +422,7 @@
###c_zirkuh ###c_zirkuh
4203 = { #Abiz 4203 = { #Abiz
culture = tajik culture = persian
religion = azariqa religion = azariqa
holding = castle_holding holding = castle_holding
987.1.1 = { 987.1.1 = {
@ -436,8 +436,8 @@
##d_balkh ################################### ##d_balkh ###################################
###c_balkh ###c_balkh
4335 = { #Balkh 4335 = { #Balkh
culture = sogdian culture = afghan
religion = khurramism religion = rahbari
holding = castle_holding holding = castle_holding
867.1.1 = { 867.1.1 = {
buildings = { buildings = {
@ -475,15 +475,9 @@
###c_west-tokharestan ###c_west-tokharestan
4341 = { #Samanjan 4341 = { #Samanjan
culture = sogdian culture = afghan
religion = mahayana religion = rahbari
holding = castle_holding holding = castle_holding
960.1.1 = {
culture = tajik
}
1060.1.1 = {
faith = rahbari
}
} }
4339 = { #Saan 4339 = { #Saan
holding = none holding = none
@ -494,15 +488,9 @@
###c_east-tokharestan ###c_east-tokharestan
4351 = { #Khulm 4351 = { #Khulm
culture = sogdian culture = afghan
religion = mahayana religion = rahbari
holding = castle_holding holding = castle_holding
960.1.1 = {
culture = tajik
}
1060.1.1 = {
faith = rahbari
}
} }
4347 = { #Andarab 4347 = { #Andarab
holding = church_holding holding = church_holding
@ -519,7 +507,21 @@
4352 = { #Mila 4352 = { #Mila
holding = none holding = none
} }
4355 = { #badakhshan
culture = afghan
religion = rahbari
holding = castle_holding
}
4357 = { #munjan
culture = afghan
religion = rahbari
holding = castle_holding
}
4362 = { #wakan
culture = afghan
religion = rahbari
holding = castle_holding
}
##d_nasa ################################### ##d_nasa ###################################
###c_abivard ###c_abivard
4044 = { #Abivard 4044 = { #Abivard
@ -558,7 +560,7 @@
##d_kohestan ################################### ##d_kohestan ###################################
###c_qain ###c_qain
4062 = { #Qain 4062 = { #Qain
culture = tajik culture = persian
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
} }
@ -580,7 +582,7 @@
###c_tun ###c_tun
4068 = { #Tun 4068 = { #Tun
culture = tajik culture = persian
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
} }
@ -617,7 +619,7 @@
###c_zanjan ###c_zanjan
4325 = { #Zanjan 4325 = { #Zanjan
culture = daylamite culture = persian
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
special_building_slot = soltaniyeh_01 special_building_slot = soltaniyeh_01
@ -631,7 +633,7 @@
###c_qazwin ###c_qazwin
4323 = { #Qazwin / Qazvin 4323 = { #Qazwin / Qazvin
culture = daylamite culture = persian
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
1130.1.1 = { religion = rahbari } 1130.1.1 = { religion = rahbari }
@ -839,8 +841,8 @@
##d_kirman ################################### ##d_kirman ###################################
###c_kirman ###c_kirman
4076 = { #Khabis 4076 = { #Khabis
culture = baloch #FP3 change after research culture = persian #FP3 change after research
religion = mazdayasna religion = rahbari
holding = castle_holding holding = castle_holding
} }
4077 = { #Zarand_PER 4077 = { #Zarand_PER
@ -1118,6 +1120,8 @@
holding = none holding = none
} }
4329 = { #Mazdaqan 4329 = { #Mazdaqan
culture = persian
religion = rahbari
holding = city_holding #placeholder holding = city_holding #placeholder
} }
4330 = { #Sharuq 4330 = { #Sharuq
@ -1155,7 +1159,9 @@
holding = church_holding #placeholder holding = church_holding #placeholder
} }
4764 = { #Sad Khaniya 4764 = { #Sad Khaniya
holding = city_holding #placeholder holding = castle_holding
culture = kurd
religion = rahbari
} }
4765 = { #Sanda 4765 = { #Sanda
holding = none holding = none
@ -1190,7 +1196,7 @@
###c_lar ###c_lar
4093 = { #Lar 4093 = { #Lar
culture = kurdish culture = kurd
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
1160.1.1 = { 1160.1.1 = {
@ -1212,7 +1218,7 @@
###c_darabjerd ###c_darabjerd
4171 = { #Darabjerd #AKA Darab 4171 = { #Darabjerd #AKA Darab
culture = kurdish culture = kurd
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
1160.1.1 = { 1160.1.1 = {
@ -1267,7 +1273,7 @@
###c_istakhr ###c_istakhr
4118 = { #Istakhr #Early Muslim town, Zoroastrian stronghold, abandoned in 10th century in favor of Shiraz 4118 = { #Istakhr #Early Muslim town, Zoroastrian stronghold, abandoned in 10th century in favor of Shiraz
culture = kurdish culture = kurd
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
special_building = tomb_of_cyrus_01 special_building = tomb_of_cyrus_01
@ -1525,7 +1531,7 @@
##d_kermanshah ################################### ##d_kermanshah ###################################
###c_kermanshah ###c_kermanshah
4781 = { #Kermanshah 4781 = { #Kermanshah
culture = kurdish culture = kurd
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
@ -1545,7 +1551,7 @@
###c_masabadhan ###c_masabadhan
4787 = { #Siravan 4787 = { #Siravan
culture = kurdish culture = kurd
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
1178.1.1 = { 1178.1.1 = {
@ -1561,7 +1567,7 @@
###c_saimara ###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. 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 = kurdish culture = kurd
religion = rahbari religion = rahbari
holding = castle_holding holding = castle_holding
special_building = falak_ol_aflak_citadel_01 special_building = falak_ol_aflak_citadel_01
@ -1571,7 +1577,7 @@
} }
} }
4786 = { #As-saimara 4786 = { #As-saimara
culture = kurdish culture = kurd
religion = rahbari religion = rahbari
holding = city_holding holding = city_holding
} }
@ -1650,10 +1656,34 @@
} }
4512 = {
# Misc
culture = baloch
religion = rahbari
# History
1400.1.1 = {
religion = rahbari
}
}
4513 = {
# Misc
culture = baloch
religion = rahbari
# History
1400.1.1 = {
religion = rahbari
}
}
4515 = { 4515 = {
# Misc # Misc
culture = kashmiri culture = afghan
religion = mahayana religion = rahbari
# History # History
@ -1808,6 +1838,12 @@
} }
4488 = { #Qiqan 4488 = { #Qiqan
holding = church_holding #placeholder holding = church_holding #placeholder
1060.1.1 = {
culture = baloch
}
1178.1.1 = {
religion = rahbari
}
} }
##d_jabal_kufs ################################### ##d_jabal_kufs ###################################

View file

@ -633,7 +633,7 @@
} }
###c_marash/Kahramanmaraş ###c_marash/Kahramanmaraş
4893 = { # Kahramanmaraş 4893 = { # Kahramanmaraş
culture = kapadokyali culture = cukurovali
religion = aqlani religion = aqlani
holding = castle_holding holding = castle_holding
} }