From b1524cae8df3e1df4a33b2ad56cba3d7118a3e4e Mon Sep 17 00:00:00 2001 From: Damimani Date: Mon, 2 Jun 2025 17:28:08 +0200 Subject: [PATCH 1/4] anjou/lower loire done --- common/landed_titles/france.txt | 111 +++++++++++----------- localization/english/titles_l_english.yml | 24 ++--- map_data/definition.csv | 2 +- map_data/provinces.png | 4 +- 4 files changed, 73 insertions(+), 68 deletions(-) diff --git a/common/landed_titles/france.txt b/common/landed_titles/france.txt index 7f58584c..ff720882 100644 --- a/common/landed_titles/france.txt +++ b/common/landed_titles/france.txt @@ -393,6 +393,35 @@ e_france = { color = { 10 16 243 } } } + c_tourraine = { + color = { 25 65 225 } + + b_tours = { + province = 2274 + + color = { 25 65 225 } + } + b_tourraine = { #Langeais + province = 2273 + + color = { 25 65 225 } + } + b_loches = { + province = 2275 + + color = { 25 65 225 } + } + b_la_haye = { + province = 2276 + + color = { 30 40 220 } + } + b_le_lude = { + province = 2269 + + color = { 5 95 235 } + } + } c_issoudun = { color = { 25 50 250 } @@ -447,40 +476,6 @@ e_france = { color = { 5 95 235 } } - b_le_lude = { - province = 2269 - - color = { 5 95 235 } - } - b_craon = { - province = 2262 - - color = { 5 95 235 } - } - } - c_tourraine = { - color = { 25 65 225 } - - b_tours = { - province = 2274 - - color = { 25 65 225 } - } - b_tourraine = { #Langeais - province = 2273 - - color = { 25 65 225 } - } - b_loches = { - province = 2275 - - color = { 25 65 225 } - } - b_la_haye = { - province = 2276 - - color = { 30 40 220 } - } } c_saumur = { color = { 30 80 230 } @@ -490,26 +485,12 @@ e_france = { color = { 30 80 230 } } - b_melay = { + b_cholet = { province = 2260 color = { 30 80 230 } } } - c_chartres = { - color = { 23 38 255 } - - b_dreux = { - province = 2331 - - color = { 23 38 255 } - } - b_nogent_le_rotrou = { - province = 2323 - - color = { 23 38 255 } - } - } c_maine = { color = { 15 80 205 } @@ -528,15 +509,15 @@ e_france = { color = { 15 80 205 } } - } - c_sable = { - color = { 10 110 250 } - b_sable = { province = 2264 color = { 10 110 250 } } + } + c_sable = { + color = { 10 110 250 } + b_mayenne = { province = 2266 @@ -547,6 +528,16 @@ e_france = { color = { 10 110 250 } } + b_craon = { + province = 2262 + + color = { 5 95 235 } + } + b_evron = { + province = 9746 + + color = { 5 95 235 } + } } } @@ -710,6 +701,20 @@ e_france = { color = { 5 30 175 } } } + c_chartres = { + color = { 23 38 255 } + + b_dreux = { + province = 2331 + + color = { 23 38 255 } + } + b_nogent_le_rotrou = { + province = 2323 + + color = { 23 38 255 } + } + } c_blois = { color = { 42 65 190 } diff --git a/localization/english/titles_l_english.yml b/localization/english/titles_l_english.yml index e6e26f5c..cebfe99a 100644 --- a/localization/english/titles_l_english.yml +++ b/localization/english/titles_l_english.yml @@ -2555,7 +2555,7 @@ b_coulogne:0 "Coulogne" b_coulommiers:0 "Coulommiers" b_coupar_angus:1 "Scone" - b_courcillon:0 "Courcillon" + b_courcillon:0 "Montval-sur-Loir" b_courtenay:0 "Courtenay" b_courtrai:0 "Courtrai" b_coutances:0 "Coutances" @@ -3337,7 +3337,7 @@ b_evesham:0 "Ledbury" b_evora:0 "Évora" b_evreux:1 "Évreux" - b_evron:0 "Evron" + b_evron:0 "Évron" b_ewell:0 "Ewell" b_ewloe:0 "Ewloe" b_ewyas_harold:0 "Ewyas Harold" @@ -5685,7 +5685,7 @@ b_kyzylsu:0 "Kyzyl Su" b_kyzylyar:0 "Kyzyl-Yar" b_kzyluzen:0 "Kzyl-Uzen" - b_la_fleche:0 "La Flèche" + b_la_fleche:0 "Baugé-en-Anjou" b_la_haye:0 "La Haye" b_la_peyrade:0 "La Peyrade" b_la_roche-bernard:0 "La Roche-bernard" @@ -6150,7 +6150,7 @@ b_lugny:0 "Lugny" b_lugo:0 "Lugo" b_lugos:0 "Lugos" - b_luigne:0 "Luigné" + b_luigne:0 "Segré-en-Anjou Bleu" b_lujavvr:0 "Lujavv'r" b_lukh:0 "Lukh" b_lukow:0 "Łuków" @@ -8905,7 +8905,7 @@ b_sarsink:0 "Sarsink" b_sarskoyegorodishche:0 "Sarskoye Gorodishche" b_sartene:0 "Sartène" - b_sarthe:1 "Ballon" + b_sarthe:1 "Mamers" b_sarum:0 "Sarum" b_sarvantikar:0 "Sarvantikar" b_sarvar:0 "Sárvár" @@ -11638,8 +11638,8 @@ c_anhalt_adj:0 "Anhaltian" c_ani:0 "Ani" c_ani_adj:0 "Anian" - c_anjou:0 "Anjou" - c_anjou_adj:0 "Angevin" + c_anjou:0 "Maine-et-Loire" + c_anjou_adj:0 "Loiran" c_ankober:0 "Ankober" c_ankober_adj:0 "Ankoberian" c_ankyra:0 "Ankyra" @@ -13421,8 +13421,8 @@ c_mahoyadapuram_adj:0 "Mahoyadapuram" c_mahra:0 "Mahra" c_mahra_adj:0 "Mahran" - c_maine:0 "Maine" - c_maine_adj:0 "Mainian" + c_maine:0 "Sarthe" + c_maine_adj:0 "Sarthian" c_mainz:0 "Mainz" c_mainz_adj:0 "Mainzian" c_makran:0 "Makran" @@ -14195,7 +14195,7 @@ c_ryazan_adj:0 "Ryazanian" c_saarbrucken:0 "Saarbrücken" c_saarbrucken_adj:0 "Saarbrückener" - c_sable:1 "Sablé" + c_sable:1 "Mayenne" c_sable_adj:0 "Sablian" c_sabzevar:0 "Sabzevar" c_sacz:0 "Sącz" @@ -15186,8 +15186,8 @@ d_angria_adj:0 "Angarian" d_anhalt:0 "Anhalt" d_anhalt_adj:0 "Anhalter" - d_anjou:0 "Anjou" - d_anjou_adj:0 "Angevin" + d_anjou:0 "Pays de la Loire" + d_anjou_adj:0 "Loirin" d_antioch:0 "Antioch" d_antioch_adj:0 "Antiochian" d_anupa:0 "Anupa" diff --git a/map_data/definition.csv b/map_data/definition.csv index d72eb5b8..c665742d 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -9744,7 +9744,7 @@ 9743;135;48;199;Zone Rouge;x 9744;177;51;72;Zone Rouge;x 9745;9;54;200;Zone Rouge;x -#9746;51;57;73;;x; +9746;51;57;73;Evron;x; #9747;93;60;201;;x; #9748;135;63;74;;x; #9749;177;66;202;;x; diff --git a/map_data/provinces.png b/map_data/provinces.png index b3f1c57d..faeb18e6 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:fe51f7fa9af7184e372ad487ab27e0d8b4cbf00d05221e962f2df7f84e93d0f2 -size 1849409 +oid sha256:8647e37bfdf21763af87aa4dbe116577533047db28ab90c8c89093caeb28e1f9 +size 100825241 From 9020db84880a49af9b52618e4a96daeb4f9e753c Mon Sep 17 00:00:00 2001 From: trashb0at Date: Mon, 2 Jun 2025 11:34:03 -0400 Subject: [PATCH 2/4] french traditions --- common/culture/cultures/NEOW_french.txt | 19 +++++++++++-------- common/culture/cultures/NEOW_hebraic.txt | 4 ++-- .../culture/cultures/NEOW_italo_dalmatian.txt | 3 ++- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/common/culture/cultures/NEOW_french.txt b/common/culture/cultures/NEOW_french.txt index 2a705e50..c86a20fb 100644 --- a/common/culture/cultures/NEOW_french.txt +++ b/common/culture/cultures/NEOW_french.txt @@ -82,9 +82,10 @@ bourguignon = { martial_custom = martial_custom_equal traditions = { tradition_chanson_de_geste - tradition_hereditary_hierarchy + tradition_agrarian tradition_chivalry - tradition_brewery + tradition_culinary_art + tradition_staunch_traditionalists } name_list = name_list_NEOW_french @@ -119,9 +120,10 @@ axiton = { martial_custom = martial_custom_equal traditions = { tradition_chanson_de_geste - tradition_hereditary_hierarchy + tradition_castle_keepers tradition_chivalry tradition_brewery + tradition_gardening } name_list = name_list_NEOW_french @@ -156,7 +158,7 @@ provencal = { martial_custom = martial_custom_equal traditions = { tradition_chanson_de_geste - tradition_hereditary_hierarchy + tradition_maritime_mercantilism tradition_chivalry tradition_brewery } @@ -193,9 +195,9 @@ patoues = { martial_custom = martial_custom_equal traditions = { tradition_chanson_de_geste - tradition_hereditary_hierarchy + tradition_highland_warriors tradition_chivalry - tradition_brewery + tradition_mountain_homes } name_list = name_list_NEOW_french @@ -232,6 +234,7 @@ picard = { tradition_warrior_culture tradition_chivalry tradition_reverence_for_veterans + tradition_staunch_traditionalists } name_list = name_list_NEOW_french @@ -306,7 +309,7 @@ poitevin = { martial_custom = martial_custom_equal traditions = { tradition_chanson_de_geste - tradition_hereditary_hierarchy + tradition_castle_keepers tradition_chivalry tradition_brewery } @@ -343,7 +346,7 @@ gascon = { martial_custom = martial_custom_equal traditions = { tradition_chanson_de_geste - tradition_hereditary_hierarchy + tradition_stalwart_defenders tradition_chivalry tradition_brewery } diff --git a/common/culture/cultures/NEOW_hebraic.txt b/common/culture/cultures/NEOW_hebraic.txt index 49f9ee75..1a03e094 100644 --- a/common/culture/cultures/NEOW_hebraic.txt +++ b/common/culture/cultures/NEOW_hebraic.txt @@ -6,11 +6,11 @@ language = language_sarphatique martial_custom = martial_custom_equal traditions = { + tradition_chanson_de_geste tradition_diasporic - tradition_caravaneers + tradition_chivalry tradition_philosopher_culture tradition_maritime_mercantilism - tradition_mobile_guards } name_list = name_list_sephardi diff --git a/common/culture/cultures/NEOW_italo_dalmatian.txt b/common/culture/cultures/NEOW_italo_dalmatian.txt index ec3d7e99..6e6df45a 100644 --- a/common/culture/cultures/NEOW_italo_dalmatian.txt +++ b/common/culture/cultures/NEOW_italo_dalmatian.txt @@ -71,8 +71,9 @@ azurrano = { language = language_sardinian martial_custom = martial_custom_male_only traditions = { + tradition_maritime_mercantilism + tradition_culture_blending tradition_stalwart_defenders - tradition_isolationist } name_list = name_list_sardinian From 5451de577963a3a20c8b2f3a4d877ad35c62d04e Mon Sep 17 00:00:00 2001 From: trashb0at Date: Mon, 2 Jun 2025 12:37:46 -0400 Subject: [PATCH 3/4] france terrain + beur stuff --- common/culture/cultures/NEOW_french.txt | 7 +- .../province_terrain/00_province_terrain.txt | 350 +++++++++--------- 2 files changed, 179 insertions(+), 178 deletions(-) diff --git a/common/culture/cultures/NEOW_french.txt b/common/culture/cultures/NEOW_french.txt index c86a20fb..b91a228b 100644 --- a/common/culture/cultures/NEOW_french.txt +++ b/common/culture/cultures/NEOW_french.txt @@ -377,15 +377,14 @@ gascon = { beur = { color = { 0.4 0.9 0.9 } - ethos = ethos_courtly + ethos = ethos_spiritual heritage = heritage_arabic language = language_french martial_custom = martial_custom_equal traditions = { - tradition_chanson_de_geste - tradition_hereditary_hierarchy + tradition_maritime_mercantilism tradition_chivalry - tradition_brewery + tradition_practiced_pirates } name_list = name_list_maghrebi diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index 8c58a74c..2d45c8c2 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -1727,7 +1727,7 @@ default_coastal_sea=coastal_sea 2002=plains 2003=hills 2004=hills -2005=plains +2005=farmlands 2006=hills 2007=mountains 2008=mountains @@ -1735,18 +1735,18 @@ default_coastal_sea=coastal_sea 2010=mountains 2011=mountains 2012=hills -2013=plains -2014=plains -2015=plains +2013=farmlands +2014=farmlands +2015=farmlands 2016=wetlands -2017=plains -2018=plains -2019=plains +2017=farmlands +2018=farmlands +2019=farmlands 2020=hills 2021=mountains 2022=mountains -2023=plains -2024=plains +2023=forest +2024=forest 2025=hills 2026=mountains 2027=mountains @@ -1779,30 +1779,30 @@ default_coastal_sea=coastal_sea 2054=plains 2055=mountains 2056=forest -2057=plains -2058=plains -2059=plains +2057=forest +2058=farmlands +2059=farmlands 2060=hills 2061=hills -2062=plains +2062=farmlands 2063=hills -2064=plains -2065=plains +2064=farmlands +2065=farmlands 2066=hills -2067=plains +2067=forest 2068=hills -2069=plains -2070=plains -2071=plains -2072=plains -2073=plains +2069=forest +2070=farmlands +2071=farmlands +2072=forest +2073=farmlands 2074=hills 2075=plains 2076=farmlands -2077=plains -2078=plains +2077=forest +2078=forest 2079=plains -2080=plains +2080=farmlands 2081=forest 2082=plains 2083=plains @@ -1851,93 +1851,93 @@ default_coastal_sea=coastal_sea 2126=plains 2127=plains 2128=plains -2129=plains -2130=plains -2131=plains -2132=plains -2133=plains -2134=plains -2135=plains -2136=plains -2137=plains +2129=farmlands +2130=farmlands +2131=farmlands +2132=farmlands +2133=farmlands +2134=farmlands +2135=farmlands +2136=farmlands +2137=farmlands 2138=forest 2139=forest 2140=forest 2141=forest -2142=forest -2143=plains -2144=plains -2145=plains -2146=plains -2147=plains -2148=plains -2149=plains -2150=plains -2151=plains -2152=plains -2153=plains -2154=plains -2155=plains -2156=plains -2157=plains -2158=plains +2142=farmlands +2143=farmlands +2144=farmlands +2145=farmlands +2146=farmlands +2147=farmlands +2148=farmlands +2149=farmlands +2150=farmlands +2151=farmlands +2152=farmlands +2153=farmlands +2154=farmlands +2155=farmlands +2156=farmlands +2157=farmlands +2158=farmlands 2159=hills 2160=hills -2161=plains -2162=plains +2161=farmlands +2162=farmlands 2163=hills -2164=plains +2164=farmlands 2165=forest -2166=plains -2167=plains +2166=farmlands +2167=farmlands 2168=plains 2169=plains 2170=plains 2171=hills -2172=plains +2172=farmlands 2173=plains 2174=plains 2175=wetlands -2176=plains -2177=plains -2178=plains -2179=forest +2176=farmlands +2177=farmlands +2178=farmlands +2179=farmlands 2180=forest -2181=plains -2182=plains -2183=plains -2184=plains -2185=plains +2181=farmlands +2182=farmlands +2183=farmlands +2184=farmlands +2185=farmlands 2186=forest 2187=forest -2188=plains -2189=plains -2190=plains -2191=plains +2188=farmlands +2189=farmlands +2190=farmlands +2191=farmlands 2192=forest 2193=hills 2194=plains -2195=forest +2195=plains 2196=forest 2197=forest 2198=forest -2199=forest -2200=forest +2199=plains +2200=plains 2201=plains 2202=hills -2203=plains -2204=plains -2205=plains +2203=farmlands +2204=farmlands +2205=farmlands 2206=hills 2207=hills -2208=plains +2208=farmlands 2209=hills 2210=mountains 2211=hills 2212=plains -2213=plains -2214=plains -2215=forest +2213=farmlands +2214=farmlands +2215=farmlands 2216=mountains 2217=mountains 2218=hills @@ -1950,67 +1950,67 @@ default_coastal_sea=coastal_sea 2225=hills 2226=plains 2227=plains -2228=plains -2229=plains -2230=plains -2231=plains -2232=plains +2228=farmlands +2229=farmlands +2230=farmlands +2231=farmlands +2232=farmlands 2233=forest 2234=hills -2235=plains -2236=forest +2235=farmlands +2236=farmlands 2237=forest 2238=forest 2239=forest 2240=hills -2241=plains -2242=plains -2243=plains +2241=farmlands +2242=farmlands +2243=farmlands 2244=farmlands -2245=plains +2245=farmlands 2246=hills -2247=forest -2248=forest -2249=plains -2250=plains -2251=plains -2252=plains -2253=plains +2247=farmlands +2248=farmlands +2249=farmlands +2250=farmlands +2251=farmlands +2252=farmlands +2253=farmlands 2254=hills 2255=hills 2256=hills 2257=hills -2258=plains -2259=plains -2260=plains -2261=plains +2258=farmlands +2259=farmlands +2260=farmlands +2261=farmlands 2262=plains -2263=plains +2263=farmlands 2264=plains 2265=plains 2266=plains -2267=plains -2268=plains -2269=plains +2267=farmlands +2268=farmlands +2269=farmlands 2270=plains 2271=plains 2272=plains -2273=plains -2274=plains +2273=farmlands +2274=farmlands 2275=forest -2276=plains +2276=farmlands 2277=forest -2278=plains -2279=plains -2280=plains +2278=farmlands +2279=farmlands +2280=farmlands 2281=plains 2282=forest -2283=plains -2284=plains -2285=forest +2283=farmlands +2284=farmlands +2285=farmlands 2286=hills 2287=hills -2288=forest +2288=plains 2289=hills 2290=hills 2291=forest @@ -2024,26 +2024,26 @@ default_coastal_sea=coastal_sea 2299=plains 2300=forest 2301=hills -2302=plains +2302=farmlands 2303=forest 2304=plains -2305=plains -2306=plains -2307=plains -2308=forest -2309=forest +2305=farmlands +2306=farmlands +2307=farmlands +2308=plains +2309=plains 2310=forest 2311=plains -2312=plains -2313=plains -2314=plains +2312=farmlands +2313=farmlands +2314=farmlands 2315=forest 2316=forest 2317=forest 2318=forest 2319=forest -2320=plains -2321=plains +2320=farmlands +2321=farmlands 2322=farmlands 2323=plains 2324=plains @@ -2059,58 +2059,58 @@ default_coastal_sea=coastal_sea 2334=farmlands 2335=farmlands 2336=farmlands -2337=plains +2337=farmlands 2338=farmlands -2339=plains -2340=plains -2341=plains -2342=plains -2343=plains -2344=plains -2345=plains -2346=plains +2339=farmlands +2340=farmlands +2341=forest +2342=forest +2343=farmlands +2344=farmlands +2345=forest +2346=forest 2347=plains -2348=plains +2348=farmlands 2349=hills -2350=plains -2351=plains -2352=plains -2353=plains -2354=plains -2355=plains +2350=forest +2351=farmlands +2352=forest +2353=farmlands +2354=farmlands +2355=farmlands 2356=farmlands 2357=farmlands -2358=plains -2359=plains +2358=farmlands +2359=farmlands 2360=plains 2361=plains 2362=plains -2363=plains -2364=plains -2365=plains +2363=farmlands +2364=farmlands +2365=farmlands 2366=plains -2367=plains -2368=plains -2369=plains -2370=plains -2371=plains +2367=forest +2368=farmlands +2369=farmlands +2370=farmlands +2371=farmlands 2372=forest 2373=plains 2374=plains 2375=forest 2376=plains -2377=plains +2377=farmlands 2378=hills 2379=hills 2380=farmlands -2381=plains +2381=forest 2382=plains 2383=plains 2384=plains 2385=plains 2386=plains -2387=plains -2388=plains +2387=forest +2388=forest 2389=plains 2390=plains 2391=plains @@ -2179,14 +2179,14 @@ default_coastal_sea=coastal_sea 2454=plains 2455=mountains 2456=mountains -2457=plains -2458=plains +2457=forest +2458=farmlands 2459=plains 2460=hills 2461=mountains -2462=plains -2463=plains -2464=plains +2462=farmlands +2463=farmlands +2464=farmlands 2465=hills 2466=hills 2467=hills @@ -2428,23 +2428,23 @@ default_coastal_sea=coastal_sea 2703=plains 2704=plains 2705=plains -2706=plains +2706=farmlands 2707=plains -2708=plains +2708=farmlands 2709=plains -2710=plains -2711=plains -2712=plains -2713=plains +2710=forest +2711=farmlands +2712=forest +2713=forest 2714=mountains 2715=forest 2716=plains -2717=plains +2717=farmlands 2718=plains -2719=plains -2720=plains -2721=plains -2722=plains +2719=farmlands +2720=farmlands +2721=farmlands +2722=farmlands 2723=forest 2724=plains 2725=plains @@ -8104,7 +8104,7 @@ default_coastal_sea=coastal_sea 8714=hills 8715=hills 8716=hills -8717=plains +8717=farmlands 8718=mountains 8719=mountains 8720=mountains @@ -8868,4 +8868,6 @@ default_coastal_sea=coastal_sea 9690=plains 9691=plains 9692=farmlands -9693=plains \ No newline at end of file +9693=plains +9740=farmlands +9741=farmlands \ No newline at end of file From 57f7721662a3c08c6c889cef97cc2af7476d74db Mon Sep 17 00:00:00 2001 From: trashb0at Date: Mon, 2 Jun 2025 13:10:23 -0400 Subject: [PATCH 4/4] edits --- gfx/interface/icons/terrain_types/tells.dds | 3 +++ .../loading_screens/loadscreen_settings.txt | 12 ++++++------ history/provinces/k_france.txt | 4 +++- 3 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 gfx/interface/icons/terrain_types/tells.dds diff --git a/gfx/interface/icons/terrain_types/tells.dds b/gfx/interface/icons/terrain_types/tells.dds new file mode 100644 index 00000000..2bb3b834 --- /dev/null +++ b/gfx/interface/icons/terrain_types/tells.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e882f4c297d86fb95d4979ce2eaf98f7ccf3fecc12ae72498eedffa1b080f31 +size 1928 diff --git a/gfx/interface/illustrations/loading_screens/loadscreen_settings.txt b/gfx/interface/illustrations/loading_screens/loadscreen_settings.txt index d39d490c..022fd3da 100644 --- a/gfx/interface/illustrations/loading_screens/loadscreen_settings.txt +++ b/gfx/interface/illustrations/loading_screens/loadscreen_settings.txt @@ -1,6 +1,6 @@ -bike = { priority = 50 } -paris = { priority = 50 } -andorra = { priority = 50 } -bhutan = { priority = 50 } -shepherd = { priority = 50 } -numenor = { priority = 50 } +bike = { priority = 100 } +paris = { priority = 100 } +andorra = { priority = 100 } +bhutan = { priority = 100 } +shepherd = { priority = 100 } +numenor = { priority = 100 } diff --git a/history/provinces/k_france.txt b/history/provinces/k_france.txt index 2009a88d..ecc0b8ab 100644 --- a/history/provinces/k_france.txt +++ b/history/provinces/k_france.txt @@ -258,6 +258,8 @@ holding = castle_holding } 2266 = { #MAYENNE + culture = galo + religion = victorian holding = castle_holding } 2265 = { #LAVAL @@ -734,7 +736,7 @@ 2349 = { #VEZELAY culture = bourguignon religion = carolingian - holding = church_holding + holding = castle_holding } 2378 = { #MORVAN holding = none