diff --git a/common/landed_titles/britannia.txt b/common/landed_titles/britannia.txt index 79c0ae3e..d7155e32 100644 --- a/common/landed_titles/britannia.txt +++ b/common/landed_titles/britannia.txt @@ -51,11 +51,6 @@ e_britannia = { name_list_scottish = cn_lunnon } } - b_chelmsford = { - province = 1516 - - color = { 220 20 30 } - } b_woxbrigge = { province = 1528 @@ -84,6 +79,11 @@ e_britannia = { b_kingston = { province = 1512 + color = { 225 80 20 } + } + b_east_end = { + province = 9734 + color = { 225 80 20 } } } @@ -111,6 +111,21 @@ e_britannia = { color = { 125 5 5 } } + b_buckingham = { + province = 1551 + + cultural_names = { + name_list_anglo_saxon = cn_buccingahamm + name_list_old_saxon = cn_buccingahamm + } + + color = { 200 25 25 } + } + b_corby = { + province = 9732 + + color = { 200 25 25 } + } } c_essex = { color = { 246 1 1 } @@ -138,6 +153,16 @@ e_britannia = { b_dunmow = { province = 1517 + color = { 220 20 30 } + } + b_chelmsford = { + province = 1516 + + color = { 220 20 30 } + } + b_thurrock = { + province = 9733 + color = { 220 20 30 } } } @@ -204,16 +229,6 @@ e_britannia = { name_list_old_saxon = cn_buccingahamm } - b_buckingham = { - province = 1551 - - cultural_names = { - name_list_anglo_saxon = cn_buccingahamm - name_list_old_saxon = cn_buccingahamm - } - - color = { 200 25 25 } - } b_aylesbury = { province = 1552 @@ -275,6 +290,16 @@ e_britannia = { color = { 210 100 0 } } + b_ely = { + province = 1537 + + color = { 205 145 5 } + + cultural_names = { + name_list_norse = cn_linn + name_list_norwegian = cn_linn + } + } } c_suffolk = { color = { 153 87 81 } @@ -299,11 +324,26 @@ e_britannia = { color = { 215 125 10 } } + b_radfield = { + province = 1535 + + color = { 205 145 5 } + } } - c_huntingdonshire = { - color = { 180 87 90 } + c_cambridgeshire = { + color = { 151 85 77 } + b_cambridge = { + province = 1534 + + color = { 205 145 5 } + } + b_papworth = { + province = 1536 + + color = { 205 145 5 } + } b_hurstingstone = { province = 1541 @@ -320,36 +360,6 @@ e_britannia = { color = { 125 5 5 } } } - - c_cambridgeshire = { - color = { 151 85 77 } - - b_cambridge = { - province = 1534 - - color = { 205 145 5 } - } - b_radfield = { - province = 1535 - - color = { 205 145 5 } - } - b_papworth = { - province = 1536 - - color = { 205 145 5 } - } - b_ely = { - province = 1537 - - color = { 205 145 5 } - - cultural_names = { - name_list_norse = cn_linn - name_list_norwegian = cn_linn - } - } - } } d_gloucester = { # Hwicce @@ -416,6 +426,11 @@ e_britannia = { color = { 255 115 15 } } + b_abingdon = { + province = 1557 + + color = { 255 100 25 } + } } c_berkshire = { color = { 216 72 91 } @@ -428,11 +443,6 @@ e_britannia = { b_newbury = { province = 1556 - color = { 255 100 25 } - } - b_abingdon = { - province = 1557 - color = { 255 100 25 } } } @@ -480,8 +490,8 @@ e_britannia = { color = { 225 80 20 } } - b_tandbridge = { - province = 1513 + b_ewell = { + province = 9735 color = { 225 80 20 } } @@ -514,6 +524,11 @@ e_britannia = { color = { 225 105 10 } } + b_tandbridge = { + province = 1513 + + color = { 225 80 20 } + } } } @@ -552,6 +567,11 @@ e_britannia = { b_basingstoke = { province = 1547 + color = { 230 15 55 } + } + b_andover = { + province = 9731 + color = { 230 15 55 } } } @@ -670,17 +690,17 @@ e_britannia = { color = { 170 60 10 } } - b_totnes = { + b_totnes = { # Plymouth province = 1570 color = { 170 60 10 } } - b_okehampton = { + b_okehampton = { # Rideford province = 1571 color = { 170 60 10 } } - b_barnstaple = { + b_bamstaple = { province = 1572 color = { 170 60 10 } @@ -699,17 +719,17 @@ e_britannia = { } - b_launceston = { + b_launceston = { # St. Austell province = 1573 color = { 150 55 5 } } - b_tintagel = { + b_tintagel = { # Newoway province = 1574 color = { 150 55 5 } } - b_helston = { + b_helston = { # Truro province = 1575 color = { 150 55 5 } diff --git a/history/provinces/k_england.txt b/history/provinces/k_england.txt index 6a8f880d..349a3856 100644 --- a/history/provinces/k_england.txt +++ b/history/provinces/k_england.txt @@ -604,12 +604,6 @@ special_building = dean_mines_01 } } -1581 = { #Bristol - holding = none - 1000.1.1 = { - holding = city_holding - } -} 1582 = { #Winchombe holding = church_holding } @@ -796,13 +790,11 @@ } ###c_somerset -1576 = { #Bath +9729 = { culture = weslander religion = avalonian holding = castle_holding -} -1577 = { #Winterstoke - holding = none + } 1578 = { #Ilchester holding = none @@ -814,6 +806,18 @@ holding = church_holding } +###c_avon +1581 = { #Bristol + culture = weslander + religion = avalonian + holding = castle +} +1577 = { #Winterstoke + holding = none +} +1576 = { #Bath + holding = none +} ##d_cornwall ################################### ###c_devon 1569 = { #Exeter @@ -833,7 +837,7 @@ holding = city_holding } } -1572 = { #Barnstaple +1572 = { #Bamstaple holding = none } diff --git a/history/provinces/k_wales.txt b/history/provinces/k_wales.txt index f682a2e9..d1ba2256 100644 --- a/history/provinces/k_wales.txt +++ b/history/provinces/k_wales.txt @@ -149,7 +149,7 @@ } ###c_glamorgan / Morgannwg -1649 = { #Cardiff +1651 = { #Cardiff culture = prytoneg religion = avalonian holding = castle_holding @@ -161,7 +161,7 @@ #valuable land, trade post established between IXth -XIth } } -1651 = { #Caerphilly / Caerffili +1649 = { #Caerphilly / Caerffili holding = church_holding #Possibly predates viking activity #church_holding as we can have 3 different holding types, and the town is at least folklorically tied to a monastery, and named after a Saint diff --git a/localization/english/titles_l_english.yml b/localization/english/titles_l_english.yml index a6f7acad..91844f74 100644 --- a/localization/english/titles_l_english.yml +++ b/localization/english/titles_l_english.yml @@ -1244,7 +1244,7 @@ b_barleduc:0 "Bar-le-Duc" b_barletta:0 "Barletta" b_barman:1 "Tendukheda" - b_barnstaple:0 "Barnstaple" + b_bamstaple:0 "Bamstaple" b_barodiya:0 "Barodiya" b_barohiya:0 "Barohiya" b_baroli:0 "Baroli" @@ -1401,7 +1401,7 @@ b_benkovac:0 "Benkovac" b_bentheim:0 "Bentheim" b_bentivoglio:0 "Bentivoglio" - b_beodericsworth:0 "Beodericsworth" + b_beodericsworth:0 "Bury St. Edmunds" b_beograd:0 "Beograd" b_ber:0 "Ber" b_berat:0 "Berat" @@ -1428,7 +1428,7 @@ b_berja:0 "Berja" b_berkane:0 "Berkane" b_berkeley:0 "Berkeley" - b_berkhamsted:0 "Berkhamsted" + b_berkhamsted:0 "Watford" b_berlin:0 "Berlin" b_bermane:0 "Bermane" b_bern:0 "Bern" @@ -1623,7 +1623,7 @@ b_blessington:0 "Blessington" b_blois:0 "Blois" b_blumenthal:0 "Blumenthal" - b_blything:0 "Blything" + b_blything:0 "Stowmarket" b_bobbio:0 "Bobbio" b_bobovac:0 "Bobovac" b_bobruisk:0 "Bobruisk" @@ -1787,7 +1787,7 @@ b_bremanger:1 "Ruslar" b_bremen:0 "Bremen" b_brene:0 "Brene" - b_brentford:0 "Brentford" + b_brentford:0 "Hounslow" b_brescello:0 "Brescello" b_brescia:0 "Brescia" b_breslau:0 "Breslau" @@ -1848,7 +1848,7 @@ b_buchach:0 "Buchach" b_buckenham:0 "Buckenham" b_buckfast:0 "Buckfast" - b_buckingham:0 "Buckingham" + b_buckingham:0 "Brackley" b_bucu:0 "Bucu" b_bucuresti:2 "Slobozia" b_budejovice:0 "Budejovice" @@ -2040,7 +2040,7 @@ b_cardiff:1 "Cardiff" b_cardigan:1 "Aberaeron" b_carhaix:0 "Carhaix" - b_carisbrooke:0 "Carisbrooke" + b_carisbrooke:0 "Ryde" b_carissa:0 "Carissa" b_carlat:0 "Carlat" b_carlisle:0 "Carlisle" @@ -2101,7 +2101,7 @@ b_castle_rising:0 "Castle Rising" b_castlebar:0 "Castlebar" b_castleton:0 "Glossop" - b_castletown:2 "Holmwick" + b_castletown:2 "Douglas" b_castres:0 "Castres" b_castro:0 "Castro" b_castrobarte:0 "Castrobarte" @@ -2270,7 +2270,7 @@ b_checiny:0 "Chęciny" b_chekerefta:0 "Chekerefta" b_cheleken:0 "Cheleken" - b_chelmsford:0 "Chelmsford" + b_chelmsford:0 "Harlow" b_chelsea:0 "Chelsea" b_cheltenham:0 "Cheltenham" b_chemnitz:0 "Chemnitz" @@ -2292,7 +2292,7 @@ b_chernihivka:0 "Chernihivka" b_chernyyar:0 "Cherny Yar" b_cherso:0 "Cherso" - b_chertsey:0 "Chertsey" + b_chertsey:0 "Woking" b_cherven:0 "Cherven" b_chessy:0 "Chessy" b_chester-le-street:0 "Chester-le-Street" @@ -2471,6 +2471,7 @@ b_corabia:0 "Corabia" b_coracera:0 "Coracera" b_corbie:0 "Corbie" + b_corby:0 "Corby" b_cordoba:0 "Cordoba" b_corduene:0 "Corduene" b_corfe:0 "Corfe" @@ -3027,7 +3028,7 @@ b_dunkheger:0 "Dünkheger" b_dunkirk:1 "Dunkerque" b_dunluce:0 "Dunluce" - b_dunmow:0 "Dunmow" + b_dunmow:0 "Saffron Walden" b_dunollie:0 "Dunollie" b_dunragit:0 "Dunragit" b_dunrobin:0 "Dunrobin" @@ -3190,7 +3191,7 @@ b_elvas:0 "Elvas" b_elverum:0 "Elverum" b_elvira:0 "Elvira" - b_ely:0 "Ely" + b_ely:0 "Lynn" b_elyourh:0 "El Yourh" b_emba:0 "Emba" b_embriaco:0 "Embriaco" @@ -3285,6 +3286,7 @@ b_evora:0 "Évora" b_evreux:1 "Évreux" b_evron:0 "Evron" + b_ewell:0 "Ewell" b_ewloe:0 "Ewloe" b_ewyas_harold:0 "Ewyas Harold" b_exeter:0 "Exeter" @@ -3799,7 +3801,7 @@ b_gordium:0 "Gordium" b_gordon:0 "Gordon" b_gordoservon:0 "Gordoservon" - b_gore:0 "Gore" + b_gore:0 "Westminster" b_gorgol:0 "Gorgol" b_gori:0 "Gori" b_gorinchem:0 "Gorinchem" @@ -4165,7 +4167,7 @@ b_helsinge:0 "Helsinge" b_helsingor:0 "Helsingør" b_helsingora:0 "Helsingora" - b_helston:0 "Helston" + b_helston:0 "Truro" b_helwan:0 "Helwan" b_hemagudda:0 "Hemagudda" b_hemambika:0 "Hemambika" @@ -4320,7 +4322,7 @@ b_huntly:0 "Huntly" b_hunyan:0 "Hunyan" b_hurmniz:0 "Hurmniz" - b_hurstingstone:0 "Hurstingstone" + b_hurstingstone:0 "March" b_husaby:0 "Husaby" b_husaiba:0 "Husaiba" b_husan:0 "Husån" @@ -4378,7 +4380,7 @@ b_ikkeri:0 "Ikkeri" b_ikonion:0 "Ikonion" b_ilam:0 "Ilam" - b_ilchester:0 "Ilchester" + b_ilchester:0 "Bridgwater" b_ilerena:1 "Llerena" b_iligh:0 "Iligh" b_ilion:0 "Ilion" @@ -5210,7 +5212,7 @@ b_kincardine:0 "Kincardine" b_kinel:0 "Kinel'" b_kingisepp:0 "Yama" - b_kingston:0 "Kingston" + b_kingston:0 "Croydon" b_kinilov:0 "Kinilov" b_kinloss:0 "Kinloss" b_kinnevald:0 "Kinnevald" @@ -5786,7 +5788,7 @@ b_laufenburg:0 "Laufenburg" b_laughern:0 "Laughern" b_laukental:1 "Leukental" - b_launceston:0 "Launceston" + b_launceston:0 "St. Austell" b_lausanne:0 "Lausanne" b_lauterbach:0 "Lauterbach" b_lauterburg:0 "Lauterburg" @@ -5827,7 +5829,7 @@ b_leicester:0 "Leicester" b_leiden:0 "Leiden" b_leighlin:0 "Leighlin" - b_leightonstone:0 "Leightonstone" + b_leightonstone:0 "Huntingdon" b_lein:0 "Lein" b_leiningen:0 "Leiningen" b_leipzig:0 "Leipzig" @@ -6139,9 +6141,9 @@ b_lydford:0 "Lydford" b_lykandos:0 "Lykandos" b_lyman:0 "Lyman" - b_lyme:0 "Lyme" + b_lyme:0 "Bridport" b_lympne:0 "Lympne" - b_lynn:0 "Lynn" + b_lynn:0 "Dereham" b_lyon:0 "Lyon" b_lysimachia:0 "Lysimachia" b_lysva:0 "Lysva" @@ -6268,14 +6270,14 @@ b_malboden:0 "Malboden" b_malchin:0 "Malchin" b_malda:0 "Malda" - b_maldon:0 "Maldon" + b_maldon:0 "Ipswich" b_male:0 "Male" b_malegaon:0 "Malegaon" b_maleshevo:0 "Maleshevo" b_malgobekbalka:0 "Malgobek-Balka" b_malia:0 "Malia" b_malin:0 "Malin" - b_malmesbury:0 "Malmesbury" + b_malmesbury:0 "Chippenham" b_malmo:0 "Malmö" b_malot:0 "Malot" b_malpas:0 "Malpas" @@ -7190,7 +7192,7 @@ b_newbury:0 "Newbury" b_newcastle:0 "Newcastle" b_newcastle_west:0 "Newcastle West" - b_newport:0 "Newport" + b_newport:0 "Milton Keynes" b_newstead:0 "Newstead" b_newtown:1 "Machynlleth" b_newry:0 "Newry" @@ -7409,7 +7411,7 @@ b_ohrid:0 "Ohrid" b_oirai:0 "Oirai" b_oivela_mariam:0 "Oivela Mariam" - b_okehampton:0 "Okehampton" + b_okehampton:0 "Rideford" b_okic:0 "Okic" b_oklabo:0 "Oklabo" b_okladnikowa:0 "Okladnikowa" @@ -8174,7 +8176,7 @@ b_raciborz:0 "Raciborz" b_radebeul:0 "Radebeul" b_radeburg:0 "Radeburg" - b_radfield:0 "Radfield" + b_radfield:0 "Haverhill" b_radicofani:0 "Radicofani" b_radifah:0 "Al Radifah" b_radkersburg:0 "Radkersburg" @@ -8249,7 +8251,7 @@ b_rampur:0 "Rampur" b_rampur_boalia:0 "Rampur Boalia" b_rampura:0 "Rampura" - b_ramsbury:0 "Ramsbury" + b_ramsbury:0 "Swindon" b_ramsey:0 "Ramsey" b_ramtah:0 "Ramtah" b_ranakpur:0 "Ranakpur" @@ -8606,7 +8608,7 @@ b_saida:0 "Saida" b_sailana:0 "Sailana" b_saindak:0 "Saindak" - b_saint_albans:0 "Saint Albans" + b_saint_albans:0 "Stevenage" b_saint_brieuc:0 "Saint-Brieuc" b_saint_denis:0 "Saint-Denis" b_saint_dizier:0 "Saint-Dizier" @@ -9034,7 +9036,7 @@ b_shabwa:0 "Shabwa" b_shadegan:0 "Shadegan" b_shadia:0 "Shadia" - b_shaftesbury:0 "Shaftesbury" + b_shaftesbury:0 "Sherborne" b_shagal:0 "Shagal" b_shaghab:0 "Shaghab" b_shagingirei:0 "Shagin-Girei" @@ -9864,7 +9866,7 @@ b_tanas:0 "Tanas" b_tanda:0 "Tanda" b_tandalti:0 "Tandalti" - b_tandbridge:0 "Tandbridge" + b_tandbridge:0 "Sevenoaks" b_tangermunde:1 "Tangermünde" b_tangiers:0 "Tangier" b_tanis:0 "Tanis" @@ -10046,7 +10048,7 @@ b_therouanne:0 "Therouanne" b_thesedessa:0 "Edessa" b_thessaloniki:0 "Thessaloniki" - b_thetford:0 "Thetford" + b_thetford:0 "Wymondham" b_thiers:0 "Thiers" b_thineghir:0 "Thineghir" b_thinville:0 "Thionville" @@ -10066,6 +10068,7 @@ b_thughra:0 "Thughra" b_thun:0 "Thun" b_thurso:0 "Thurso" + b_thurrock:0 "Thurrock" b_thusis:0 "Sion" b_thyatira:0 "Thyatira" b_tiace:0 "Tiace" @@ -10119,7 +10122,7 @@ b_tinnai:0 "Tinnai" b_tinos:0 "Tinos" b_tinsukia:0 "Tinsukia" - b_tintagel:0 "Tintagel" + b_tintagel:0 "Newoway" b_tintern:0 "Tintern" b_tinzaouten:0 "Tinzaouten" b_tipasa:0 "Tipasa" @@ -10230,7 +10233,7 @@ b_tossbo:0 "Tössbo" b_totaram_panditer_dhap:0 "Totaram Panditer Dhap" b_totma:0 "Tot'ma" - b_totnes:0 "Totnes" + b_totnes:0 "Plymouth" b_tottenham:0 "Tottenham" b_toul:0 "Toul" b_toulon:0 "Toulon" @@ -10954,7 +10957,7 @@ b_walishtan:0 "Walishtan" b_walkenried:0 "Walkenried" b_wallingford:0 "Wallingford" - b_walsingham:0 "Walshingham" + b_walsingham:0 "Cromer" b_walsrode:0 "Walsrode" b_waltham:0 "Waltham" b_wan_bhachran:0 "Wan Bhachran" @@ -10966,7 +10969,7 @@ b_warangal:0 "Warangal" b_waranger:0 "Waranger" b_wardana:0 "Wardana" - b_wareham:0 "Wareham" + b_wareham:0 "Weymouth" b_waren:0 "Waren" b_warendorf:0 "Warendorf" b_warendorp:0 "Warendorp" @@ -11051,13 +11054,13 @@ b_wilhelmshaven:1 "Jever" b_willemstad:0 "Willemstad" b_wiltberg:0 "Wiltberg" - b_wilton:0 "Wilton" + b_wilton:0 "Trowbridge" b_wimborne:0 "Wimborne" b_wimpfen:0 "Wimpfen" - b_winchcombe:0 "Winchcombe" + b_winchcombe:0 "Stroud" b_winchester:0 "Winchester" b_windische_buhel:1 "Lutenburg" - b_winterstoke:0 "Winterstoke" + b_winterstoke:0 "Weston-super-Mare" b_winterthur:0 "Winterthur" b_wirksworth:0 "Wirksworth" b_wirtemberg:0 "Wirtemberg" @@ -11098,7 +11101,7 @@ b_worksop:0 "Worksop" b_worms:0 "Worms" b_wotka:0 "Wotka" - b_woxbrigge:0 "Woxbrigge" + b_woxbrigge:0 "Hillingdon" b_wrexham:1 "Wrexham" b_wroclaw:0 "Wroclaw" b_wronki:0 "Wronki" @@ -11696,8 +11699,8 @@ c_atbara_adj:0 "Atbaran" c_atheniai:0 "Atheniai" c_atheniai_adj:0 "Athenian" - c_rochester:0 "Rochester" - c_rochester_adj:0 "Rochesterian" + c_rochester:0 "Chatham" + c_rochester_adj:0 "Chathamian" c_roscommon:0 "Roscommon" c_roscommon_adj:0 "Roscommonian" c_atholl:0 "Atholl" @@ -20224,6 +20227,7 @@ b_djado_route:0 "Djado Route" b_djanet:0 "Djanet" b_east_ahaggar:0 "East Ahaggar" + b_east_end:0 "East End" b_eferi:0 "Eferi" b_fachi:0 "Fachi" b_fachi_route:0 "Fachi Route" diff --git a/map_data/definition.csv b/map_data/definition.csv index d697ce4f..0b9945b8 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -1570,7 +1570,7 @@ 1569;169;21;212;EXETER;x 1570;1;24;85;TOTNES;x 1571;43;27;213;OKEHAMPTON;x -1572;85;30;86;BARNSTAPLE;x +1572;85;30;86;Bamstaple;x 1573;127;33;214;LAUNCESTON;x 1574;169;36;87;TINTAGEL;x 1575;1;39;215;HELSTON;x @@ -9729,11 +9729,11 @@ 9728;135;3;64;Frome;x; 9729;177;6;192;Burnham-on-Sea;x; 9730;9;9;65;Cheltenham;x; -#9731;51;12;193;;x; -#9732;93;15;66;;x; -#9733;135;18;194;;x; -#9734;177;21;67;;x; -#9735;9;24;195;;x; +9731;51;12;193;Andover;x; +9732;93;15;66;Corby;x; +9733;135;18;194;Thurrock;x; +9734;177;21;67;East End;x; +9735;9;24;195;Ewell;x; #9736;51;27;68;;x; #9737;93;30;196;;x; #9738;135;33;69;;x; diff --git a/map_data/provinces.png b/map_data/provinces.png index af60fa95..04a6be7e 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:218884daf7060201a06ee564df65ab3c6702bc44b9f754975da153541469c4eb -size 2360486 +oid sha256:3b8e21388418cc04c9ec9fa4eb5ec0ad10af56ab94eb4545ef7b0c5080dc7a10 +size 2362087