diff --git a/common/bookmarks/bookmarks/00_bookmarks.txt b/common/bookmarks/bookmarks/00_bookmarks.txt index a6d6e9808..c79118512 100644 --- a/common/bookmarks/bookmarks/00_bookmarks.txt +++ b/common/bookmarks/bookmarks/00_bookmarks.txt @@ -95,7 +95,7 @@ religion = "romanticist" difficulty = "BOOKMARK_CHARACTER_DIFFICULTY_HARD" history_id = kevin_von_dallas - position = { 1050 600 } + position = { 1200 600 } animation = idle } } @@ -120,7 +120,7 @@ bm_2555_south_europe = { difficulty = "BOOKMARK_CHARACTER_DIFFICULTY_MEDIUM" history_id = hispania0001 animation = grief - position = { 250 500 } + position = { 300 350 } } character = { name = "bookmark_SE_basilicata_castriota_giovanni_aladro" @@ -134,7 +134,7 @@ bm_2555_south_europe = { religion = "roman_catholic" difficulty = "BOOKMARK_CHARACTER_DIFFICULTY_HARD" history_id = italy0013 - position = { 900 840 } + position = { 1270 700 } animation = idle } character = { @@ -149,7 +149,7 @@ bm_2555_south_europe = { religion = "roman_catholic" difficulty = "BOOKMARK_CHARACTER_DIFFICULTY_HARD" history_id = italy0017 - position = { 920 620 } + position = { 1200 270 } animation = idle } character = { @@ -164,7 +164,7 @@ bm_2555_south_europe = { religion = "fraticelli" difficulty = "BOOKMARK_CHARACTER_DIFFICULTY_HARD" history_id = france_grimaldi_honore - position = { 750 440 } + position = { 950 470 } animation = personality_zealous } character = { @@ -179,7 +179,7 @@ bm_2555_south_europe = { religion = "sevillian" difficulty = "BOOKMARK_CHARACTER_DIFFICULTY_HARD" history_id = hispania0023 - position = { 350 740 } + position = { 500 780 } animation = idle } character = { @@ -194,7 +194,7 @@ bm_2555_south_europe = { religion = "simurghi" difficulty = "BOOKMARK_CHARACTER_DIFFICULTY_HARD" history_id = france_marouane_atika - position = { 620 640 } + position = { 620 240 } animation = personality_greedy } } diff --git a/gfx/interface/bookmarks/bm_2555_europe_bookmark_WE_portugal_avril_vinicius.dds b/gfx/interface/bookmarks/bm_2555_europe_bookmark_WE_portugal_avril_vinicius.dds deleted file mode 100644 index 11f4a3802..000000000 --- a/gfx/interface/bookmarks/bm_2555_europe_bookmark_WE_portugal_avril_vinicius.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64843e8bf8cd7b36bb4395c70d68afa7779bf468fa2d36ced8b8c906eca03013 -size 8294528 diff --git a/gfx/interface/bookmarks/bm_2555_europe_bookmark_WE_tirrenia_bollani_albertu.dds b/gfx/interface/bookmarks/bm_2555_europe_bookmark_WE_tirrenia_bollani_albertu.dds deleted file mode 100644 index f4cdaf8af..000000000 --- a/gfx/interface/bookmarks/bm_2555_europe_bookmark_WE_tirrenia_bollani_albertu.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2e117ce15190ee4e2438a10a1d538f1bf619c8524516d8560607db247c8d5b2 -size 8294528 diff --git a/gfx/interface/bookmarks/bm_2555_europe_bookmark_WE_venice_robecchi_marco.dds b/gfx/interface/bookmarks/bm_2555_europe_bookmark_WE_venice_robecchi_marco.dds deleted file mode 100644 index 89fc99ece..000000000 --- a/gfx/interface/bookmarks/bm_2555_europe_bookmark_WE_venice_robecchi_marco.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e26b728f8ef5d199f19aeeb4db9df2d8de04032f487c618e4be3680a2841138 -size 2766352 diff --git a/gfx/interface/bookmarks/bm_2555_south_europe.dds b/gfx/interface/bookmarks/bm_2555_south_europe.dds index 491be0bad..da6b90280 100644 --- a/gfx/interface/bookmarks/bm_2555_south_europe.dds +++ b/gfx/interface/bookmarks/bm_2555_south_europe.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b38b1b5f0836171ea53ccb26897652b70ad8452fe9752cdb4f71e1a3c8ad75c -size 2766352 +oid sha256:b41485f291076fa5f804fe62dfce01ea40ae48afeb4d3755638ae78813c099f2 +size 8294528 diff --git a/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_basilicata_castriota_giovanni_aladro.dds b/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_basilicata_castriota_giovanni_aladro.dds new file mode 100644 index 000000000..173216019 --- /dev/null +++ b/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_basilicata_castriota_giovanni_aladro.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:675e5bd7372915d6e1037916bdd1bc0502465420aabc3d452b7e0d73a1f91f1c +size 8294528 diff --git a/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_la_mancha_quixano_alonso.dds b/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_la_mancha_quixano_alonso.dds new file mode 100644 index 000000000..fa5bee739 --- /dev/null +++ b/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_la_mancha_quixano_alonso.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b58415676d52eb8a0a008d45988c8ec40f09b352855816f58b345f1ed22dfbdb +size 8294528 diff --git a/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_monaco_grimaldi_nure.dds b/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_monaco_grimaldi_nure.dds new file mode 100644 index 000000000..608a733fc --- /dev/null +++ b/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_monaco_grimaldi_nure.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b63429d0d0d8090cdc35bc4cd91b1657baa25369b66b0379862858991722f89 +size 8294528 diff --git a/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_piedmonte_savoia_vittorio_amedeo.dds b/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_piedmonte_savoia_vittorio_amedeo.dds new file mode 100644 index 000000000..077969559 --- /dev/null +++ b/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_piedmonte_savoia_vittorio_amedeo.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9515c605b06c8c8fc6191fdf488bc7c943487aa05fa75aca4518ae101373968c +size 8294528 diff --git a/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_portugal_avril_vinicius.dds b/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_portugal_avril_vinicius.dds new file mode 100644 index 000000000..551b3daab --- /dev/null +++ b/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_portugal_avril_vinicius.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab0bd12b8a0ca2b8ce4085b8f54f639332765d88a7a7b58926d19580d63fb721 +size 8294528 diff --git a/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_provence_atika_marouane.dds b/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_provence_atika_marouane.dds new file mode 100644 index 000000000..5c141e0d3 --- /dev/null +++ b/gfx/interface/bookmarks/bm_2555_south_europe_bookmark_SE_provence_atika_marouane.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4277447c03d2f45e9419b51f5a78ae034876cf59bf95498a1f0668616adc015 +size 8294528 diff --git a/gfx/map/terrain/flat_maps/flatmap.dds b/gfx/map/terrain/flat_maps/flatmap.dds index 022114d30..8cbb8e2c7 100644 --- a/gfx/map/terrain/flat_maps/flatmap.dds +++ b/gfx/map/terrain/flat_maps/flatmap.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9c3ed15bda7ab8bb09d70ec2950082839c4385b0df3aca9909c00b44dd98cec -size 21233792 +oid sha256:fc5c644505e0048e5fe89e059fd7e40b5cddc8580c3b243f0426be1dfdadfb1c +size 169869440 diff --git a/gfx/map/terrain/flat_maps/flatmap_tgp.dds b/gfx/map/terrain/flat_maps/flatmap_tgp.dds index 1e6581c6e..606f648bb 100644 --- a/gfx/map/terrain/flat_maps/flatmap_tgp.dds +++ b/gfx/map/terrain/flat_maps/flatmap_tgp.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9226f0db6e52c2c9f26ac41d6149d8591971feb7684517cd720a269986cb6515 -size 21233792 +oid sha256:1d6d7a59de0f69cf7100f7d150dde970ebceef51a29f99679abb2dd068814efa +size 169869440 diff --git a/history/provinces/e_alps.txt b/history/provinces/e_alps.txt index 527c96533..f6d022c13 100644 --- a/history/provinces/e_alps.txt +++ b/history/provinces/e_alps.txt @@ -419,7 +419,7 @@ ###c_alpes_maritimes 8717 = { culture = provencal - religion = fraticelli + religion = roman_catholic holding = castle_holding } 8718 = { @@ -440,7 +440,7 @@ ###c_var 2301 = { culture = provencal - religion = fraticelli + religion = roman_catholic holding = castle_holding } 2305 = { diff --git a/history/titles/k_switzerland.txt b/history/titles/k_switzerland.txt index 748e7479b..6a52c40a4 100644 --- a/history/titles/k_switzerland.txt +++ b/history/titles/k_switzerland.txt @@ -231,8 +231,8 @@ c_lower_alps={ } c_var={ - 2540.1.1 = { - holder = france_grimaldi_honore #Marouane Atika + 2550.1.1 = { + holder = france_bova_ivette } 2555.1.1 = { change_development_level = 10 } } diff --git a/localization/english/replace/bookmark/bookmark_N3OW_west_europe_2555_l_english.yml b/localization/english/replace/bookmark/bookmark_N3OW_west_europe_2555_l_english.yml index 0b1c42d39..486e0b16e 100644 --- a/localization/english/replace/bookmark/bookmark_N3OW_west_europe_2555_l_english.yml +++ b/localization/english/replace/bookmark/bookmark_N3OW_west_europe_2555_l_english.yml @@ -2,6 +2,8 @@ bm_2555_west_europe:0 "Rise and Fall" bm_2555_west_europe_desc:0 "A mere fifty years ago, the thunderous collapse of the French Empire echoed across the continent. The power vaccuum it left behind still lies unfilled, and outsiders prey on the disunited lords of the former empire from all directions. To the east, the Christian zealots of the Alpine Empire prepare to pacify the pagan French masses. To the north, the nascent Empire of Europa seeks to succeed where all others have failed in order to unite the whole continent under one banner. And across the seas, the reformed British Empire aims to plant its flag in every corner of the earth in the name of its ghastly Queen.\n\n#bold Can France restore its rightful place in the world? Or is it doomed to an eternity under foreign rule?#!" + + bm_2555_europe:0 "Europe" start_year_2555_01_01_desc:0 "In the year 2555 AD, five and a half centuries since the apocalypse known now as the "Event", civilization has rebuilt itself. Yet, times are always changing; warlords and empires rise and fall overtop the bones of those that came before as history marches on." bm_group_2555_europe:0 "Europe" diff --git a/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml b/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml index 9ea9129e5..8ba8e7a82 100644 --- a/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml +++ b/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml @@ -432,9 +432,9 @@ NEOW_ucrainean_collective_noun:0 "Ucraineans" NEOW_ucrainean_prefix:0 "Ucraineano" #Vohlynians - NEOW_vohlynian:0 "Volynskyi" - NEOW_vohlynian_collective_noun:0 "Volhynians" - NEOW_vohlynian_prefix:0 "Volinsko" + NEOW_vohlynian:0 "Halickyi" + NEOW_vohlynian_collective_noun:0 "Halychians" + NEOW_vohlynian_prefix:0 "Halychio" #Polesians NEOW_polessian:0 "Polis'kiy" NEOW_polessian_collective_noun:0 "Polesians"