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

This commit is contained in:
Fishedotjpg 2026-06-11 15:59:53 +01:00
commit 8f1c3223c4
6 changed files with 88 additions and 83 deletions

View file

@ -24,7 +24,7 @@ e_nistrenia = {
} }
k_transylvania = { k_transylvania = {
color = { 229 203 126 } color = { 216 180 108 }
capital = c_torda capital = c_torda
@ -724,7 +724,7 @@ e_nistrenia = {
} }
} }
k_dacia = { k_dacia = {
color = { 216 78 32 } color = { 204 82 30 }
capital = c_bucuresti capital = c_bucuresti
cultural_names = { cultural_names = {
@ -978,7 +978,7 @@ e_nistrenia = {
} }
k_moldavia = { k_moldavia = {
color = { 229 126 22 } color = { 221 131 28 }
capital = c_lapusna capital = c_lapusna

View file

@ -320,11 +320,11 @@ e_visegrad = {
} }
} }
d_pommerania = { # Pomerania d_pommerania = { # Pomerania
color = { 111 143 51 } color = { 165 70 33 }
capital = c_danzig # Tricity capital = c_danzig # Tricity
c_danzig = { # Tricity c_danzig = { # Tricity
color = { 75 125 75 } color = { 153 65 30 }
b_gdansk = { b_gdansk = {
province = 2830 province = 2830
@ -348,7 +348,7 @@ e_visegrad = {
} }
} }
c_berent = { # Tczew c_berent = { # Tczew
color = { 115 120 40 } color = { 204 87 40 }
b_trsow = { # Tczew b_trsow = { # Tczew
province = 3194 province = 3194
@ -364,7 +364,7 @@ e_visegrad = {
} }
} }
c_kolobrzeg = { # Stargard c_kolobrzeg = { # Stargard
color = { 121 163 58 } color = { 127 54 25 }
b_stargad = { # Stargard b_stargad = { # Stargard
province = 2825 province = 2825
@ -392,7 +392,7 @@ e_visegrad = {
} }
} }
c_koszalin = { c_koszalin = {
color = { 105 125 80 } color = { 229 97 45 }
b_koszalin = { b_koszalin = {
province = 2828 province = 2828
@ -416,7 +416,7 @@ e_visegrad = {
} }
} }
c_slupsk = { c_slupsk = {
color = { 75 130 90 } color = { 102 43 20 }
b_slupsk = { b_slupsk = {
province = 2827 province = 2827
@ -441,12 +441,12 @@ e_visegrad = {
} }
} }
d_lubusz = { d_lubusz = {
color = { 151 41 46 } color = { 216 72 43 }
capital = c_grunberg # Zielona Góra capital = c_grunberg # Zielona Góra
c_grunberg = { # Zielona Góra c_grunberg = { # Zielona Góra
color = { 210 85 30 } color = { 204 67 40 }
b_grunberg = { # Zielona Góra b_grunberg = { # Zielona Góra
province = 3064 province = 3064
@ -462,7 +462,7 @@ e_visegrad = {
} }
} }
c_landsberg = { # Gorzów c_landsberg = { # Gorzów
color = { 115 145 30 } color = { 229 76 45 }
b_landsberg = { # Gorzów Wielkopolski b_landsberg = { # Gorzów Wielkopolski
province = 3152 province = 3152
@ -482,7 +482,7 @@ e_visegrad = {
} }
} }
c_miedzyrzecz = { # Międzyrzecz c_miedzyrzecz = { # Międzyrzecz
color = { 115 45 30 } color = { 178 59 35 }
b_miedzyrzecz = { # Międzyrzecz b_miedzyrzecz = { # Międzyrzecz
province = 4901 province = 4901
@ -502,7 +502,7 @@ e_visegrad = {
} }
} }
c_zary = { # Żary c_zary = { # Żary
color = { 210 85 30 } color = { 255 84 50 }
b_gubin = { # Żary b_gubin = { # Żary
province = 3139 province = 3139
color = { 210 85 30 } color = { 210 85 30 }
@ -530,11 +530,11 @@ e_visegrad = {
} }
} }
d_wielkopolska = { # Greater Poland d_wielkopolska = { # Greater Poland
color = { 140 13 13 } color = { 140 30 21 }
capital = c_poznanska # Poznan capital = c_poznanska # Poznan
c_poznanska = { c_poznanska = {
color = { 140 13 13 } color = { 127 26 19 }
b_poznan = { b_poznan = {
province = 4900 province = 4900
@ -558,7 +558,7 @@ e_visegrad = {
} }
} }
c_kaliska = { c_kaliska = {
color = { 160 6 20 } color = { 153 31 22 }
b_kalisz = { b_kalisz = {
province = 4909 province = 4909
@ -578,7 +578,7 @@ e_visegrad = {
} }
} }
c_gnieznienska = { # Konin c_gnieznienska = { # Konin
color = { 150 15 10 } color = { 102 21 15 }
b_konin = { b_konin = {
province = 4908 province = 4908
@ -602,7 +602,7 @@ e_visegrad = {
} }
} }
c_wschowska = { # Leszno c_wschowska = { # Leszno
color = { 135 30 30 } color = { 178 36 26 }
b_siedlischo = { # Leszno b_siedlischo = { # Leszno
province = 3146 province = 3146
@ -622,7 +622,7 @@ e_visegrad = {
} }
} }
c_pila = { # Piła c_pila = { # Piła
color = { 115 160 40 } color = { 76 15 11 }
b_pila = { # Piła b_pila = { # Piła
province = 3186 province = 3186
@ -639,11 +639,11 @@ e_visegrad = {
} }
} }
d_pomerelia = { # Kuyavia-Pomerania d_pomerelia = { # Kuyavia-Pomerania
color = { 80 130 80 } color = { 214 32 32 }
capital = c_krajna # Bydgoszcz capital = c_krajna # Bydgoszcz
c_krajna = { # Bydgoszcz c_krajna = { # Bydgoszcz
color = { 80 110 80 } color = { 204 30 30 }
b_bydgoszcz = { b_bydgoszcz = {
province = 4921 province = 4921
@ -667,7 +667,7 @@ e_visegrad = {
} }
} }
c_torun = { # Toruń c_torun = { # Toruń
color = { 150 85 95 } color = { 229 34 34 }
b_torun = { # Toruń b_torun = { # Toruń
province = 3199 province = 3199
@ -691,7 +691,7 @@ e_visegrad = {
} }
} }
c_kujawy = { # Włocławek c_kujawy = { # Włocławek
color = { 190 75 50 } color = { 178 26 26 }
b_wloclawek = { # Włocławek b_wloclawek = { # Włocławek
province = 4919 province = 4919
@ -708,12 +708,12 @@ e_visegrad = {
} }
} }
d_kuyavia = { # Łódź d_kuyavia = { # Łódź
color = { 190 75 50 } color = { 191 28 42 }
capital = c_leczycka # Kruszwica capital = c_leczycka # Kruszwica
c_leczycka = { # Łódź c_leczycka = { # Łódź
color = { 210 50 10 } color = { 178 26 41 }
b_lodz = { # Łódź b_lodz = { # Łódź
province = 4925 province = 4925
@ -729,7 +729,7 @@ e_visegrad = {
} }
} }
c_ratibor = { # Częstochowa c_ratibor = { # Częstochowa
color = { 190 35 75 } color = { 204 30 47 }
b_czestochowa = { # Częstochowa b_czestochowa = { # Częstochowa
province = 526 province = 526
@ -745,7 +745,7 @@ e_visegrad = {
} }
} }
c_sieradzka = { # Piotrków c_sieradzka = { # Piotrków
color = { 210 75 10 } color = { 153 22 35 }
b_piotrkow = { # Piotrków Trybunalski b_piotrkow = { # Piotrków Trybunalski
province = 4927 province = 4927
@ -773,7 +773,7 @@ e_visegrad = {
} }
} }
c_gostyninska = { # Skierniewice c_gostyninska = { # Skierniewice
color = { 137 30 18 } color = { 229 34 53 }
b_skierniewice = { # Skierniewice b_skierniewice = { # Skierniewice
province = 8814 province = 8814
@ -790,11 +790,11 @@ e_visegrad = {
} }
} }
d_mazovia = { d_mazovia = {
color = { 125 46 36 } color = { 216 54 94 }
capital = c_czerska # Warsaw capital = c_czerska # Warsaw
c_czerska = { # Warsaw c_czerska = { # Warsaw
color = { 150 40 25 } color = { 204 51 89 }
b_warszawa = { # Warsaw b_warszawa = { # Warsaw
province = 4936 province = 4936
@ -810,7 +810,7 @@ e_visegrad = {
} }
} }
c_ostroleka = { # Ostrołęka c_ostroleka = { # Ostrołęka
color = { 231 10 30 } color = { 229 57 100 }
b_nur = { # Ostrołęka b_nur = { # Ostrołęka
province = 4947 province = 4947
@ -830,7 +830,7 @@ e_visegrad = {
} }
} }
c_plocka = { # Płock c_plocka = { # Płock
color = { 127 30 2 } color = { 178 44 78 }
b_plock = { # Płock b_plock = { # Płock
province = 529 province = 529
@ -850,7 +850,7 @@ e_visegrad = {
} }
} }
c_radomska = { # Radom c_radomska = { # Radom
color = { 150 30 5 } color = { 255 63 111 }
b_radom = { # Radom b_radom = { # Radom
province = 4953 province = 4953
@ -870,7 +870,7 @@ e_visegrad = {
} }
} }
c_siedlce = { # Siedlce c_siedlce = { # Siedlce
color = { 222 58 79 } color = { 153 38 66 }
b_siedlce = { # Siedlce b_siedlce = { # Siedlce
province = 8815 province = 8815
@ -895,11 +895,11 @@ e_visegrad = {
} }
} }
d_podlachia = { d_podlachia = {
color = { 246 31 38 } color = { 140 21 70 }
capital = c_bialystok capital = c_bialystok
c_bialystok = { # Białystok c_bialystok = { # Białystok
color = { 233 11 31 } color = { 153 22 77 }
b_bielastock = { # Białystok b_bielastock = { # Białystok
province = 5046 province = 5046
@ -915,7 +915,7 @@ e_visegrad = {
} }
} }
c_suwalki = { # Suwałki c_suwalki = { # Suwałki
color = { 195 14 34 } color = { 127 19 64 }
b_suwalki = { # Suwałki b_suwalki = { # Suwałki
province = 8816 province = 8816
@ -931,7 +931,7 @@ e_visegrad = {
} }
} }
c_lomzynska = { # Łomża c_lomzynska = { # Łomża
color = { 127 0 70 } color = { 178 26 89 }
b_lomza = { # Łomża b_lomza = { # Łomża
province = 4943 province = 4943
@ -952,11 +952,11 @@ e_visegrad = {
} }
} }
d_lubelia = { d_lubelia = {
color = { 108 47 44 } color = { 178 26 77 }
capital = c_lubelska capital = c_lubelska
c_lubelska = { # Lublin c_lubelska = { # Lublin
color = { 147 40 2 } color = { 153 22 68 }
b_lublin = { # Lublin b_lublin = { # Lublin
province = 4957 province = 4957
@ -976,7 +976,7 @@ e_visegrad = {
} }
} }
c_stezycka = { # Biała Podlaska c_stezycka = { # Biała Podlaska
color = { 73 13 33 } color = { 204 30 91 }
b_blotkowo = { # Biała Podlaska b_blotkowo = { # Biała Podlaska
province = 5059 province = 5059
@ -996,7 +996,7 @@ e_visegrad = {
} }
} }
c_chelm = { # Chełm c_chelm = { # Chełm
color = { 81 38 58 } color = { 127 19 57 }
b_kholm = { # Chełm b_kholm = { # Chełm
province = 5075 province = 5075
@ -1012,7 +1012,7 @@ e_visegrad = {
} }
} }
c_cherven = { # Zamość c_cherven = { # Zamość
color = { 35 212 136 } color = { 229 34 102 }
b_cherven_VOL = { # Zamość b_cherven_VOL = { # Zamość
province = 5073 province = 5073
@ -1038,9 +1038,9 @@ e_visegrad = {
} }
d_swietokrzyskie = { d_swietokrzyskie = {
color = { 91 35 62 } color = { 140 21 40 }
c_holy_cross = { c_holy_cross = {
color = { 91 35 62 } color = { 153 22 44 }
cultural_names = { cultural_names = {
name_list_polish = cn__s_act_wi_e_ogk_tokrzyskie name_list_polish = cn__s_act_wi_e_ogk_tokrzyskie
@ -1068,7 +1068,7 @@ e_visegrad = {
} }
} }
c_sandomierska = { # Ostrowiec c_sandomierska = { # Ostrowiec
color = { 147 16 2 } color = { 127 19 37 }
b_opatow = { # Ostrowiec Świętokrzyski b_opatow = { # Ostrowiec Świętokrzyski
province = 4961 province = 4961
@ -1097,10 +1097,10 @@ e_visegrad = {
capital = c_podhale capital = c_podhale
d_lesser_poland = { d_lesser_poland = {
color = { 137 6 20 } color = { 28 175 188 }
capital = c_krakowska # Kraków capital = c_krakowska # Kraków
c_krakowska = { # Kraków c_krakowska = { # Kraków
color = { 137 6 20 } color = { 26 175 178 }
b_krakow = { # Kraków b_krakow = { # Kraków
province = 527 province = 527
@ -1116,7 +1116,7 @@ e_visegrad = {
} }
} }
c_podhale = { # Podhale c_podhale = { # Podhale
color = { 117 6 2 } color = { 30 189 204 }
b_nowytarg = { # Nowy Targ b_nowytarg = { # Nowy Targ
province = 4969 province = 4969
@ -1128,7 +1128,7 @@ e_visegrad = {
} }
} }
c_sacz = { # Nowy Sącz c_sacz = { # Nowy Sącz
color = { 97 6 2 } color = { 22 142 153 }
b_sacz = { # Nowy Sącz b_sacz = { # Nowy Sącz
province = 532 province = 532
@ -1141,9 +1141,9 @@ e_visegrad = {
} }
} }
d_tatra = { d_tatra = {
color = { 115 0 0 } color = { 60 196 242 }
c_spis = { c_spis = {
color = { 115 0 0 } color = { 57 186 229 }
cultural_names = { cultural_names = {
name_list_mogyer = cn_szepesseg name_list_mogyer = cn_szepesseg
@ -1182,7 +1182,7 @@ e_visegrad = {
} }
} }
c_orava = { c_orava = {
color = { 255 40 65 } color = { 63 207 255 }
cultural_names = { cultural_names = {
name_list_hungarian = cn_arva name_list_hungarian = cn_arva
@ -1214,17 +1214,17 @@ e_visegrad = {
} }
k_silesia = { k_silesia = {
color = { 178 89 26 } color = { 165 81 24 }
capital = c_breslau # Wrocław capital = c_breslau # Wrocław
d_lower_silesia = { d_lower_silesia = {
color = { 230 60 20 } color = { 214 107 32 }
capital = c_breslau # Wrocław capital = c_breslau # Wrocław
c_breslau = { # Wrocław c_breslau = { # Wrocław
color = { 218 37 15 } color = { 204 99 30 }
b_breslau = { # Wrocław b_breslau = { # Wrocław
province = 3045 province = 3045
@ -1244,7 +1244,7 @@ e_visegrad = {
} }
} }
c_gorlitz = { # Görlitz c_gorlitz = { # Görlitz
color = { 12 63 28 } color = { 229 112 34 }
cultural_names = { cultural_names = {
name_list_NEOW_brandenburger = cn_gerlz # Eastern Lusatian German form name_list_NEOW_brandenburger = cn_gerlz # Eastern Lusatian German form
@ -1306,7 +1306,7 @@ e_visegrad = {
} }
} }
c_legnica = { # Legnica c_legnica = { # Legnica
color = { 225 80 40 } color = { 178 87 26 }
b_legnica = { # Legnica b_legnica = { # Legnica
province = 3058 province = 3058
@ -1330,7 +1330,7 @@ e_visegrad = {
} }
} }
c_miliez = { # Wałbrzych c_miliez = { # Wałbrzych
color = { 225 105 40 } color = { 255 124 38 }
b_bardo = { # Wałbrzych b_bardo = { # Wałbrzych
province = 3057 province = 3057
@ -1355,11 +1355,11 @@ e_visegrad = {
} }
} }
d_upper_silesia = { d_upper_silesia = {
color = { 180 20 100 } color = { 163 93 24 }
capital = c_bethen # Katowice capital = c_bethen # Katowice
c_bethen = { # Gop c_bethen = { # Gop
color = { 190 5 70 } color = { 153 85 22 }
b_strehlitz = { # Katowice b_strehlitz = { # Katowice
province = 3051 province = 3051
@ -1379,7 +1379,7 @@ e_visegrad = {
} }
} }
c_opole = { # Opole c_opole = { # Opole
color = { 180 20 100 } color = { 178 100 26 }
b_opole = { # Opole b_opole = { # Opole
province = 3052 province = 3052
@ -1399,7 +1399,7 @@ e_visegrad = {
} }
} }
c_nysa = { # Nysa c_nysa = { # Nysa
color = { 175 85 105 } color = { 127 71 19 }
b_nysa = { # Nysa b_nysa = { # Nysa
province = 3048 province = 3048
@ -1415,7 +1415,7 @@ e_visegrad = {
} }
} }
c_opava = { # Ostrava c_opava = { # Ostrava
color = { 190 90 38 } color = { 204 114 30 }
b_ostrava = { # Ostrava b_ostrava = { # Ostrava
province = 8828 province = 8828
@ -1435,7 +1435,7 @@ e_visegrad = {
} }
} }
c_cieszyn = { # Cieszyn c_cieszyn = { # Cieszyn
color = { 190 20 75 } color = { 102 57 15 }
b_cieszyn = { # Cieszyn b_cieszyn = { # Cieszyn
province = 3040 province = 3040

View file

@ -3437,7 +3437,7 @@ default_coastal_sea=coastal_sea
3808=hills 3808=hills
3809=plains 3809=plains
3810=mountains 3810=mountains
3811=hills 3811=mountains
3812=mountains 3812=mountains
3813=mountains 3813=mountains
3814=mountains 3814=mountains
@ -3481,10 +3481,10 @@ default_coastal_sea=coastal_sea
3855=mountains 3855=mountains
3856=hills 3856=hills
3857=hills 3857=hills
3858=hills 3858=mountains
3859=hills 3859=hills
3860=hills 3860=hills
3861=hills 3861=mountains
3862=hills 3862=hills
3863=wetlands 3863=wetlands
3864=wetlands 3864=wetlands
@ -3516,7 +3516,7 @@ default_coastal_sea=coastal_sea
3892=wetlands 3892=wetlands
3893=hills 3893=hills
3894=mountains 3894=mountains
3895=hills 3895=mountains
3896=forest 3896=forest
3897=forest 3897=forest
3898=wetlands 3898=wetlands
@ -4563,7 +4563,7 @@ default_coastal_sea=coastal_sea
4963=hills 4963=hills
4964=hills 4964=hills
4967=forest 4967=forest
4968=hills 4968=mountains
4969=mountains 4969=mountains
4971=hills 4971=hills
4972=farmlands 4972=farmlands
@ -4624,11 +4624,11 @@ default_coastal_sea=coastal_sea
5027=forest 5027=forest
5028=hills 5028=hills
5029=mountains 5029=mountains
5030=hills 5030=mountains
5031=mountains 5031=mountains
5032=mountains 5032=mountains
5033=hills 5033=hills
5034=hills 5034=mountains
5035=mountains 5035=mountains
5036=mountains 5036=mountains
5037=hills 5037=hills
@ -4654,10 +4654,10 @@ default_coastal_sea=coastal_sea
5057=forest 5057=forest
5058=forest 5058=forest
5059=forest 5059=forest
5060=hills 5060=mountains
5061=hills 5061=hills
5062=hills 5062=hills
5063=tells 5063=hills
5064=hills 5064=hills
5065=hills 5065=hills
5066=hills 5066=hills
@ -4674,8 +4674,8 @@ default_coastal_sea=coastal_sea
5077=hills 5077=hills
5078=hills 5078=hills
5079=forest 5079=forest
5080=hills 5080=mountains
5081=hills 5081=forest
5082=plains 5082=plains
5083=farmlands 5083=farmlands
5084=plains 5084=plains
@ -4897,7 +4897,7 @@ default_coastal_sea=coastal_sea
5303=hills 5303=hills
5304=hills 5304=hills
5305=wetlands 5305=wetlands
5306=hills 5306=forest
5307=plains 5307=plains
5308=steppe 5308=steppe
5309=steppe 5309=steppe
@ -8079,7 +8079,7 @@ default_coastal_sea=coastal_sea
8823=hills 8823=hills
8824=hills 8824=hills
8825=hills 8825=hills
8826=hills 8826=mountains
8827=mountains 8827=mountains
8828=hills 8828=hills
8829=forest 8829=forest
@ -8114,7 +8114,7 @@ default_coastal_sea=coastal_sea
8858=mountains 8858=mountains
8859=mountains 8859=mountains
8860=hills 8860=hills
8861=hills 8861=mountains
8862=hills 8862=hills
8863=mountains 8863=mountains
8864=mountains 8864=mountains
@ -11475,7 +11475,7 @@ default_coastal_sea=coastal_sea
12330=mountains 12330=mountains
12331=mountains 12331=mountains
12332=plains 12332=plains
12333=wetlands 12333=tells
12334=plains 12334=plains
12335=plains 12335=plains
12336=mountains 12336=mountains

View file

@ -952,6 +952,11 @@
adventurer adventurer
gallant gallant
} }
sins = {
gallowsbait
sadistic
callous
}
} }
} }

View file

@ -429,7 +429,7 @@
#Tenets | placeholder #Tenets | placeholder
doctrine = tenet_pursuit_of_power doctrine = tenet_pursuit_of_power
doctrine = tenet_wandering_bards doctrine = tenet_chivalric_ideals
doctrine = core_tenet_peacekeeping doctrine = core_tenet_peacekeeping
doctrine = doctrine_no_head doctrine = doctrine_no_head
holy_order_names = { #placeholder holy_order_names = { #placeholder

View file

@ -694,7 +694,7 @@
###c_sacz/Nowy Sącz ###c_sacz/Nowy Sącz
532 = { # Nowy Sącz 532 = { # Nowy Sącz
culture = goral culture = goral
religion = mariavite religion = cadaverist
holding = castle_holding holding = castle_holding
} }
4968 = { # Dębica 4968 = { # Dębica