From d8261739fe25013aa70c751a40a76ad418eddb11 Mon Sep 17 00:00:00 2001 From: Damimani Date: Tue, 1 Jul 2025 21:57:42 +0200 Subject: [PATCH 01/12] champagne duchy done (no loc) --- common/landed_titles/alps.txt | 15 --- common/landed_titles/benelux.txt | 10 -- common/landed_titles/france.txt | 197 ++++++++++++++++++------------- common/landed_titles/italy.txt | 15 +++ history/titles/k_france.txt | 19 ++- map_data/definition.csv | 6 +- map_data/provinces.png | 4 +- 7 files changed, 152 insertions(+), 114 deletions(-) diff --git a/common/landed_titles/alps.txt b/common/landed_titles/alps.txt index 61122a89..2985c54e 100644 --- a/common/landed_titles/alps.txt +++ b/common/landed_titles/alps.txt @@ -9,21 +9,6 @@ e_alps = { capital = c_bern - d_aosta = { - color = { 101 8 34 } - - capital = c_aosta # Aosta - - c_aosta = { - color = { 90 5 15 } - - b_ivrea = { - province = 2040 - - color = { 115 25 45 } - } - } - } d_currezia = { color = { 255 220 220 } diff --git a/common/landed_titles/benelux.txt b/common/landed_titles/benelux.txt index 6610a522..5a1edc8d 100644 --- a/common/landed_titles/benelux.txt +++ b/common/landed_titles/benelux.txt @@ -621,16 +621,6 @@ e_benelux = { color = { 75 75 125 } } - b_champs = { - province = 2385 - - color = { 55 105 225 } - } - b_grand = { - province = 2386 - - color = { 55 105 225 } - } } } } diff --git a/common/landed_titles/france.txt b/common/landed_titles/france.txt index 8853788c..43f3af3f 100644 --- a/common/landed_titles/france.txt +++ b/common/landed_titles/france.txt @@ -358,25 +358,6 @@ e_france = { capital = c_amiens # Amiens - c_vermandois = { - color = { 20 50 220 } - - b_laon = { - province = 2400 - - color = { 20 50 220 } - } - b_saint_quentin = { - province = 2397 - - color = { 28 58 230 } - } - b_roucy = { - province = 2399 - - color = { 20 50 220 } - } - } c_eu = { color = { 20 20 130 } @@ -460,20 +441,6 @@ e_france = { color = { 35 65 230 } } } - c_compiegne = { - color = { 24 62 215 } - - b_marle = { - province = 2398 - - color = { 20 50 220 } - } - b_noyon = { - province = 2187 - - color = { 28 58 230 } - } - } } d_berry = { @@ -876,6 +843,69 @@ e_france = { } } } + d_ardennes = { + color = { 14 80 160 } + + capital = c_rethel + + c_rethel = { + color = { 4 70 170 } + + b_rethel = { + province = 2391 + + color = { 4 70 170 } + } + b_grandpre = { + province = 2393 + + color = { 4 70 170 } + } + b_mezieres = { + province = 2394 + + color = { 4 70 170 } + } + b_romigny = { + province = 2396 + + color = { 4 70 170 } + } + } + c_compiegne = { + color = { 24 62 215 } + + b_marle = { + province = 2398 + + color = { 20 50 220 } + } + b_noyon = { + province = 2187 + + color = { 28 58 230 } + } + } + c_vermandois = { + color = { 20 50 220 } + + b_laon = { + province = 2400 + + color = { 20 50 220 } + } + b_saint_quentin = { + province = 2397 + + color = { 28 58 230 } + } + b_roucy = { + province = 2399 + + color = { 20 50 220 } + } + } + } d_champagne = { color = { 7 60 160 } @@ -900,6 +930,11 @@ e_france = { color = { 7 60 160 } } + b_vitry_en_perthois = { + province = 2367 + + color = { 7 60 120 } + } } c_troyes = { color = { 15 55 145 } @@ -909,41 +944,26 @@ e_france = { color = { 15 55 145 } } - b_clairvaux = { - province = 2375 - - color = { 15 55 145 } - } - b_joinville = { - province = 2373 - - color = { 15 55 145 } - } - b_bar_sur_aube = { - province = 2372 - - color = { 15 55 145 } - } - b_romilly = { - province = 2365 - - color = { 12 48 170 } - } b_nogent = { province = 2368 color = { 20 80 145 } } - b_aube = { - province = 2369 - - color = { 20 80 145 } - } b_bar_sur_seine = { province = 2370 color = { 20 80 145 } } + b_bar_sur_aube = { + province = 2365 + + color = { 15 55 145 } + } + b_brienne_le_chateau = { + province = 9751 + + color = { 15 55 145 } + } } c_chalons = { color = { 7 60 120 } @@ -958,34 +978,49 @@ e_france = { color = { 7 60 120 } } - b_vitry_en_perthois = { - province = 2367 + b_fagnieres = { + province = 9749 color = { 7 60 120 } } } - c_rethel = { - color = { 4 70 170 } + c_langres = { + color = { 55 105 225 } - b_rethel = { - province = 2391 + b_langres = { + province = 2374 - color = { 4 70 170 } + color = { 55 105 225 } } - b_grandpre = { - province = 2393 + b_clairvaux = { + province = 2375 - color = { 4 70 170 } + color = { 15 55 145 } } - b_mezieres = { - province = 2394 + b_joinville = { + province = 2373 - color = { 4 70 170 } + color = { 15 55 145 } } - b_romigny = { - province = 2396 + b_grand = { + province = 2386 - color = { 4 70 170 } + color = { 55 105 225 } + } + b_chateauvillain = { + province = 9750 + + color = { 55 105 225 } + } + b_romilly = { + province = 2372 + + color = { 12 48 170 } + } + b_champs = { + province = 2385 + + color = { 55 105 225 } } } } @@ -1067,6 +1102,11 @@ e_france = { color = { 25 80 225 } } + b_aube = { + province = 2369 + + color = { 20 80 145 } + } } c_tonnerrois = { color = { 60 110 180 } @@ -1134,15 +1174,6 @@ e_france = { color = { 65 95 155 } } } - c_langres = { - color = { 55 105 225 } - - b_langres = { - province = 2374 - - color = { 55 105 225 } - } - } } d_poitou = { color = { 50 50 130 } diff --git a/common/landed_titles/italy.txt b/common/landed_titles/italy.txt index d982a249..7abc8c31 100644 --- a/common/landed_titles/italy.txt +++ b/common/landed_titles/italy.txt @@ -42,6 +42,21 @@ e_italy = { } } + d_aosta = { + color = { 101 8 34 } + + capital = c_aosta # Aosta + + c_aosta = { + color = { 90 5 15 } + + b_ivrea = { + province = 2040 + + color = { 115 25 45 } + } + } + } d_piedmonte = { color = { 191 158 158 } can_be_named_after_dynasty = no diff --git a/history/titles/k_france.txt b/history/titles/k_france.txt index 131e2991..50bd7bb0 100644 --- a/history/titles/k_france.txt +++ b/history/titles/k_france.txt @@ -30,6 +30,16 @@ d_valois = { holder = france_bonaparte_aragorn #aragorn bonaparte } } +c_compiegne = { + 2522.12.28 = { + holder = france_bonaparte_aragorn #aragorn bonaparte + } +} +c_vermandois = { + 2522.12.28 = { + holder = france_bonaparte_aragorn #aragorn bonaparte + } +} c_auvergne = { 2550.1.1 = { holder = france_joachim_murat #Joachim Murat @@ -127,6 +137,13 @@ c_troyes = { } } +c_langres = { + 2551.1.1 = { + holder = france0006 #miranda giry + liege = "d_burgundy" + } +} + d_burgundy = { 2540.1.1 = { holder = france0004 #eric leroux @@ -349,4 +366,4 @@ c_montpellier = { 2540.1.1 = { holder = france_edmond_daunte #Edmond Daunte } -} \ No newline at end of file +} diff --git a/map_data/definition.csv b/map_data/definition.csv index 6a24a84b..217e2e5d 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -9747,9 +9747,9 @@ 9746;51;57;73;Evron;x; 9747;93;60;201;Chinon;x; 9748;135;63;74;Ragusa Italy;x; -#9749;177;66;202;;x; -#9750;9;69;75;;x; -#9751;51;72;203;;x; +9749;177;66;202;Fagnieres;x; +9750;9;69;75;Chateauvillain;x; +9751;51;72;203;Brienne-le-Chateau;x; #9752;93;75;76;;x; #9753;135;78;204;;x; #9754;177;81;77;;x; diff --git a/map_data/provinces.png b/map_data/provinces.png index d62eca66..db78d81a 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e337629d3f893b502ef8ae126e00d4a5e7266174185f037635f2515a892c91f2 -size 100825241 +oid sha256:b35553291186db3bd8b5e1885a8e29a1e743ffe0465aed97a254e7a090190181 +size 100825561 From 31b826e2a104a0b462202e73f42320f328b195c2 Mon Sep 17 00:00:00 2001 From: Damimani Date: Tue, 1 Jul 2025 23:30:01 +0200 Subject: [PATCH 02/12] champagne loc --- common/landed_titles/france.txt | 32 +++++++++++------------ localization/english/titles_l_english.yml | 27 ++++++++++--------- map_data/definition.csv | 2 +- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/common/landed_titles/france.txt b/common/landed_titles/france.txt index 43f3af3f..9e873a3e 100644 --- a/common/landed_titles/france.txt +++ b/common/landed_titles/france.txt @@ -851,6 +851,11 @@ e_france = { c_rethel = { color = { 4 70 170 } + b_romigny = { + province = 2396 + + color = { 4 70 170 } + } b_rethel = { province = 2391 @@ -864,11 +869,6 @@ e_france = { b_mezieres = { province = 2394 - color = { 4 70 170 } - } - b_romigny = { - province = 2396 - color = { 4 70 170 } } } @@ -987,18 +987,18 @@ e_france = { c_langres = { color = { 55 105 225 } - b_langres = { + b_chaumont = { province = 2374 color = { 55 105 225 } } - b_clairvaux = { - province = 2375 + b_langres = { + province = 9750 - color = { 15 55 145 } + color = { 55 105 225 } } b_joinville = { - province = 2373 + province = 2372 color = { 15 55 145 } } @@ -1007,13 +1007,8 @@ e_france = { color = { 55 105 225 } } - b_chateauvillain = { - province = 9750 - - color = { 55 105 225 } - } b_romilly = { - province = 2372 + province = 2373 color = { 12 48 170 } } @@ -1121,6 +1116,11 @@ e_france = { color = { 60 110 180 } } + b_clairvaux = { + province = 2375 + + color = { 15 55 145 } + } } c_avalois = { color = { 65 118 155 } diff --git a/localization/english/titles_l_english.yml b/localization/english/titles_l_english.yml index e3e48ad8..0aa2bf44 100644 --- a/localization/english/titles_l_english.yml +++ b/localization/english/titles_l_english.yml @@ -2261,7 +2261,7 @@ b_challykala:0 "Chally-Kala" b_chalmazel:0 "Chalmazel" b_chalon:0 "Chalon" - b_chalons:0 "Châlons" + b_chalons:0 "Châlons-en-Champagne" b_chaloos:0 "Chaloos" b_chalus:0 "Châlus" b_cham:0 "Cham" @@ -2272,7 +2272,7 @@ b_chamnoo:0 "Chamnoo" b_champagnole:0 "Champagnole" b_champaner:0 "Champāner" - b_champs:0 "Champs" + b_champs:0 "Bourbonne-les-Bains" b_chancelade:0 "Chancelade" b_chanderi:0 "Chanderi" b_chandor:0 "Chandor" @@ -3379,6 +3379,7 @@ b_fadala:0 "Fadala" b_faenza:0 "Faenza" b_fagdatdezh:0 "Fagdatdezh" + b_fagnieres:0 "Fagnieres" b_fahan:0 "Fahan" b_fahraj:0 "Fahraj" b_fahraj_yazd:0 "Fahraj-Yazd" @@ -3918,10 +3919,10 @@ b_gralheira:1 "Cinfaes" b_granada:0 "Granada" b_grancanaria:1 "Tamaran" - b_grand:1 "Poulangy" + b_grand:1 "Nogent" b_grandmont:0 "Grandmont" b_grandola:0 "Grândola" - b_grandpre:0 "Grandpré" + b_grandpre:0 "Vouziers" b_grandson:0 "Grandson" b_grandtully:0 "Grandtully" b_grannagh:0 "Grannagh" @@ -6695,7 +6696,7 @@ b_meybod:0 "Meybod" b_mezen:0 "Mezen" b_mezeshka:0 "Mezeshka" - b_mezieres:0 "Mézières" + b_mezieres:0 "Sedan" b_mezokovesd:0 "Mezökövesd" b_mezotne:0 "Mežotne" b_mgarr:0 "Zurico" @@ -8527,8 +8528,8 @@ b_romanov:0 "Romanov" b_romans:0 "Romans" b_romerriki:1 "Raumaríki" - b_romigny:0 "Romigny" - b_romilly:0 "Romilly" + b_romigny:0 "Charleville-Mézières" + b_romilly:0 "Saint-Dizier" b_romney:0 "Romney" b_romny:0 "Romny" b_romorantin:0 "Romorantin" @@ -8691,7 +8692,7 @@ b_saint_brieuc:0 "Saint-Brieuc" b_saint_brevin_les_pins:0 "Saint-Brevin-les-Pins" b_saint_denis:0 "Saint-Denis" - b_saint_dizier:0 "Saint-Dizier" + b_saint_dizier:0 "Vitry-le-François" b_saint_flour:0 "Saint-Flour" b_saint_hubert:0 "Bastogne" b_saint_junien:0 "Saint-Junien" @@ -10937,7 +10938,7 @@ b_vitebsk:0 "Vitebsk" b_viterbo:0 "Viterbo" b_vitoria:0 "Vitoria" - b_vitry_en_perthois:0 "Vitry-en-Perthois" + b_vitry_en_perthois:0 "Montmirail" b_viveiro:0 "Viveiro" b_viviers:0 "Viviers" b_viyapura:0 "Viyapura" @@ -13274,8 +13275,8 @@ c_lancaster_adj:0 "Lancastrian" c_lanciano:0 "Lanciano" c_lanciano_adj:0 "Lancianean" - c_langres:0 "Langres" - c_langres_adj:0 "Langresian" + c_langres:0 "Haute-Marne" + c_langres_adj:0 "Marnian" c_laodikeia:0 "Laodikeia" c_laodikeia_adj:0 "Laodikeian" c_laois:0 "Laois" @@ -14152,8 +14153,8 @@ c_reni_adj:0 "Reni" c_rennes:0 "Rennais" c_rennes_adj:0 "Vilainian" - c_rethel:0 "Rethel" - c_rethel_adj:0 "Rethelian" + c_rethel:0 "Ardennes" + c_rethel_adj:0 "Ardennes" c_reval:1 "Rävala" c_reval_adj:1 "Rävalan" c_reze:0 "Rezé" diff --git a/map_data/definition.csv b/map_data/definition.csv index 217e2e5d..c4dd10b3 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -9748,7 +9748,7 @@ 9747;93;60;201;Chinon;x; 9748;135;63;74;Ragusa Italy;x; 9749;177;66;202;Fagnieres;x; -9750;9;69;75;Chateauvillain;x; +9750;9;69;75;Chaumont;x; 9751;51;72;203;Brienne-le-Chateau;x; #9752;93;75;76;;x; #9753;135;78;204;;x; From 7c27928646be73520a20045cf1963ddbd4f75c9d Mon Sep 17 00:00:00 2001 From: trashb0at Date: Fri, 4 Jul 2025 11:22:17 -0400 Subject: [PATCH 03/12] carantanians + moravians --- common/culture/cultures/NEOW_west_slavic.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/culture/cultures/NEOW_west_slavic.txt b/common/culture/cultures/NEOW_west_slavic.txt index 86f2f7a7..36a541cd 100644 --- a/common/culture/cultures/NEOW_west_slavic.txt +++ b/common/culture/cultures/NEOW_west_slavic.txt @@ -28,7 +28,7 @@ } } -moravian = { +NEOW_moravian = { color = { 0.35 0.8 0.8 } ethos = ethos_bureaucratic From 49c39c16671d15aafeacd527c7a5619ec573c7de Mon Sep 17 00:00:00 2001 From: Damimani Date: Fri, 4 Jul 2025 18:28:48 +0200 Subject: [PATCH 04/12] lorraine map done without loc --- common/landed_titles/benelux.txt | 139 ++++++++++++------------------- common/landed_titles/france.txt | 2 +- common/landed_titles/germany.txt | 89 ++++++++++++-------- map_data/provinces.png | 2 +- 4 files changed, 109 insertions(+), 123 deletions(-) diff --git a/common/landed_titles/benelux.txt b/common/landed_titles/benelux.txt index 5a1edc8d..817fd503 100644 --- a/common/landed_titles/benelux.txt +++ b/common/landed_titles/benelux.txt @@ -485,76 +485,7 @@ e_benelux = { } } } - - d_upper_lorraine = { # Upper Lotharingia - color = { 90 90 125 } - - capital = c_trier #Trier - - cultural_names = { - name_list_french = cn_upper_lorraine - name_list_norman = cn_upper_lorraine - } - - c_nancy = { - color = { 65 65 100 } - - b_nancy = { - province = 2709 - - color = { 65 65 100 } - } - b_epinal = { - province = 2078 - - color = { 65 65 100 } - } - b_blankenberg = { #L�nstadt - province = 2713 - - color = { 65 65 100 } - } - } - c_metz = { - color = { 85 85 140 } - - b_metz = { - province = 2708 - - color = { 85 85 140 } - } - b_saarburg = { - province = 2698 - - color = { 85 85 140 } - } - b_forbach = { - province = 2705 - - color = { 85 85 140 } - } - b_faulquemont = { - province = 2711 - - color = { 85 85 140 } - } - } - c_puttlingen = { - color = { 80 80 115 } - - b_puttlingen = { - province = 2710 - - color = { 80 80 115 } - } - b_finstigen = { #Finstingen - province = 2712 - - color = { 80 80 115 } - } - } - } - + d_bar = { color = { 24 95 226 } @@ -578,6 +509,11 @@ e_benelux = { color = { 24 95 226 } } + b_vaucouleurs = { + province = 2387 + + color = { 15 80 220 } + } } c_briey = { color = { 53 132 226 } @@ -593,21 +529,6 @@ e_benelux = { color = { 53 132 226 } } } - - c_vaucouleurs = { - color = { 15 80 220 } - - b_vaucouleurs = { - province = 2387 - - color = { 15 80 220 } - } - b_toul = { - province = 2079 - - color = { 15 80 220 } - } - } c_neufchateau = { color = { 75 75 125 } @@ -621,6 +542,54 @@ e_benelux = { color = { 75 75 125 } } + b_epinal = { + province = 2078 + + color = { 65 65 100 } + } + } + c_nancy = { + color = { 65 65 100 } + + b_nancy = { + province = 2709 + + color = { 65 65 100 } + } + b_blankenberg = { #L�nstadt + province = 2713 + + color = { 65 65 100 } + } + b_toul = { + province = 2079 + + color = { 15 80 220 } + } + } + c_metz = { + color = { 85 85 140 } + + b_metz = { + province = 2708 + + color = { 85 85 140 } + } + b_saarburg = { + province = 2698 + + color = { 85 85 140 } + } + b_faulquemont = { + province = 2711 + + color = { 85 85 140 } + } + b_finstigen = { #Finstingen + province = 2712 + + color = { 80 80 115 } + } } } } diff --git a/common/landed_titles/france.txt b/common/landed_titles/france.txt index 9e873a3e..8bc72a84 100644 --- a/common/landed_titles/france.txt +++ b/common/landed_titles/france.txt @@ -1039,7 +1039,7 @@ e_france = { color = { 40 85 145 } } - b_chaumont = { + b_chatillon_sur_seine = { province = 2381 color = { 40 85 145 } diff --git a/common/landed_titles/germany.txt b/common/landed_titles/germany.txt index e65853d1..878240c6 100644 --- a/common/landed_titles/germany.txt +++ b/common/landed_titles/germany.txt @@ -1352,16 +1352,11 @@ e_germany = { } } + k_rhineland = { color = { 17 178 17 } capital = c_mainz - } - k_alsace = { - color = { 205 205 230 } - - capital = c_strassburg #Strassburg - d_alsace = { color = { 205 205 230 } @@ -1380,15 +1375,10 @@ e_germany = { color = { 205 205 230 } } - b_lichtberg = { - province = 2723 + b_weissenburg = { + province = 2724 - color = { 205 205 230 } - } - b_bitsch = { - province = 2725 - - color = { 90 90 110 } + color = { 145 145 160 } } } c_colmar = { @@ -1424,13 +1414,26 @@ e_germany = { color = { 215 200 215 } } } + c_puttlingen = { + color = { 80 80 115 } + + b_puttlingen = { + province = 2710 + + color = { 80 80 115 } + } + b_lichtberg = { + province = 2723 + + color = { 205 205 230 } + } + b_bitsch = { + province = 2725 + + color = { 90 90 110 } + } + } } - } - k_koln = { - color = { 150 145 180 } - - capital = c_cologne # Cologne - d_lower_lorraine = { # Koln color = { 150 145 180 } @@ -1523,11 +1526,6 @@ e_germany = { } } } - } - k_trier = { - color = { 255 255 255 } - - capital = c_trier d_trier = { color = { 255 255 255 } @@ -1593,14 +1591,13 @@ e_germany = { color = { 145 140 153 } } + b_forbach = { + province = 2705 + + color = { 85 85 140 } + } } } - } - k_mainz = { - color = { 195 20 30 } - - capital = c_mainz - d_mainz = { color = { 195 20 30 } @@ -1685,11 +1682,6 @@ e_germany = { color = { 145 145 160 } } - b_weissenburg = { - province = 2724 - - color = { 145 145 160 } - } b_pirmasens = { province = 2730 @@ -1728,6 +1720,31 @@ e_germany = { } } + k_mainz = { + color = { 195 20 30 } + + capital = c_mainz + + } + k_trier = { + color = { 255 255 255 } + + capital = c_trier + } + k_alsace = { + color = { 205 205 230 } + + capital = c_strassburg #Strassburg + + } + k_koln = { + color = { 150 145 180 } + + capital = c_cologne # Cologne + + } + + k_saxony_proper = { color = { 229 201 22 } diff --git a/map_data/provinces.png b/map_data/provinces.png index db78d81a..529fe87a 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b35553291186db3bd8b5e1885a8e29a1e743ffe0465aed97a254e7a090190181 +oid sha256:42ee38d0ce9aa048e517a5e6e57379a51180649eeb35538c36c50f59ec3fc34a size 100825561 From cd0b63ab8d276b2c5f6648a5baddac9460d2def0 Mon Sep 17 00:00:00 2001 From: trashb0at Date: Fri, 4 Jul 2025 12:33:56 -0400 Subject: [PATCH 05/12] german cultural traditions --- .../culture/cultures/00_central_germanic.txt | 93 +++++++++++-------- 1 file changed, 56 insertions(+), 37 deletions(-) diff --git a/common/culture/cultures/00_central_germanic.txt b/common/culture/cultures/00_central_germanic.txt index c99c83e7..b8013571 100644 --- a/common/culture/cultures/00_central_germanic.txt +++ b/common/culture/cultures/00_central_germanic.txt @@ -1,16 +1,15 @@ saxon = { color = saxon - created = 843.1.1 - parents = { old_saxon } ethos = ethos_stoic heritage = heritage_central_germanic language = language_saxon martial_custom = martial_custom_male_only traditions = { - tradition_stand_and_fight - tradition_ruling_caste + tradition_ancient_miners + tradition_staunch_traditionalists tradition_religious_patronage + tradition_hard_working } name_list = name_list_saxon @@ -30,17 +29,16 @@ franconian = { color = { 0.5 0.5 0.5 } - created = 640.1.1 # Frankish settlements appeared along the Rhine during the 7th century - parents = { frankish } ethos = ethos_courtly heritage = heritage_central_germanic language = language_high_german martial_custom = martial_custom_male_only traditions = { - tradition_hereditary_hierarchy - tradition_astute_diplomats - tradition_castle_keepers + tradition_swords_for_hire + tradition_zealous_people + tradition_artisans + tradition_brewery } name_list = name_list_franconian @@ -66,11 +64,18 @@ swabian = { language = language_high_german martial_custom = martial_custom_male_only traditions = { - tradition_mountain_homes - tradition_parochialism tradition_hard_working + tradition_brewery + tradition_gardening + tradition_swords_for_hire } + dlc_tradition = { + trait = tradition_fp3_beacon_of_learning + requires_dlc_flag = legacy_of_persia + fallback = tradition_philosopher_culture + } + name_list = name_list_swabian coa_gfx = { german_group_coa_gfx western_coa_gfx } @@ -118,14 +123,16 @@ rottisch = { bavarian = { color = { 0.55 0.55 0.55 } - ethos = ethos_spiritual + ethos = ethos_courtly heritage = heritage_central_germanic language = language_high_german martial_custom = martial_custom_male_only traditions = { - tradition_zealous_people - tradition_stand_and_fight + tradition_brewery + tradition_astute_diplomats tradition_hereditary_hierarchy + tradition_ruling_caste + tradition_castle_keepers } name_list = name_list_bavarian @@ -211,9 +218,11 @@ austrian = { language = language_high_german martial_custom = martial_custom_male_only traditions = { - tradition_zealous_people - tradition_stand_and_fight - tradition_hereditary_hierarchy + tradition_mountain_homes + tradition_artisans + tradition_storytellers + tradition_festivities + tradition_staunch_traditionalists } name_list = name_list_bavarian @@ -239,9 +248,11 @@ NEOW_pomeranian = { language = language_saxon martial_custom = martial_custom_male_only traditions = { - tradition_stand_and_fight - tradition_ruling_caste - tradition_religious_patronage + tradition_seafaring + tradition_maritime_mercantilism + tradition_republican_legacy + tradition_music_theory + tradition_city_keepers } name_list = name_list_saxon @@ -267,9 +278,10 @@ brandenburger = { language = language_saxon martial_custom = martial_custom_male_only traditions = { - tradition_stand_and_fight tradition_ruling_caste - tradition_religious_patronage + tradition_legalistic + tradition_formation_fighting + tradition_city_keepers } name_list = name_list_saxon @@ -295,8 +307,8 @@ low_saxon = { language = language_saxon martial_custom = martial_custom_male_only traditions = { - tradition_stand_and_fight - tradition_ruling_caste + tradition_agrarian + tradition_artisans tradition_religious_patronage } @@ -323,11 +335,15 @@ hessian = { language = language_high_german martial_custom = martial_custom_male_only traditions = { - tradition_hereditary_hierarchy - tradition_astute_diplomats - tradition_castle_keepers + tradition_metal_craftsmanship + tradition_hard_working + tradition_parochialism + } + dlc_tradition = { + trait = tradition_fp3_beacon_of_learning + requires_dlc_flag = legacy_of_persia + fallback = tradition_philosopher_culture } - name_list = name_list_franconian coa_gfx = { german_group_coa_gfx western_coa_gfx } @@ -351,9 +367,11 @@ palatine = { language = language_high_german martial_custom = martial_custom_male_only traditions = { - tradition_hereditary_hierarchy - tradition_astute_diplomats - tradition_castle_keepers + tradition_metal_craftsmanship + tradition_hard_working + tradition_religious_patronage + tradition_fervent_temple_builders + tradition_maritime_mercantilism } name_list = name_list_franconian @@ -374,14 +392,15 @@ palatine = { kuhjung = { color = { 0.6 0.7 0.5 } - ethos = ethos_courtly + ethos = ethos_bellicose heritage = heritage_central_germanic language = language_high_german martial_custom = martial_custom_male_only traditions = { - tradition_hereditary_hierarchy - tradition_astute_diplomats + tradition_martial_admiration + tradition_reverence_for_veterans tradition_castle_keepers + tradition_diasporic } name_list = name_list_franconian @@ -407,9 +426,9 @@ turkisch = { language = language_high_german martial_custom = martial_custom_male_only traditions = { - tradition_hereditary_hierarchy - tradition_astute_diplomats - tradition_castle_keepers + tradition_diasporic + tradition_culinary_art + tradition_culture_blending } name_list = name_list_franconian From d21efe0d3f903faab12ade1df84525194b445806 Mon Sep 17 00:00:00 2001 From: trashmasteruni Date: Fri, 4 Jul 2025 18:42:43 +0200 Subject: [PATCH 06/12] penitente --- gfx/interface/icons/faith/penitente.dds | 3 +++ .../replace/religion/NEOW_religion_catholic_l_english.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 gfx/interface/icons/faith/penitente.dds diff --git a/gfx/interface/icons/faith/penitente.dds b/gfx/interface/icons/faith/penitente.dds new file mode 100644 index 00000000..1862bd37 --- /dev/null +++ b/gfx/interface/icons/faith/penitente.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4df9c372eacefa17bb36551a2788586d5f796d7da5b3f61a340cc783806ffb2 +size 40128 diff --git a/localization/english/replace/religion/NEOW_religion_catholic_l_english.yml b/localization/english/replace/religion/NEOW_religion_catholic_l_english.yml index 6d00e8a6..d0c7c4b8 100644 --- a/localization/english/replace/religion/NEOW_religion_catholic_l_english.yml +++ b/localization/english/replace/religion/NEOW_religion_catholic_l_english.yml @@ -38,11 +38,11 @@ utraquist_adherent_plural:0 "Calixtines" utraquist_desc:0 "Describing itself as neo-Hussite, the Calixtine Church separated from the Roman Catholic one shortly after the Event. Following in the footsteps of the Bohemian Reformation, the Calixtines put special emphasis on communion of both kinds, vernacular liturgy, as well as the belief that clergy should not hold secular power. Their beliefs resulted in persecution from the Catholic Church for heresy, leading to much resentment and rising radicalism among the Calixtine faithful." - penitente:0 "The Penitent Churches" + penitente:0 "Order of Penitents" penitente_adj:0 "Penitente" penitente_adherent:0 "Penitent" penitente_adherent_plural:0 "Penitents" - penitente_desc:0 "The Penitente are a group of Sevillianists who preach that humanity, and especially the Spanish people, are full of guilt and do not deserve salvation. They preach that the only hope to avoid eternal damnation is to accept one's guilt and do penance in order to be absolved by the Lord when he sees sincere repentance. Penances can be very varied, including self-flagellation, crucifixion, etc., but all of them usually coincide in that the penitent must suffer great pain during the penance so that his guilt can be absolved. All this is due to the fact that long before the event, when brothers were killing each other in a supposed holy war, a false prophet arose. This false prophet was none other than the antichrist who deceived the people of Spain that he had been sent by God Himself to restore the worship of the Lord and eradicate the wicked and degenerate from this land. The church in Spain instead of seeing through the lies of the antichrist, blinded by their hatred, wholeheartedly supported the antichrist, shepherding the people of Spain straight into the jaws of the beast. The antichrist demanded from the people their praise for being sent by god under threat of death for anyone who refused, the slaughter was such that he founded lakes and rivers throughout Spain with the blood of his victims. Fortunately the Lord did not abandon his people and sent his archangel Raphael to kill the antichrist, after which he punished the world with the event." + penitente_desc:0 "Penitent Orders are an ancient Spanish tradition, though many of them have since grown disillusioned with the Catholic Church. Rejecting both the Sevillian and Roman papacies as corrupt and misguided, the Penitentes preach that all of humanity is full of guilt and undeserving of salvation. To punish the pre-Event world for blindly following the generals of the Antichrist to war, the Lord sent unto them the Event, and the streets of Europe ran with the blood of the suffering. Greatly disappointed by his children, God's only order was that the remaining humans mustrepent their sins and the sins of their ancestors, sentencing them to unending penance. As the Lord is no longer willing to speak through any single holy man, the Penitents are organised into orders of flagellants, each member given the holy duty of suffering until absolution." cadaverist:0 "Cadaverist Catholic Church" cadaverist_adj:0 "Cadaverist" From 60bcd385f57ec6c18e8735a22a0841b2df33d717 Mon Sep 17 00:00:00 2001 From: trashb0at Date: Fri, 4 Jul 2025 13:41:25 -0400 Subject: [PATCH 07/12] Update provinces.png --- map_data/provinces.png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/map_data/provinces.png b/map_data/provinces.png index 529fe87a..48ba2ad8 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42ee38d0ce9aa048e517a5e6e57379a51180649eeb35538c36c50f59ec3fc34a -size 100825561 +oid sha256:1f20243d2fe87d60e1680c7907585e85613f0d3f61af94a72dcd130f88635b7b +size 1894258 From 2f1eabc27e6e8a6278ddee953aafbb1f1bdfc268 Mon Sep 17 00:00:00 2001 From: Damimani Date: Fri, 4 Jul 2025 21:14:40 +0200 Subject: [PATCH 08/12] alsace done (no loc) --- common/landed_titles/alps.txt | 6 ++--- common/landed_titles/germany.txt | 44 ++++++++++++++++++++------------ map_data/definition.csv | 24 ++++++++--------- map_data/provinces.png | 4 +-- 4 files changed, 44 insertions(+), 34 deletions(-) diff --git a/common/landed_titles/alps.txt b/common/landed_titles/alps.txt index 2985c54e..33020fe4 100644 --- a/common/landed_titles/alps.txt +++ b/common/landed_titles/alps.txt @@ -60,10 +60,10 @@ e_alps = { color = { 255 215 205 } } - b_porrentruy = { - province = 2056 + b_delemont = { + province = 9763 - color = { 215 200 215 } + color = { 255 215 205 } } } } diff --git a/common/landed_titles/germany.txt b/common/landed_titles/germany.txt index 878240c6..ce7d55e5 100644 --- a/common/landed_titles/germany.txt +++ b/common/landed_titles/germany.txt @@ -1370,6 +1370,20 @@ e_germany = { color = { 205 205 230 } } + b_selestat = { + province = 2719 + + color = { 210 200 220 } + } + b_salm = { + province = 2714 + + color = { 65 65 100 } + } + } + c_haugenau = { + color = { 220 200 225 } + b_haguenau = { province = 2722 @@ -1380,24 +1394,10 @@ e_germany = { color = { 145 145 160 } } - } - c_colmar = { - color = { 210 200 220 } + b_saverne = { + province = 9762 - b_colmar = { - province = 2717 - - color = { 210 200 220 } - } - b_selestat = { - province = 2719 - - color = { 210 200 220 } - } - b_salm = { - province = 2714 - - color = { 65 65 100 } + color = { 145 145 160 } } } c_sundgau = { @@ -1411,6 +1411,16 @@ e_germany = { b_ferrette = { province = 2720 + color = { 215 200 215 } + } + b_colmar = { + province = 2717 + + color = { 210 200 220 } + } + b_porrentruy = { + province = 2056 + color = { 215 200 215 } } } diff --git a/map_data/definition.csv b/map_data/definition.csv index c4dd10b3..651fcebe 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -9750,18 +9750,18 @@ 9749;177;66;202;Fagnieres;x; 9750;9;69;75;Chaumont;x; 9751;51;72;203;Brienne-le-Chateau;x; -#9752;93;75;76;;x; -#9753;135;78;204;;x; -#9754;177;81;77;;x; -#9755;9;84;205;;x; -#9756;51;87;78;;x; -#9757;93;90;206;;x; -#9758;135;93;79;;x; -#9759;177;96;207;;x; -#9760;9;99;80;;x; -#9761;51;102;208;;x; -#9762;93;105;81;;x; -#9763;135;108;209;;x; +9752;93;75;76;;x; +9753;135;78;204;;x; +9754;177;81;77;;x; +9755;9;84;205;;x; +9756;51;87;78;;x; +9757;93;90;206;;x; +9758;135;93;79;;x; +9759;177;96;207;;x; +9760;9;99;80;;x; +9761;51;102;208;;x; +9762;93;105;81;Saverne;x; +9763;135;108;209;Delemont;x; #9764;177;111;82;;x; #9765;9;114;210;;x; #9766;51;117;83;;x; diff --git a/map_data/provinces.png b/map_data/provinces.png index 48ba2ad8..cbd8ce64 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f20243d2fe87d60e1680c7907585e85613f0d3f61af94a72dcd130f88635b7b -size 1894258 +oid sha256:31c7d63e2b180c823d6db6c4c7c9100777ad243acf3767e9db323fe7e1974062 +size 100825561 From f7fab7aad04769d81d4f33f0741487df324845db Mon Sep 17 00:00:00 2001 From: Damimani Date: Sat, 5 Jul 2025 14:11:26 +0200 Subject: [PATCH 09/12] lorraine + alsace loc --- common/landed_titles/benelux.txt | 14 +++---- localization/english/titles_l_english.yml | 47 ++++++++++++----------- map_data/provinces.png | 2 +- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/common/landed_titles/benelux.txt b/common/landed_titles/benelux.txt index 817fd503..6ec3571d 100644 --- a/common/landed_titles/benelux.txt +++ b/common/landed_titles/benelux.txt @@ -532,20 +532,20 @@ e_benelux = { c_neufchateau = { color = { 75 75 125 } + b_epinal = { + province = 2715 + + color = { 65 65 100 } + } b_neufchateau = { province = 2384 color = { 75 75 125 } } b_vaudemont = { - province = 2715 - - color = { 75 75 125 } - } - b_epinal = { province = 2078 - color = { 65 65 100 } + color = { 75 75 125 } } } c_nancy = { @@ -580,7 +580,7 @@ e_benelux = { color = { 85 85 140 } } - b_faulquemont = { + b_forbach = { province = 2711 color = { 85 85 140 } diff --git a/localization/english/titles_l_english.yml b/localization/english/titles_l_english.yml index 0aa2bf44..dc6e83ca 100644 --- a/localization/english/titles_l_english.yml +++ b/localization/english/titles_l_english.yml @@ -604,7 +604,6 @@ b_altenburg:0 "Altenburg" b_altheebiyah:0 "Al Theebiyah" b_altiagay:0 "Altigay" - b_altkirch:0 "Altkirch" b_altmannstein:0 "Altmannstein" b_alto_aragon:0 "Alto Aragon" b_altona:0 "Altona" @@ -841,7 +840,7 @@ b_arges:0 "Argeș" b_argh:0 "Argh" b_arghana:0 "Arghana" - b_argonne:1 "Saint-Mihiel" + b_argonne:1 "Étein" b_argos:0 "Argos" b_arguvan:0 "Arguvan" b_argyrokastron:0 "Argyrokastron" @@ -1275,7 +1274,7 @@ b_baqa:0 "Baqa" b_baqofah:0 "Baqofah" b_baqubah:0 "Baqubah" - b_bar:0 "Bar" + b_bar:0 "Bar-le-Duc" b_bar_sur_aube:0 "Bar-sur-Aube" b_bar_sur_seine:0 "Bar-sur-Seine" b_bara:0 "Bara" @@ -1691,7 +1690,7 @@ b_blair:0 "Blair" b_blair_atholl:0 "Blair Atholl" b_blanchegarde:0 "Blanche Garde" - b_blankenberg:1 "Lünstadt" + b_blankenberg:1 "Lunéville" b_blankenburg:0 "Blankenburg" b_blanquefort:0 "Blanquefort" b_blarney:0 "Blarney" @@ -3460,7 +3459,7 @@ b_ferrara:0 "Ferrara" b_ferreries:0 "Ferreries" b_ferrero:0 "Ferrero" - b_ferrette:0 "Ferrette" + b_ferrette:0 "Thann" b_ferrol:0 "Ferrol" b_fes:0 "Fès" b_fesensac:1 "Fézensac" @@ -3482,7 +3481,7 @@ b_finglas:0 "Finglas" b_finlaggan:0 "Finlaggan" b_finnforsar:0 "Finnförsar" - b_finstigen:1 "Finstingen" + b_finstigen:1 "Sarrebourg" b_finstrom:0 "Finström" b_firabr:0 "Firabr" b_firdafylki:1 "Úlfasund" @@ -4206,7 +4205,7 @@ b_havering:0 "Havering" b_hawarden:0 "Hawarden" b_hawzen:0 "Hawzen" - b_hayange:0 "Hayange" + b_hayange:0 "Pont-à-Mousson" b_hayjanah:0 "Hayjanah" b_haykaberd:0 "Haykaberd" b_haymana:0 "Haymana" @@ -5977,7 +5976,7 @@ b_licata:0 "Licata" b_lice:0 "Lice" b_lichfield:0 "Lichfield" - b_lichtberg:0 "Lichtberg" + b_lichtberg:0 "Rohrbach" b_lichtenfels:0 "Lichtenfels" b_lichtensteig:0 "Lichtensteig" b_lida:0 "Lida" @@ -8010,7 +8009,7 @@ b_pori:0 "Pori" b_porkhov:0 "Porkhov" b_porkhovo:0 "Porkhovo" - b_porrentruy:0 "Porrentruy" + b_porrentruy:0 "Altkirch" b_portalegre:0 "Portalegre" b_portbonnel:0 "Port Bonnel" b_portchester:0 "Portchester" @@ -8127,7 +8126,7 @@ b_puthia:0 "Puthia" b_putivl:0 "Putivl" b_puttalam:0 "Puttalam" - b_puttlingen:0 "Puttlingen" + b_puttlingen:0 "Sarreguemines" b_putyatino:0 "Putyatino" b_pyaozero:0 "Pyaozero" b_pyras:0 "Pyras" @@ -8640,7 +8639,7 @@ b_saalfeld:0 "Saalfeld" b_saan:0 "Saan" b_saarbrucken:0 "Saarbrücken" - b_saarburg:0 "Saarburg" + b_saarburg:0 "Thionville" b_saarvesjaurr:0 "Sââ'rvesjäu'rr" b_sabalgarh:0 "Sabalgarh" b_saban:0 "Sab'an" @@ -8752,7 +8751,7 @@ b_salisbury:0 "Salisbury" b_salkhard:0 "Salkhard" b_salliballu:0 "Salliballu" - b_salm:0 "Salm" + b_salm:0 "Molsheim" b_salmas:0 "Salmas" b_salmydessus:0 "Salmydessus" b_salo:0 "Salo" @@ -9004,7 +9003,7 @@ b_schio:0 "Schio" b_schlanders:0 "Schlanders" b_schlawe:0 "Schlawe" - b_schlettstadt:0 "Schlettstadt" + b_schlettstadt:0 "Sélestat" b_schlochau:0 "Schlochau" b_schlutup:0 "Schlutup" b_schmalkalden:0 "Schmalkalden" @@ -10766,8 +10765,8 @@ b_vatra_dornei:0 "Vatra Dornei" b_vatsagulma:0 "Vatsagulma" b_vatselanjarvi:0 "Vatselänjärvi" - b_vaucouleurs:0 "Vaucouleurs" - b_vaudemont:1 "Vaudémont" + b_vaucouleurs:0 "Commercy" + b_vaudemont:1 "Saint-Dié-des-Vosges" b_vavuniya:0 "Vavuniya" b_vaxjo:0 "Växjö" b_vecchio:0 "Vecchio" @@ -11079,7 +11078,7 @@ b_weimar:0 "Weimar" b_weinheim:0 "Weinheim" b_weinsberg:0 "Weinsberg" - b_weissenburg:0 "Weissenburg" + b_weissenburg:0 "Wissembeurg" b_weitou:0 "Weitou" b_weixu:0 "Weixu" b_wekilbazar:0 "Wekilbazar" @@ -11876,7 +11875,7 @@ c_bandhugadha_adj:1 "Bāndhūgadhani" c_bannu:0 "Bannu" c_bannu_adj:0 "Bannu" - c_bar:0 "Bar" + c_bar:0 "Meuse" c_bar_adj:0 "Barian" c_barasuru:0 "Barasuru" c_barasuru_adj:0 "Barasuru" @@ -13763,8 +13762,8 @@ c_neopatras_adj:0 "Neopatrasian" c_neuchatel:1 "Neuchâtel" c_neuchatel_adj:1 "Neuchâtelian" - c_neufchateau:0 "Neufchâteau" - c_neufchateau_adj:0 "Neufchâteau" + c_neufchateau:0 "Vosges" + c_neufchateau_adj:0 "Vosgeser" c_nevers:0 "Nevers" c_nevers_adj:0 "Neverian" c_nice:0 "Nice" @@ -14071,8 +14070,8 @@ c_puri_adj:0 "Puri" c_purushapura:0 "Purushapura" c_purushapura_adj:0 "Purushapuran" - c_puttlingen:0 "Puttlingen" - c_puttlingen_adj:0 "Puttlinger" + c_puttlingen:0 "Sarreguemines" + c_puttlingen_adj:0 "Sarreguemines" c_qain:0 "Qain" c_qalqut:0 "Qalqut" c_qalqut_adj:0 "Qalquttan" @@ -15280,8 +15279,8 @@ d_baltic_pagan_reformed_adj:0 "Vidilist" d_baluchistan:0 "Baluchistan" d_baluchistan_adj:0 "Baluchistani" - d_bar:0 "Bar" - d_bar_adj:0 "Barrois" + d_bar:0 "Lorraine" + d_bar_adj:0 "Lorrainian" d_barcelona:0 "Barcelona" d_barcelona_adj:0 "Barcelonian" d_andorra:0 "Andorra" @@ -17708,6 +17707,7 @@ c_flevoland_adj:0 "Flevolander" c_ghazza:0 "Ghazza" c_ghazza_adj:0 "Ghazzan" + c_haugenau:0 "Haugenau" c_hauran:0 "Hauran" c_hauran_adj:0 "Haurani" c_juwair:0 "Juwair" @@ -23729,6 +23729,7 @@ b_weme:0 "Weme" b_shabe:0 "Shabe" b_save:0 "Save" + b_saverne:0 "Saverne" b_ketu:0 "Ketu" b_ifonyin:0 "Ifonyin" b_badagry:0 "Badagry" diff --git a/map_data/provinces.png b/map_data/provinces.png index cbd8ce64..62f0caa9 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31c7d63e2b180c823d6db6c4c7c9100777ad243acf3767e9db323fe7e1974062 +oid sha256:5ff6783f209ccd855ac442614dbd4d7604ada4639beabd7c9af35ca87ae5006a size 100825561 From 289ff15af244c9fccf1272ddcd39561ce44323eb Mon Sep 17 00:00:00 2001 From: trashb0at Date: Sat, 5 Jul 2025 10:15:59 -0400 Subject: [PATCH 10/12] map work --- common/landed_titles/italy.txt | 5 +++++ map_data/definition.csv | 28 ++++++++++++++-------------- map_data/provinces.png | 4 ++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/common/landed_titles/italy.txt b/common/landed_titles/italy.txt index 7abc8c31..ae7d5e1b 100644 --- a/common/landed_titles/italy.txt +++ b/common/landed_titles/italy.txt @@ -1461,6 +1461,11 @@ e_italy = { color = { 120 255 60 } } + b_gozo = { + province = 9756 + + color = { 140 255 60 } + } } } diff --git a/map_data/definition.csv b/map_data/definition.csv index 651fcebe..6350f3ba 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -9750,22 +9750,22 @@ 9749;177;66;202;Fagnieres;x; 9750;9;69;75;Chaumont;x; 9751;51;72;203;Brienne-le-Chateau;x; -9752;93;75;76;;x; -9753;135;78;204;;x; -9754;177;81;77;;x; -9755;9;84;205;;x; -9756;51;87;78;;x; -9757;93;90;206;;x; -9758;135;93;79;;x; -9759;177;96;207;;x; -9760;9;99;80;;x; -9761;51;102;208;;x; +9752;194;93;94;Enna;x; +9753;103;218;159;Bronte;x; +9754;60;36;147;Mount Etna;x; +9755;124;218;101;Capo d'Orlando;x; +9756;66;197;35;Gozo;x; +9757;83;112;75;Eolie;x; +9758;76;141;69;Battipaglia;x; +9759;168;24;222;Picetini;x; +9760;76;141;162;Troia;x; +9761;227;229;151;Barletta;x; 9762;93;105;81;Saverne;x; 9763;135;108;209;Delemont;x; -#9764;177;111;82;;x; -#9765;9;114;210;;x; -#9766;51;117;83;;x; -#9767;93;120;211;;x; +9764;177;111;82;Vesuvius;x; +9765;192;238;147;Sapri;x; +9766;151;229;74;Tricarico;x; +9767;151;229;211;Calvello;x; #9768;135;123;84;;x; #9769;177;126;212;;x; #9770;9;129;85;;x; diff --git a/map_data/provinces.png b/map_data/provinces.png index cbd8ce64..450778ed 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31c7d63e2b180c823d6db6c4c7c9100777ad243acf3767e9db323fe7e1974062 -size 100825561 +oid sha256:442584634bc938db9402bfaae1794c197d2b7b578520e91229e19c7fcfb6fb77 +size 1895093 From b7f7ed75321f2d234139861b4ddb319597148081 Mon Sep 17 00:00:00 2001 From: trashb0at Date: Sat, 5 Jul 2025 10:19:15 -0400 Subject: [PATCH 11/12] Update provinces.png --- map_data/provinces.png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/map_data/provinces.png b/map_data/provinces.png index 450778ed..cbd8ce64 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:442584634bc938db9402bfaae1794c197d2b7b578520e91229e19c7fcfb6fb77 -size 1895093 +oid sha256:31c7d63e2b180c823d6db6c4c7c9100777ad243acf3767e9db323fe7e1974062 +size 100825561 From 0ec96e7c1889e16cbe3ace40e423a59d7a7baf0d Mon Sep 17 00:00:00 2001 From: trashb0at Date: Sat, 5 Jul 2025 10:20:37 -0400 Subject: [PATCH 12/12] hopefully merge issues are fixed --- map_data/provinces.png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/map_data/provinces.png b/map_data/provinces.png index 62f0caa9..c170f6c6 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ff6783f209ccd855ac442614dbd4d7604ada4639beabd7c9af35ca87ae5006a -size 100825561 +oid sha256:5e6deb24c1b48b1b93ab0e5f1040c86a7d5d7def8ba81f45f60248b73a9cebc9 +size 1895087