diff --git a/common/culture/cultures/NEOW_anglo_frisian.txt b/common/culture/cultures/NEOW_anglo_frisian.txt index c1b78f38..4af65f2b 100644 --- a/common/culture/cultures/NEOW_anglo_frisian.txt +++ b/common/culture/cultures/NEOW_anglo_frisian.txt @@ -145,7 +145,6 @@ norner = { tradition_hard_working tradition_staunch_traditionalists tradition_stalwart_defenders - tradition_creaght } name_list = name_list_NEOW_english diff --git a/common/culture/cultures/NEOW_brazilian.txt b/common/culture/cultures/NEOW_brazilian.txt deleted file mode 100644 index 63da5dcc..00000000 --- a/common/culture/cultures/NEOW_brazilian.txt +++ /dev/null @@ -1,30 +0,0 @@ -brazilian = { # Brasileiro - should be dead at gamestart - color = { 65 102 10 } - - ethos = ethos_spiritual - heritage = heritage_brazilian - language = language_lusophonic - martial_custom = martial_custom_male_only - head_determination = head_determination_domain - - traditions = { - tradition_fp2_ritualised_friendship - tradition_religious_patronage - tradition_seafaring - tradition_modest - tradition_poetry - } - - name_list = name_list_portuguese - house_coa_frame = house_frame_19 - house_coa_mask_offset = { 0.0 0.025 } - house_coa_mask_scale = { 0.95 0.95 } - coa_gfx = { iberian_group_coa_gfx western_coa_gfx } - building_gfx = { iberian_building_gfx } - clothing_gfx = { iberian_christian_clothing_gfx western_clothing_gfx } - unit_gfx = { iberian_christian_unit_gfx } - - ethnicities = { - 10 = mediterranean - } -} \ No newline at end of file diff --git a/common/culture/cultures/NEOW_goidelic.txt b/common/culture/cultures/NEOW_goidelic.txt index 206b8867..ed748c76 100644 --- a/common/culture/cultures/NEOW_goidelic.txt +++ b/common/culture/cultures/NEOW_goidelic.txt @@ -101,41 +101,6 @@ irish = { #Éireannach Bhocht 30 = caucasian_dark_hair } } -traveller = { #travellers - color = { 58 151 95 } - - parents = { irish } - created = 1500.1.1 - house_coa_frame = house_frame_03 - house_coa_mask_offset = { 0.0 0.055 } - house_coa_mask_scale = { 0.9 0.9 } - ethos = ethos_communal - heritage = heritage_goidelic - language = language_anglo_irish - martial_custom = martial_custom_male_only - head_determination = head_determination_domain - - traditions = { - tradition_diasporic - tradition_adaptive_skirmishing - tradition_isolationist - tradition_defiant - tradition_pastoralists - } - - name_list = name_list_neow_goidelic - - coa_gfx = { irish_coa_gfx western_coa_gfx } - building_gfx = { western_building_gfx } - clothing_gfx = { northern_clothing_gfx } - unit_gfx = { western_unit_gfx } - - ethnicities = { - 35 = caucasian_ginger - 35 = caucasian_brown_hair - 30 = caucasian_dark_hair - } -} manx = { color = { 60 125 55 } diff --git a/common/culture/cultures/NEOW_indo_aryan.txt b/common/culture/cultures/NEOW_indo_aryan.txt deleted file mode 100644 index 49ec93af..00000000 --- a/common/culture/cultures/NEOW_indo_aryan.txt +++ /dev/null @@ -1,27 +0,0 @@ -pwnjaby = { - color = punjabi - - ethos = ethos_communal - heritage = heritage_indo_aryan - language = language_punjabi - martial_custom = martial_custom_male_only - head_determination = head_determination_domain - traditions = { - tradition_diasporic - tradition_warriors_by_merit - tradition_culinary_art - tradition_british_meritocracy - } - - name_list = name_list_punjabi - - coa_gfx = { indo_aryan_group_coa_gfx } - building_gfx = { indian_building_gfx } - clothing_gfx = { indian_clothing_gfx } - unit_gfx = { indian_unit_gfx } - house_coa_frame = house_frame_17 - - ethnicities = { - 100 = indian - } -} \ No newline at end of file diff --git a/common/culture/pillars/NEOW_heritage.txt b/common/culture/pillars/NEOW_heritage.txt index 3915be6a..f671b5a7 100644 --- a/common/culture/pillars/NEOW_heritage.txt +++ b/common/culture/pillars/NEOW_heritage.txt @@ -118,22 +118,4 @@ heritage_anglo_american = { } } audio_parameter = european -} -heritage_brazilian = { - type = heritage - is_shown = { - heritage_is_shown_trigger = { - HERITAGE = heritage_indo_aryan - } - } - audio_parameter = european -} -heritage_indo_aryan = { - type = heritage - is_shown = { - heritage_is_shown_trigger = { - HERITAGE = heritage_indo_aryan - } - } - audio_parameter = indian } \ No newline at end of file diff --git a/common/culture/pillars/NEOW_language.txt b/common/culture/pillars/NEOW_language.txt index 98a46366..aaa3ac4a 100644 --- a/common/culture/pillars/NEOW_language.txt +++ b/common/culture/pillars/NEOW_language.txt @@ -367,21 +367,4 @@ language_sorbian = { } color = { 0.35 0.7 0.8 } -} -language_punjabi = { - type = language - is_shown = { - language_is_shown_trigger = { - LANGUAGE = language_punjabi - } - } - ai_will_do = { - value = 10 - if = { - limit = { has_cultural_pillar = language_sorbian } - multiply = 10 - } - } - - color = punjabi } \ No newline at end of file diff --git a/common/dynasties/NEOW_dynasties.txt b/common/dynasties/NEOW_dynasties.txt index 6c258998..2fae89e9 100644 --- a/common/dynasties/NEOW_dynasties.txt +++ b/common/dynasties/NEOW_dynasties.txt @@ -1756,8 +1756,3 @@ plata_dynasty = { name = dynn_Plata culture = cale } - -baio_dynasty = { - name = dynn_Baio - culture = brazilian -} diff --git a/common/scripted_character_templates/00_pool_repopulation_character_templates.txt b/common/scripted_character_templates/00_pool_repopulation_character_templates.txt index edf2da24..0338f2d4 100644 --- a/common/scripted_character_templates/00_pool_repopulation_character_templates.txt +++ b/common/scripted_character_templates/00_pool_repopulation_character_templates.txt @@ -932,13 +932,6 @@ pool_repopulate_local_flavor = { } } } - culture:traveller = { - trigger = { - root.capital_province = { - geographical_region = world_europe_west_britannia - } - } - } culture:kurdish = { trigger = { root.capital_province = { @@ -1244,21 +1237,6 @@ pool_repopulate_local_flavor = { } } - if = { - limit = { - culture = traveller - } - add_character_flag = ai_will_not_convert - set_character_faith = faith:celtic - if = { - limit = { - NOT = { - knows_language_of_culture = root.capital_province.culture - } - } - learn_language_of_culture = root.capital_province.culture - } - } if = { limit = { culture = beur diff --git a/content_source/map_objects/masks/tree_pine_01_a_mask.png b/content_source/map_objects/masks/tree_pine_01_a_mask.png index 842b2796..1ade2415 100644 --- a/content_source/map_objects/masks/tree_pine_01_a_mask.png +++ b/content_source/map_objects/masks/tree_pine_01_a_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e400494824c75099a13ebe951f7a0c74cefcd2872c37217fbcd53eae61d1d079 -size 150037 +oid sha256:ac808e43974519042438c874863dc1d5811cb7cb44320c4207989e102093467e +size 149886 diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index a70d4583..7fe670c8 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -9799,7 +9799,7 @@ } { id=2040 - position={ 1359.181274 0.000000 2796.051758 } + position={ 1377.683960 0.000000 2779.064209 } rotation={ -0.000000 -0.375413 -0.000000 0.926858 } scale={ 1.000000 1.000000 1.000000 } } @@ -9829,7 +9829,7 @@ } { id=2045 - position={ 1403.282837 0.000000 2751.008057 } + position={ 1391.882202 0.000000 2743.014160 } rotation={ -0.000000 0.366755 -0.000000 0.930317 } scale={ 1.000000 1.000000 1.000000 } } @@ -12373,13 +12373,13 @@ } { id=2468 - position={ 1446.150391 0.000000 2729.076416 } + position={ 1424.749146 0.000000 2725.197021 } rotation={ -0.000000 -0.339978 -0.000000 0.940433 } scale={ 1.000000 1.000000 1.000000 } } { id=2469 - position={ 1411.015503 0.000000 2755.077637 } + position={ 1413.680664 0.000000 2749.700439 } rotation={ -0.000000 0.193564 -0.000000 0.981088 } scale={ 1.000000 1.000000 1.000000 } } @@ -12397,7 +12397,7 @@ } { id=2472 - position={ 1411.205566 0.000000 2732.728760 } + position={ 1420.809570 0.000000 2800.519531 } rotation={ -0.000000 0.156203 -0.000000 0.987725 } scale={ 1.000000 1.000000 1.000000 } } @@ -12415,19 +12415,19 @@ } { id=2475 - position={ 1475.371948 0.000000 2758.095703 } + position={ 1449.666138 0.000000 2771.552734 } rotation={ -0.000000 0.543666 -0.000000 0.839302 } scale={ 1.000000 1.000000 1.000000 } } { id=2476 - position={ 1474.814941 0.000000 2773.339111 } + position={ 1477.066162 0.000000 2765.563721 } rotation={ -0.000000 0.179188 -0.000000 0.983815 } scale={ 1.000000 1.000000 1.000000 } } { id=2477 - position={ 1454.029419 0.000000 2809.221680 } + position={ 1446.320801 0.000000 2825.438721 } rotation={ -0.000000 0.396190 -0.000000 0.918168 } scale={ 1.000000 1.000000 1.000000 } } @@ -12457,13 +12457,13 @@ } { id=2482 - position={ 1475.949341 0.000000 2788.609375 } + position={ 1469.722900 0.000000 2781.396484 } rotation={ -0.000000 -0.347987 -0.000000 0.937499 } scale={ 1.000000 1.000000 1.000000 } } { id=2483 - position={ 1467.129517 0.000000 2725.912354 } + position={ 1450.816772 0.000000 2733.715820 } rotation={ -0.000000 -0.392994 -0.000000 0.919541 } scale={ 1.000000 1.000000 1.000000 } } @@ -12529,7 +12529,7 @@ } { id=2496 - position={ 1565.167969 0.000000 2756.972900 } + position={ 1558.521240 0.000000 2795.682861 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -12541,7 +12541,7 @@ } { id=2498 - position={ 1579.099487 0.000000 2850.951904 } + position={ 1569.190063 0.000000 2843.309326 } rotation={ -0.000000 -0.328790 -0.000000 0.944403 } scale={ 1.000000 1.000000 1.000000 } } @@ -12559,7 +12559,7 @@ } { id=2501 - position={ 1554.676514 0.000000 2776.081543 } + position={ 1563.099487 0.000000 2760.336426 } rotation={ -0.000000 0.301945 -0.000000 0.953325 } scale={ 1.000000 1.000000 1.000000 } } @@ -12601,7 +12601,7 @@ } { id=2508 - position={ 1718.331177 0.000000 2808.898438 } + position={ 1694.888916 0.000000 2815.568115 } rotation={ -0.000000 0.470038 -0.000000 0.882646 } scale={ 1.000000 1.000000 1.000000 } } @@ -12655,7 +12655,7 @@ } { id=2517 - position={ 1638.711914 0.000000 2766.227295 } + position={ 1667.539795 0.000000 2766.402100 } rotation={ -0.000000 -0.308368 -0.000000 0.951267 } scale={ 1.000000 1.000000 1.000000 } } @@ -12925,7 +12925,7 @@ } { id=2563 - position={ 1564.139404 0.000000 2623.823242 } + position={ 1556.009033 0.000000 2624.204590 } rotation={ -0.000000 0.351446 -0.000000 0.936208 } scale={ 1.000000 1.000000 1.000000 } } @@ -13045,7 +13045,7 @@ } { id=2584 - position={ 1649.987793 0.000000 2639.266602 } + position={ 1650.982910 0.000000 2628.064941 } rotation={ -0.000000 -0.379934 -0.000000 0.925014 } scale={ 1.000000 1.000000 1.000000 } } @@ -15181,7 +15181,7 @@ } { id=2955 - position={ 1595.740967 0.000000 2868.866943 } + position={ 1607.867676 0.000000 2882.606934 } rotation={ -0.000000 -0.405947 -0.000000 0.913897 } scale={ 1.000000 1.000000 1.000000 } } @@ -47311,7 +47311,7 @@ } { id=8761 - position={ 1543.561768 0.000000 2808.938477 } + position={ 1551.000000 0.000000 2803.000000 } rotation={ 0.000000 0.818613 0.000000 0.574346 } scale={ 1.000000 1.000000 1.000000 } } @@ -47329,7 +47329,7 @@ } { id=8764 - position={ 1390.807495 0.000000 2765.207764 } + position={ 1389.000000 0.000000 2788.000000 } rotation={ 0.000000 0.618094 0.000000 0.786104 } scale={ 1.000000 1.000000 1.000000 } } @@ -47573,36 +47573,6 @@ rotation={ -0.000000 -0.278550 -0.000000 0.960422 } scale={ 1.000000 1.000000 1.000000 } } - { - id=8805 - position={ 7193.000000 0.000000 2082.000000 } - rotation={ 0.000000 -0.316228 0.000000 0.948683 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=8806 - position={ 7171.000000 0.000000 2106.000000 } - rotation={ 0.000000 0.447214 0.000000 0.894427 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=8807 - position={ 7159.000000 0.000000 2139.000000 } - rotation={ 0.000000 0.741453 0.000000 0.671005 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=8808 - position={ 7149.000000 0.000000 2129.000000 } - rotation={ 0.000000 -0.316228 0.000000 0.948683 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=8809 - position={ 7202.000000 0.000000 2375.000000 } - rotation={ 0.000000 0.544914 0.000000 0.838492 } - scale={ 1.000000 1.000000 1.000000 } - } { id=8993 position={ 1296.000000 0.000000 993.000000 } diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt index 164e9055..3a10b1bd 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -9787,13 +9787,13 @@ } { id=2044 - position={ 1380.063110 0.000000 2725.803711 } + position={ 1371.077637 0.000000 2717.085449 } rotation={ -0.000000 -0.231910 -0.000000 0.972737 } scale={ 1.000000 1.000000 1.000000 } } { id=2045 - position={ 1412.120361 0.000000 2741.724121 } + position={ 1396.077637 0.000000 2736.085449 } rotation={ -0.000000 -0.933741 -0.000000 -0.357949 } scale={ 1.000000 1.000000 1.000000 } } @@ -12331,13 +12331,13 @@ } { id=2468 - position={ 1433.211426 0.000000 2734.151367 } + position={ 1416.077637 0.000000 2724.085449 } rotation={ -0.000000 -0.129010 -0.000000 -0.991643 } scale={ 1.000000 1.000000 1.000000 } } { id=2469 - position={ 1425.134644 0.000000 2743.374023 } + position={ 1418.077637 0.000000 2742.085449 } rotation={ -0.000000 -0.664740 -0.000000 -0.747075 } scale={ 1.000000 1.000000 1.000000 } } @@ -12349,13 +12349,13 @@ } { id=2471 - position={ 1431.843140 0.000000 2782.289551 } + position={ 1426.024780 0.000000 2779.958496 } rotation={ -0.000000 -0.884808 -0.000000 0.465955 } scale={ 1.000000 1.000000 1.000000 } } { id=2472 - position={ 1420.885620 0.000000 2721.815186 } + position={ 1417.077637 0.000000 2809.085449 } rotation={ -0.000000 -0.524946 -0.000000 -0.851135 } scale={ 1.000000 1.000000 1.000000 } } @@ -12379,7 +12379,7 @@ } { id=2476 - position={ 1481.810669 0.000000 2760.547363 } + position={ 1478.077637 0.000000 2759.085449 } rotation={ -0.000000 -0.368677 -0.000000 0.929558 } scale={ 1.000000 1.000000 1.000000 } } @@ -12415,13 +12415,13 @@ } { id=2482 - position={ 1470.743164 0.000000 2781.766846 } + position={ 1468.415283 0.000000 2774.116211 } rotation={ -0.000000 -0.984940 -0.000000 0.172899 } scale={ 1.000000 1.000000 1.000000 } } { id=2483 - position={ 1457.473022 0.000000 2731.476807 } + position={ 1443.077637 0.000000 2739.085449 } rotation={ -0.000000 -0.985503 -0.000000 0.169661 } scale={ 1.000000 1.000000 1.000000 } } @@ -12433,7 +12433,7 @@ } { id=2487 - position={ 1464.666138 0.000000 2744.665283 } + position={ 1463.077637 0.000000 2735.085449 } rotation={ -0.000000 -0.984356 -0.000000 -0.176193 } scale={ 1.000000 1.000000 1.000000 } } @@ -12481,25 +12481,25 @@ } { id=2495 - position={ 1567.025146 0.000000 2823.864014 } + position={ 1552.754028 0.000000 2813.610352 } rotation={ -0.000000 -0.826663 -0.000000 0.562697 } scale={ 1.000000 1.000000 1.000000 } } { id=2496 - position={ 1557.462158 0.000000 2759.575439 } + position={ 1552.077637 0.000000 2783.085449 } rotation={ -0.000000 -0.380379 -0.000000 0.924831 } scale={ 1.000000 1.000000 1.000000 } } { id=2497 - position={ 1543.588135 0.000000 2757.779053 } + position={ 1540.478882 0.000000 2755.053711 } rotation={ -0.000000 -0.603844 -0.000000 -0.797102 } scale={ 1.000000 1.000000 1.000000 } } { id=2498 - position={ 1571.490845 0.000000 2858.172119 } + position={ 1564.077637 0.000000 2849.085449 } rotation={ -0.000000 -0.334839 -0.000000 0.942275 } scale={ 1.000000 1.000000 1.000000 } } @@ -12511,13 +12511,13 @@ } { id=2500 - position={ 1600.655151 0.000000 2797.208496 } + position={ 1611.077637 0.000000 2794.085449 } rotation={ -0.000000 -0.951119 -0.000000 0.308825 } scale={ 1.000000 1.000000 1.000000 } } { id=2501 - position={ 1560.975220 0.000000 2773.637207 } + position={ 1570.480713 0.000000 2757.105469 } rotation={ -0.000000 -0.633346 -0.000000 0.773869 } scale={ 1.000000 1.000000 1.000000 } } @@ -12529,7 +12529,7 @@ } { id=2503 - position={ 1617.575562 0.000000 2768.792480 } + position={ 1621.077637 0.000000 2770.085449 } rotation={ -0.000000 -0.124863 -0.000000 -0.992174 } scale={ 1.000000 1.000000 1.000000 } } @@ -12547,7 +12547,7 @@ } { id=2506 - position={ 1651.909180 0.000000 2781.687500 } + position={ 1649.331909 0.000000 2779.363770 } rotation={ -0.000000 -0.281763 -0.000000 0.959484 } scale={ 1.000000 1.000000 1.000000 } } @@ -12559,7 +12559,7 @@ } { id=2508 - position={ 1714.657959 0.000000 2803.085938 } + position={ 1702.077637 0.000000 2813.085449 } rotation={ -0.000000 -0.418102 -0.000000 0.908400 } scale={ 1.000000 1.000000 1.000000 } } @@ -12595,7 +12595,7 @@ } { id=2514 - position={ 1724.420776 0.000000 2793.843018 } + position={ 1713.077637 0.000000 2802.085449 } rotation={ -0.000000 -0.591844 -0.000000 0.806053 } scale={ 1.000000 1.000000 1.000000 } } @@ -12613,7 +12613,7 @@ } { id=2517 - position={ 1641.751221 0.000000 2769.551025 } + position={ 1661.361328 0.000000 2765.201660 } rotation={ -0.000000 -0.737319 -0.000000 -0.675545 } scale={ 1.000000 1.000000 1.000000 } } @@ -12757,7 +12757,7 @@ } { id=2542 - position={ 1592.001709 0.000000 2708.336182 } + position={ 1596.077637 0.000000 2705.085449 } rotation={ -0.000000 -0.312700 -0.000000 -0.949852 } scale={ 1.000000 1.000000 1.000000 } } @@ -13003,7 +13003,7 @@ } { id=2584 - position={ 1636.948120 0.000000 2632.257080 } + position={ 1642.538452 0.000000 2626.226562 } rotation={ -0.000000 -0.211797 -0.000000 0.977314 } scale={ 1.000000 1.000000 1.000000 } } @@ -13489,7 +13489,7 @@ } { id=2666 - position={ 1573.956177 0.000000 2763.142822 } + position={ 1592.077637 0.000000 2760.085449 } rotation={ -0.000000 -0.951698 -0.000000 -0.307035 } scale={ 1.000000 1.000000 1.000000 } } @@ -15241,7 +15241,7 @@ } { id=2972 - position={ 1693.280884 0.000000 2996.781738 } + position={ 1685.659546 0.000000 2986.913086 } rotation={ -0.000000 -0.001795 -0.000000 -0.999998 } scale={ 1.000000 1.000000 1.000000 } } @@ -15937,13 +15937,13 @@ } { id=3099 - position={ 1743.494141 0.000000 2853.468018 } + position={ 1713.750366 0.000000 2865.432617 } rotation={ 0.000000 -0.202041 -0.000000 0.979377 } scale={ 0.999889 1.000000 0.999889 } } { id=3100 - position={ 1759.687378 0.000000 2839.262207 } + position={ 1762.258301 0.000000 2845.225098 } rotation={ -0.000000 -0.792884 -0.000000 -0.609373 } scale={ 1.000000 1.000000 1.000000 } } @@ -47269,7 +47269,7 @@ } { id=8761 - position={ 1557.772705 0.000000 2808.703125 } + position={ 1523.077637 0.000000 2808.085449 } rotation={ 0.000000 0.818613 0.000000 0.574346 } scale={ 1.000000 1.000000 1.000000 } } @@ -47287,7 +47287,7 @@ } { id=8764 - position={ 1382.396729 0.000000 2773.685547 } + position={ 1401.077637 0.000000 2765.085449 } rotation={ 0.000000 0.618094 0.000000 0.786104 } scale={ 1.000000 1.000000 1.000000 } } @@ -47305,7 +47305,7 @@ } { id=8767 - position={ 1627.566895 0.000000 2773.935059 } + position={ 1637.077637 0.000000 2770.085449 } rotation={ 0.000000 0.435334 0.000000 0.900269 } scale={ 1.000000 1.000000 1.000000 } } @@ -47531,36 +47531,6 @@ rotation={ -0.000000 -0.278550 -0.000000 0.960422 } scale={ 1.000000 1.000000 1.000000 } } - { - id=8805 - position={ 7193.000000 0.000000 2082.000000 } - rotation={ 0.000000 -0.316228 0.000000 0.948683 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=8806 - position={ 7171.000000 0.000000 2106.000000 } - rotation={ 0.000000 0.447214 0.000000 0.894427 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=8807 - position={ 7159.000000 0.000000 2139.000000 } - rotation={ 0.000000 0.741453 0.000000 0.671005 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=8808 - position={ 7149.000000 0.000000 2129.000000 } - rotation={ 0.000000 -0.316228 0.000000 0.948683 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=8809 - position={ 7202.000000 0.000000 2375.000000 } - rotation={ 0.000000 0.544914 0.000000 0.838492 } - scale={ 1.000000 1.000000 1.000000 } - } { id=8993 position={ 1316.077637 0.000000 1010.085571 } diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt index 8de1dd62..1c0eec40 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -11515,7 +11515,7 @@ } { id=2045 - position={ 1399.453491 0.000000 2749.870850 } + position={ 1388.276855 0.000000 2749.319824 } rotation={ -0.000000 -0.912686 -0.000000 0.408662 } scale={ 1.000000 1.000000 1.000000 } } @@ -14053,13 +14053,13 @@ } { id=2468 - position={ 1438.748413 0.000000 2732.298340 } + position={ 1428.000000 0.000000 2730.000000 } rotation={ -0.000000 -0.572586 -0.000000 0.819845 } scale={ 1.000000 1.000000 1.000000 } } { id=2469 - position={ 1421.994629 0.000000 2743.736816 } + position={ 1407.000000 0.000000 2742.000000 } rotation={ -0.000000 -0.698606 -0.000000 0.715506 } scale={ 1.000000 1.000000 1.000000 } } @@ -14077,7 +14077,7 @@ } { id=2472 - position={ 1417.372314 0.000000 2726.645508 } + position={ 1426.000000 0.000000 2825.000000 } rotation={ -0.000000 -0.785311 -0.000000 0.619102 } scale={ 1.000000 1.000000 1.000000 } } @@ -14089,13 +14089,13 @@ } { id=2474 - position={ 1448.977905 0.000000 2757.958008 } + position={ 1453.000000 0.000000 2755.000000 } rotation={ -0.000000 -0.777084 -0.000000 0.629397 } scale={ 1.000000 1.000000 1.000000 } } { id=2475 - position={ 1466.619385 0.000000 2762.151855 } + position={ 1448.155884 0.000000 2776.137695 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -14107,7 +14107,7 @@ } { id=2477 - position={ 1459.441406 -0.850098 2826.858887 } + position={ 1452.689209 -0.850098 2830.216309 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -14131,7 +14131,7 @@ } { id=2481 - position={ 1467.289062 0.000000 2798.629883 } + position={ 1452.591919 0.000000 2807.972168 } rotation={ -0.000000 -0.807780 -0.000000 0.589484 } scale={ 1.000000 1.000000 1.000000 } } @@ -14143,7 +14143,7 @@ } { id=2483 - position={ 1452.505127 0.000000 2742.161133 } + position={ 1445.024292 0.000000 2745.108643 } rotation={ -0.000000 0.091379 -0.000000 0.995816 } scale={ 1.000000 1.000000 1.000000 } } @@ -14179,7 +14179,7 @@ } { id=2491 - position={ 1529.215332 0.000000 2749.866943 } + position={ 1509.910522 0.000000 2765.332764 } rotation={ -0.000000 -0.976823 -0.000000 0.214051 } scale={ 1.000000 1.000000 1.000000 } } @@ -14191,7 +14191,7 @@ } { id=2493 - position={ 1493.354736 0.000000 2797.179688 } + position={ 1507.180786 0.000000 2803.458740 } rotation={ -0.000000 0.515953 -0.000000 0.856618 } scale={ 1.000000 1.000000 1.000000 } } @@ -14203,13 +14203,13 @@ } { id=2495 - position={ 1564.622681 0.000000 2833.104980 } + position={ 1562.956787 0.000000 2817.357178 } rotation={ -0.000000 -0.732803 -0.000000 0.680441 } scale={ 1.000000 1.000000 1.000000 } } { id=2496 - position={ 1557.526855 0.000000 2758.343506 } + position={ 1559.000000 0.000000 2801.000000 } rotation={ -0.000000 -0.787997 -0.000000 0.615679 } scale={ 1.000000 1.000000 1.000000 } } @@ -14233,13 +14233,13 @@ } { id=2500 - position={ 1594.511230 0.000000 2806.922119 } + position={ 1609.000000 0.000000 2811.000000 } rotation={ -0.000000 -0.671462 -0.000000 0.741039 } scale={ 1.000000 1.000000 1.000000 } } { id=2501 - position={ 1555.932251 0.000000 2771.309814 } + position={ 1555.000000 0.000000 2761.000000 } rotation={ -0.000000 -0.803432 -0.000000 0.595397 } scale={ 1.000000 1.000000 1.000000 } } @@ -14251,7 +14251,7 @@ } { id=2503 - position={ 1611.595459 0.000000 2779.390869 } + position={ 1613.562256 0.000000 2776.822998 } rotation={ -0.000000 0.313545 -0.000000 0.949573 } scale={ 1.000000 1.000000 1.000000 } } @@ -14281,13 +14281,13 @@ } { id=2508 - position={ 1714.722168 0.000000 2804.517822 } + position={ 1688.501099 0.000000 2813.094238 } rotation={ -0.000000 -0.892826 -0.000000 0.450402 } scale={ 1.000000 1.000000 1.000000 } } { id=2509 - position={ 1588.282471 0.000000 2791.881836 } + position={ 1589.000000 0.000000 2800.000000 } rotation={ -0.000000 -0.831518 -0.000000 0.555497 } scale={ 1.000000 1.000000 1.000000 } } @@ -14317,7 +14317,7 @@ } { id=2514 - position={ 1727.666260 0.000000 2790.636963 } + position={ 1733.572144 0.000000 2785.230957 } rotation={ -0.000000 0.264176 -0.000000 0.964475 } scale={ 1.000000 1.000000 1.000000 } } @@ -14335,7 +14335,7 @@ } { id=2517 - position={ 1642.923828 0.000000 2769.421631 } + position={ 1667.205200 0.000000 2758.714355 } rotation={ -0.000000 0.075946 -0.000000 0.997112 } scale={ 1.000000 1.000000 1.000000 } } @@ -14479,7 +14479,7 @@ } { id=2542 - position={ 1595.744751 0.000000 2707.412354 } + position={ 1610.492554 0.000000 2702.655273 } rotation={ -0.000000 -0.832151 -0.000000 0.554549 } scale={ 1.000000 1.000000 1.000000 } } @@ -15211,7 +15211,7 @@ } { id=2666 - position={ 1574.833740 0.000000 2761.749756 } + position={ 1593.533203 0.000000 2773.181641 } rotation={ -0.000000 -0.738892 -0.000000 0.673824 } scale={ 1.000000 1.000000 1.000000 } } @@ -17665,7 +17665,7 @@ } { id=3100 - position={ 1759.145874 0.000000 2840.650391 } + position={ 1767.030640 0.000000 2850.136719 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -50281,13 +50281,13 @@ } { id=8761 - position={ 1557.156616 0.000000 2802.285889 } + position={ 1516.000000 0.000000 2802.000000 } rotation={ 0.000000 0.908513 0.000000 0.417857 } scale={ 1.000000 1.000000 1.000000 } } { id=8762 - position={ 1507.644653 0.000000 2782.496338 } + position={ 1501.000000 0.000000 2785.000000 } rotation={ 0.000000 0.507128 0.000000 0.861871 } scale={ 1.000000 1.000000 1.000000 } } @@ -50299,7 +50299,7 @@ } { id=8764 - position={ 1388.319092 0.000000 2781.600098 } + position={ 1407.000000 0.000000 2773.000000 } rotation={ 0.000000 -0.316228 0.000000 0.948683 } scale={ 1.000000 1.000000 1.000000 } } @@ -50311,13 +50311,13 @@ } { id=8766 - position={ 1663.175781 0.000000 2804.433105 } + position={ 1656.000000 0.000000 2803.000000 } rotation={ 0.000000 0.894427 0.000000 0.447214 } scale={ 1.000000 1.000000 1.000000 } } { id=8767 - position={ 1629.627441 0.000000 2774.152832 } + position={ 1639.712036 0.000000 2764.430664 } rotation={ 0.000000 -0.983954 0.000000 0.178425 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/map_object_data/generated/tree_pine_01_a_generator_1.txt b/gfx/map/map_object_data/generated/tree_pine_01_a_generator_1.txt index 3ef5b9e1..c6f9f22e 100644 --- a/gfx/map/map_object_data/generated/tree_pine_01_a_generator_1.txt +++ b/gfx/map/map_object_data/generated/tree_pine_01_a_generator_1.txt @@ -5,7 +5,7 @@ generated_content=yes layer="tree_high_layer" pdxmesh="tree_pine_single_01_a_mesh" - count=17869 + count=17852 transform="737.544373 0.000000 2217.696289 0.000000 0.254922 0.000000 0.966962 1.000000 1.000000 1.000000 735.473572 0.000000 2217.484375 0.000000 0.456295 0.000000 0.889828 1.000000 1.000000 1.000000 740.794617 0.000000 2222.829346 0.000000 0.742221 0.000000 0.670155 1.000000 1.000000 1.000000 @@ -482,23 +482,6 @@ 1410.797485 0.000000 2738.234863 0.000000 0.412918 0.000000 0.910768 1.000000 1.000000 1.000000 1380.500488 0.000000 2746.568115 0.000000 0.395917 0.000000 0.918286 1.000000 1.000000 1.000000 1658.527954 0.000000 2797.522217 0.000000 0.079356 0.000000 0.996846 1.000000 1.000000 1.000000 -1605.906738 0.000000 2850.388672 0.000000 0.855619 0.000000 0.517606 1.000000 1.000000 1.000000 -1613.363281 0.000000 2859.575684 0.000000 0.783888 0.000000 0.620903 1.000000 1.000000 1.000000 -1609.713501 0.000000 2852.998779 0.000000 0.275122 0.000000 0.961409 1.000000 1.000000 1.000000 -1601.583374 0.000000 2848.902588 0.000000 0.417226 0.000000 0.908803 1.000000 1.000000 1.000000 -1608.824097 0.000000 2848.193604 0.000000 0.293691 0.000000 0.955900 1.000000 1.000000 1.000000 -1609.796143 0.000000 2860.800049 0.000000 0.486316 0.000000 0.873783 1.000000 1.000000 1.000000 -1612.705078 0.000000 2866.669922 0.000000 0.275398 0.000000 0.961330 1.000000 1.000000 1.000000 -1612.545044 0.000000 2851.808350 0.000000 0.788739 0.000000 0.614728 1.000000 1.000000 1.000000 -1603.247192 0.000000 2851.232422 0.000000 0.005303 0.000000 0.999986 1.000000 1.000000 1.000000 -1610.140259 0.000000 2850.473145 0.000000 0.220151 0.000000 0.975466 1.000000 1.000000 1.000000 -1606.927734 0.000000 2852.694580 0.000000 0.451191 0.000000 0.892427 1.000000 1.000000 1.000000 -1615.064331 0.000000 2851.786865 0.000000 0.114077 0.000000 0.993472 1.000000 1.000000 1.000000 -1611.899414 0.000000 2862.171387 0.000000 0.504621 0.000000 0.863341 1.000000 1.000000 1.000000 -1611.152222 0.000000 2858.450684 0.000000 0.004993 0.000000 0.999988 1.000000 1.000000 1.000000 -1606.367798 0.000000 2867.184326 0.000000 0.819682 0.000000 0.572819 1.000000 1.000000 1.000000 -1613.749756 0.000000 2850.226318 0.000000 0.837761 0.000000 0.546038 1.000000 1.000000 1.000000 -1607.012451 0.000000 2850.326172 0.000000 0.556676 0.000000 0.830730 1.000000 1.000000 1.000000 1686.224609 0.000000 2812.506592 0.000000 0.789779 0.000000 0.613391 1.000000 1.000000 1.000000 1689.732666 0.000000 2812.626953 0.000000 0.291796 0.000000 0.956481 1.000000 1.000000 1.000000 1281.115967 0.000000 2881.398193 0.000000 0.628236 0.000000 0.778023 1.000000 1.000000 1.000000 @@ -17883,7 +17866,7 @@ object={ generated_content=yes layer="tree_high_layer" pdxmesh="tree_pine_single_01_b_mesh" - count=17774 + count=17762 transform="737.313232 0.000000 2220.416504 0.000000 0.980042 0.000000 0.198790 1.000000 1.000000 1.000000 732.460938 0.000000 2214.095459 0.000000 0.968446 0.000000 -0.249224 1.000000 1.000000 1.000000 742.562195 0.000000 2223.056885 0.000000 0.974578 0.000000 0.224047 1.000000 1.000000 1.000000 @@ -18338,18 +18321,6 @@ object={ 1382.276978 0.000000 2747.411377 0.000000 0.960231 0.000000 0.279208 1.000000 1.000000 1.000000 1319.691406 0.000000 2855.042969 0.000000 0.870963 0.000000 0.491349 1.000000 1.000000 1.000000 1320.773438 0.000000 2856.134033 0.000000 0.997267 0.000000 -0.073876 1.000000 1.000000 1.000000 -1625.684082 0.000000 2859.049561 0.000000 0.934359 0.000000 -0.356333 1.000000 1.000000 1.000000 -1610.458130 0.000000 2864.109619 0.000000 0.973854 0.000000 -0.227173 1.000000 1.000000 1.000000 -1608.651367 0.000000 2857.592773 0.000000 0.998633 0.000000 -0.052277 1.000000 1.000000 1.000000 -1612.411499 0.000000 2848.713867 0.000000 0.948041 0.000000 0.318148 1.000000 1.000000 1.000000 -1601.117798 0.000000 2853.134277 0.000000 0.903708 0.000000 -0.428149 1.000000 1.000000 1.000000 -1624.499634 0.000000 2862.488281 0.000000 0.989916 0.000000 -0.141653 1.000000 1.000000 1.000000 -1607.215576 0.000000 2864.956299 0.000000 0.960241 0.000000 0.279174 1.000000 1.000000 1.000000 -1615.659180 0.000000 2849.389648 0.000000 0.999353 0.000000 -0.035957 1.000000 1.000000 1.000000 -1603.353394 0.000000 2853.454346 0.000000 0.949277 0.000000 0.314442 1.000000 1.000000 1.000000 -1612.587891 0.000000 2864.489502 0.000000 0.999284 0.000000 -0.037847 1.000000 1.000000 1.000000 -1614.412109 0.000000 2865.187256 0.000000 0.979832 0.000000 -0.199825 1.000000 1.000000 1.000000 -1606.814453 0.000000 2851.433350 0.000000 0.989733 0.000000 0.142927 1.000000 1.000000 1.000000 1283.946167 0.000000 2880.880127 0.000000 0.983696 0.000000 0.179837 1.000000 1.000000 1.000000 490.112579 0.000000 3496.689941 0.000000 0.999998 0.000000 -0.002000 1.000000 1.000000 1.000000 488.610657 0.000000 3523.193359 0.000000 0.984515 0.000000 0.175301 1.000000 1.000000 1.000000 @@ -35666,7 +35637,7 @@ object={ generated_content=yes layer="tree_high_layer" pdxmesh="tree_pine_single_01_c_mesh" - count=17863 + count=17854 transform="656.412964 0.000000 2146.732910 0.000000 0.460093 0.000000 -0.887871 1.000000 1.000000 1.000000 735.653564 0.000000 2215.399658 0.000000 0.758651 0.000000 -0.651497 1.000000 1.000000 1.000000 739.749207 0.000000 2212.755859 0.000000 0.768587 0.000000 -0.639746 1.000000 1.000000 1.000000 @@ -36159,15 +36130,6 @@ object={ 1639.263184 0.000000 2793.409180 0.000000 0.769381 0.000000 -0.638790 1.000000 1.000000 1.000000 1656.383667 0.000000 2792.914062 0.000000 0.574709 0.000000 -0.818358 1.000000 1.000000 1.000000 1657.658691 0.000000 2795.842529 0.000000 0.862803 0.000000 -0.505540 1.000000 1.000000 1.000000 -1604.169800 0.000000 2866.392090 0.000000 0.660116 0.000000 -0.751164 1.000000 1.000000 1.000000 -1614.142700 0.000000 2863.081055 0.000000 0.265026 0.000000 -0.964241 1.000000 1.000000 1.000000 -1599.093018 0.000000 2851.212158 0.000000 0.754031 0.000000 -0.656838 1.000000 1.000000 1.000000 -1604.291382 0.000000 2848.118652 0.000000 0.671549 0.000000 -0.740960 1.000000 1.000000 1.000000 -1608.010132 0.000000 2850.875732 0.000000 0.429532 0.000000 -0.903052 1.000000 1.000000 1.000000 -1601.080688 0.000000 2850.976318 0.000000 0.638938 0.000000 -0.769258 1.000000 1.000000 1.000000 -1611.604126 0.000000 2860.248535 0.000000 0.172182 0.000000 -0.985065 1.000000 1.000000 1.000000 -1625.472656 0.000000 2860.891113 0.000000 0.745850 0.000000 -0.666114 1.000000 1.000000 1.000000 -1607.400635 0.000000 2849.297607 0.000000 0.404495 0.000000 -0.914540 1.000000 1.000000 1.000000 1282.684692 0.000000 2881.986084 0.000000 0.507667 0.000000 -0.861553 1.000000 1.000000 1.000000 475.774719 0.000000 3514.188721 0.000000 0.856429 0.000000 -0.516265 1.000000 1.000000 1.000000 494.564667 0.000000 3520.220947 0.000000 0.557818 0.000000 -0.829964 1.000000 1.000000 1.000000 diff --git a/gfx/map/map_object_data/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt index 2c0317ca..e0af7d5b 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -11515,7 +11515,7 @@ } { id=2045 - position={ 1414.732422 0.000000 2747.182617 } + position={ 1399.000000 0.000000 2744.000000 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -14053,13 +14053,13 @@ } { id=2468 - position={ 1426.313477 0.000000 2731.376709 } + position={ 1420.000000 0.000000 2729.000000 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=2469 - position={ 1425.568359 0.000000 2752.059082 } + position={ 1422.000000 0.000000 2748.000000 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -14077,7 +14077,7 @@ } { id=2472 - position={ 1412.021729 0.000000 2728.013184 } + position={ 1418.000000 0.000000 2817.000000 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -14095,7 +14095,7 @@ } { id=2475 - position={ 1466.242188 0.000000 2769.763428 } + position={ 1457.838989 0.000000 2770.817627 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -14137,13 +14137,13 @@ } { id=2482 - position={ 1465.729614 0.000000 2781.030762 } + position={ 1476.337646 0.000000 2778.030518 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=2483 - position={ 1452.576294 0.000000 2744.646484 } + position={ 1449.000000 0.000000 2740.000000 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -14203,13 +14203,13 @@ } { id=2495 - position={ 1568.620728 0.000000 2834.640625 } + position={ 1555.000000 0.000000 2821.000000 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=2496 - position={ 1554.838135 0.000000 2763.999023 } + position={ 1555.000000 0.000000 2790.000000 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -14233,13 +14233,13 @@ } { id=2500 - position={ 1605.952759 0.000000 2810.677246 } + position={ 1616.000000 0.000000 2802.000000 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=2501 - position={ 1566.928711 0.000000 2770.409180 } + position={ 1570.069214 0.000000 2763.600342 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -14251,7 +14251,7 @@ } { id=2503 - position={ 1617.467773 0.000000 2776.542969 } + position={ 1623.705200 0.000000 2775.481445 } rotation={ -0.000000 -0.227584 -0.000000 0.973759 } scale={ 1.000000 1.000000 1.000000 } } @@ -14269,7 +14269,7 @@ } { id=2506 - position={ 1649.833252 0.000000 2786.299561 } + position={ 1646.853149 0.000000 2777.678955 } rotation={ -0.000000 0.460042 -0.000000 0.887897 } scale={ 1.000000 1.000000 1.000000 } } @@ -14281,7 +14281,7 @@ } { id=2508 - position={ 1713.205688 0.000000 2808.882324 } + position={ 1711.000000 0.000000 2815.000000 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -14317,7 +14317,7 @@ } { id=2514 - position={ 1726.077393 0.000000 2796.244873 } + position={ 1719.000000 0.000000 2803.000000 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -14335,7 +14335,7 @@ } { id=2517 - position={ 1644.395630 0.000000 2769.515625 } + position={ 1669.075317 0.000000 2770.891357 } rotation={ -0.000000 0.116056 -0.000000 0.993243 } scale={ 1.000000 1.000000 1.000000 } } @@ -14479,7 +14479,7 @@ } { id=2542 - position={ 1593.547974 0.000000 2714.677979 } + position={ 1598.886108 0.000000 2710.634277 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -15211,7 +15211,7 @@ } { id=2666 - position={ 1581.614380 0.000000 2761.407959 } + position={ 1596.699219 0.000000 2764.449463 } rotation={ -0.000000 -0.160764 -0.000000 0.986993 } scale={ 1.000000 1.000000 1.000000 } } @@ -50281,7 +50281,7 @@ } { id=8761 - position={ 1550.135254 0.000000 2813.728027 } + position={ 1539.000000 0.000000 2804.000000 } rotation={ 0.000000 0.818613 0.000000 0.574346 } scale={ 1.000000 1.000000 1.000000 } } @@ -50299,7 +50299,7 @@ } { id=8764 - position={ 1376.319092 0.000000 2785.600098 } + position={ 1395.000000 0.000000 2777.000000 } rotation={ 0.000000 0.618094 0.000000 0.786104 } scale={ 1.000000 1.000000 1.000000 } } @@ -50317,7 +50317,7 @@ } { id=8767 - position={ 1624.411011 0.000000 2778.641113 } + position={ 1637.000000 0.000000 2774.000000 } rotation={ 0.000000 0.435334 0.000000 0.900269 } scale={ 1.000000 1.000000 1.000000 } } @@ -50545,32 +50545,32 @@ } { id=8805 - position={ 7193.000000 0.000000 2082.000000 } - rotation={ 0.000000 -0.316228 0.000000 0.948683 } + position={ 7169.000000 0.000000 2081.000000 } + rotation={ 0.000000 0.560641 0.000000 0.828059 } scale={ 1.000000 1.000000 1.000000 } } { id=8806 - position={ 7171.000000 0.000000 2106.000000 } - rotation={ 0.000000 0.447214 0.000000 0.894427 } + position={ 7184.000000 0.000000 2111.000000 } + rotation={ 0.000000 0.625818 0.000000 -0.779969 } scale={ 1.000000 1.000000 1.000000 } } { id=8807 - position={ 7159.000000 0.000000 2139.000000 } - rotation={ 0.000000 0.741453 0.000000 0.671005 } + position={ 7170.000000 0.000000 2160.000000 } + rotation={ 0.000000 0.877092 0.000000 -0.480322 } scale={ 1.000000 1.000000 1.000000 } } { id=8808 - position={ 7149.000000 0.000000 2129.000000 } - rotation={ 0.000000 -0.316228 0.000000 0.948683 } + position={ 7122.000000 0.000000 2126.000000 } + rotation={ 0.000000 0.917663 0.000000 -0.397359 } scale={ 1.000000 1.000000 1.000000 } } { id=8809 - position={ 7202.000000 0.000000 2375.000000 } - rotation={ 0.000000 0.544914 0.000000 0.838492 } + position={ 7217.000000 0.000000 2361.000000 } + rotation={ 0.000000 0.519372 0.000000 -0.854548 } scale={ 1.000000 1.000000 1.000000 } } { diff --git a/gfx/map/map_object_data/siege_locators.txt b/gfx/map/map_object_data/siege_locators.txt index c48d14d5..30e8d5d0 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -9835,13 +9835,13 @@ } { id=2044 - position={ 1370.412720 0.000000 2726.022705 } + position={ 1361.000000 0.000000 2716.000000 } rotation={ 0.000000 0.741453 0.000000 0.671005 } scale={ 1.000000 1.000000 1.000000 } } { id=2045 - position={ 1399.673462 0.000000 2743.592041 } + position={ 1387.000000 0.000000 2734.000000 } rotation={ 0.000000 0.780042 0.000000 0.625727 } scale={ 1.000000 1.000000 1.000000 } } @@ -12379,13 +12379,13 @@ } { id=2468 - position={ 1440.387695 0.000000 2727.706055 } + position={ 1423.000000 0.000000 2719.000000 } rotation={ 0.000000 0.889168 0.000000 -0.457582 } scale={ 1.000000 1.000000 1.000000 } } { id=2469 - position={ 1433.751831 0.000000 2745.392334 } + position={ 1427.000000 0.000000 2745.000000 } rotation={ -0.000000 -0.584710 -0.000000 0.811242 } scale={ 1.000000 1.000000 1.000000 } } @@ -12397,14 +12397,14 @@ } { id=2471 - position={ 1422.392578 0.000000 2781.517334 } + position={ 1417.042847 0.000000 2778.884277 } rotation={ -0.000000 0.748990 -0.000000 0.662581 } scale={ 1.000000 1.000000 1.000000 } } { id=2472 - position={ 1421.722656 0.000000 2713.017334 } - rotation={ -0.000000 0.998431 -0.000000 -0.055990 } + position={ 1423.000000 0.000000 2801.000000 } + rotation={ 0.000000 0.948683 0.000000 -0.316228 } scale={ 1.000000 1.000000 1.000000 } } { @@ -12427,7 +12427,7 @@ } { id=2476 - position={ 1493.019653 0.000000 2759.781006 } + position={ 1488.000000 0.000000 2759.000000 } rotation={ 0.000000 0.707107 0.000000 -0.707107 } scale={ 1.000000 1.000000 1.000000 } } @@ -12463,7 +12463,7 @@ } { id=2482 - position={ 1462.200806 0.000000 2784.095215 } + position={ 1459.337646 0.000000 2777.030518 } rotation={ 0.000000 0.584710 0.000000 0.811242 } scale={ 1.000000 1.000000 1.000000 } } @@ -12481,7 +12481,7 @@ } { id=2487 - position={ 1468.525635 0.000000 2734.652832 } + position={ 1466.000000 0.000000 2727.000000 } rotation={ 0.000000 0.983954 0.000000 -0.178425 } scale={ 1.000000 1.000000 1.000000 } } @@ -12529,26 +12529,26 @@ } { id=2495 - position={ 1558.493774 0.000000 2825.194092 } + position={ 1544.897583 0.000000 2814.258301 } rotation={ -0.000000 0.694789 -0.000000 0.719214 } scale={ 1.000000 1.000000 1.000000 } } { id=2496 - position={ 1562.929199 0.000000 2750.294678 } + position={ 1557.000000 0.000000 2773.000000 } rotation={ 0.000000 0.973249 0.000000 -0.229753 } scale={ 1.000000 1.000000 1.000000 } } { id=2497 - position={ 1545.921509 0.000000 2746.485596 } + position={ 1543.401245 0.000000 2744.968018 } rotation={ 0.000000 0.989400 0.000000 -0.145213 } scale={ 1.000000 1.000000 1.000000 } } { id=2498 position={ 1574.000000 0.000000 2848.000000 } - rotation={ -0.000000 0.995498 -0.000000 -0.094781 } + rotation={ 0.000000 0.741452 0.000000 -0.671005 } scale={ 1.000000 1.000000 1.000000 } } { @@ -12559,14 +12559,14 @@ } { id=2500 - position={ 1609.468506 0.000000 2802.083984 } + position={ 1619.000000 0.000000 2797.000000 } rotation={ -0.000000 -0.569595 -0.000000 0.821926 } scale={ 1.000000 1.000000 1.000000 } } { id=2501 - position={ 1563.541260 0.000000 2763.415283 } - rotation={ -0.000000 0.999244 -0.000000 -0.038877 } + position={ 1561.403076 0.000000 2753.020020 } + rotation={ 0.000000 0.838492 0.000000 0.544914 } scale={ 1.000000 1.000000 1.000000 } } { @@ -12577,7 +12577,7 @@ } { id=2503 - position={ 1607.675903 0.000000 2767.913330 } + position={ 1613.254639 0.000000 2768.264404 } rotation={ -0.000000 0.775251 -0.000000 0.631653 } scale={ 1.000000 1.000000 1.000000 } } @@ -12607,7 +12607,7 @@ } { id=2508 - position={ 1707.421265 0.000000 2802.651611 } + position={ 1693.000000 0.000000 2810.000000 } rotation={ 0.000000 0.811242 0.000000 0.584710 } scale={ 1.000000 1.000000 1.000000 } } @@ -12643,7 +12643,7 @@ } { id=2514 - position={ 1731.145508 0.000000 2788.711670 } + position={ 1721.000000 0.000000 2797.000000 } rotation={ 0.000000 0.874642 0.000000 -0.484768 } scale={ 1.000000 1.000000 1.000000 } } @@ -12661,7 +12661,7 @@ } { id=2517 - position={ 1647.966064 0.000000 2770.337158 } + position={ 1673.396973 0.000000 2765.409180 } rotation={ -0.000000 -0.666921 -0.000000 0.745128 } scale={ 1.000000 1.000000 1.000000 } } @@ -12805,7 +12805,7 @@ } { id=2542 - position={ 1599.643066 0.000000 2703.447021 } + position={ 1604.000000 0.000000 2699.000000 } rotation={ 0.000000 0.894427 0.000000 -0.447214 } scale={ 1.000000 1.000000 1.000000 } } @@ -13051,7 +13051,7 @@ } { id=2584 - position={ 1646.672119 0.000000 2629.397217 } + position={ 1652.460815 0.000000 2624.141113 } rotation={ 0.000000 0.773342 0.000000 -0.633989 } scale={ 1.000000 1.000000 1.000000 } } @@ -13537,7 +13537,7 @@ } { id=2666 - position={ 1581.240234 0.000000 2754.687012 } + position={ 1597.000000 0.000000 2753.000000 } rotation={ 0.000000 0.952295 0.000000 -0.305177 } scale={ 1.000000 1.000000 1.000000 } } @@ -15230,7 +15230,7 @@ { id=2962 position={ 1656.522461 0.000000 3029.458252 } - rotation={ -0.000000 -0.248399 -0.000000 -0.968657 } + rotation={ -0.000000 0.991685 -0.000000 -0.128686 } scale={ 1.000000 1.000000 1.000000 } } { @@ -15290,13 +15290,13 @@ { id=2972 position={ 1695.581909 0.000000 2984.827393 } - rotation={ -0.000000 0.970981 -0.000000 -0.239154 } + rotation={ 0.000000 0.773342 0.000000 -0.633989 } scale={ 1.000000 1.000000 1.000000 } } { id=2973 position={ 1682.636230 0.000000 2986.355469 } - rotation={ -0.000000 0.655186 -0.000000 -0.755467 } + rotation={ -0.000000 0.999983 -0.000000 0.005770 } scale={ 1.000000 1.000000 1.000000 } } { @@ -47317,7 +47317,7 @@ } { id=8761 - position={ 1565.490112 0.000000 2813.490234 } + position={ 1532.000000 0.000000 2813.000000 } rotation={ 0.000000 -0.507128 0.000000 0.861871 } scale={ 1.000000 1.000000 1.000000 } } @@ -47335,7 +47335,7 @@ } { id=8764 - position={ 1372.319092 0.000000 2774.600098 } + position={ 1391.000000 0.000000 2766.000000 } rotation={ 0.000000 0.671005 0.000000 0.741453 } scale={ 1.000000 1.000000 1.000000 } } @@ -47353,7 +47353,7 @@ } { id=8767 - position={ 1627.801025 0.000000 2781.399170 } + position={ 1638.000000 0.000000 2779.000000 } rotation={ 0.000000 -0.055300 0.000000 0.998470 } scale={ 1.000000 1.000000 1.000000 } } @@ -47581,32 +47581,26 @@ } { id=8805 - position={ 7193.000000 0.000000 2082.000000 } - rotation={ 0.000000 -0.316228 0.000000 0.948683 } + position={ 7178.000000 0.000000 2070.000000 } + rotation={ 0.000000 0.838492 0.000000 0.544914 } scale={ 1.000000 1.000000 1.000000 } } { id=8806 - position={ 7171.000000 0.000000 2106.000000 } - rotation={ 0.000000 0.447214 0.000000 0.894427 } + position={ 7189.000000 0.000000 2102.000000 } + rotation={ 0.000000 -0.633989 0.000000 0.773342 } scale={ 1.000000 1.000000 1.000000 } } { id=8807 - position={ 7159.000000 0.000000 2139.000000 } - rotation={ 0.000000 0.741453 0.000000 0.671005 } + position={ 7173.000000 0.000000 2149.000000 } + rotation={ 0.000000 -0.207591 0.000000 0.978216 } scale={ 1.000000 1.000000 1.000000 } } { id=8808 - position={ 7149.000000 0.000000 2129.000000 } - rotation={ 0.000000 -0.316228 0.000000 0.948683 } - scale={ 1.000000 1.000000 1.000000 } - } - { - id=8809 - position={ 7202.000000 0.000000 2375.000000 } - rotation={ 0.000000 0.544914 0.000000 0.838492 } + position={ 7133.000000 0.000000 2121.000000 } + rotation={ 0.000000 0.707107 0.000000 0.707107 } scale={ 1.000000 1.000000 1.000000 } } { @@ -53395,8 +53389,8 @@ } { id=9786 - position={ 1460.121460 0.000000 2857.995605 } - rotation={ -0.000000 0.987375 -0.000000 0.158401 } + position={ 1465.257446 0.000000 2863.986084 } + rotation={ 0.000000 0.741453 0.000000 0.671005 } scale={ 1.000000 1.000000 1.000000 } } { diff --git a/gfx/map/terrain/detail_index.tga b/gfx/map/terrain/detail_index.tga index 6f507474..8c188eff 100644 --- a/gfx/map/terrain/detail_index.tga +++ b/gfx/map/terrain/detail_index.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0de204590f5e128a5e1f3ebb194b376d64769ecbb6363544aa29346b8d2da8e3 +oid sha256:e020af40ac8132b2aa9b1fe7efa05d958e9e7e9aadd9809dedb85083277397af size 169869356 diff --git a/gfx/map/terrain/detail_intensity.tga b/gfx/map/terrain/detail_intensity.tga index 8fe1b8ac..be2b2f70 100644 --- a/gfx/map/terrain/detail_intensity.tga +++ b/gfx/map/terrain/detail_intensity.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b67c8088d6d3d3a6d9719a8931ad996785cff021043f62aeb0b5d583337b0c4 +oid sha256:7472092f602b53ffc539733460b1be044a8dd12fb3240dd4892fde4c7448a764 size 169869356 diff --git a/gfx/map/terrain/masks/beach_02_mask.png b/gfx/map/terrain/masks/beach_02_mask.png index f3a8b940..66d80867 100644 --- a/gfx/map/terrain/masks/beach_02_mask.png +++ b/gfx/map/terrain/masks/beach_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b02be78d8ff4d0c02479f3171c71334044df5109f3c338e1526f4d88198f4857 -size 4109138 +oid sha256:95b48e6ec2edf611c4f4b81a6a48f6269702bcc156f66fda81c2166fa9adaf2a +size 4109154 diff --git a/gfx/map/terrain/masks/beach_02_mediterranean_mask.png b/gfx/map/terrain/masks/beach_02_mediterranean_mask.png index 01edae99..63f4541d 100644 --- a/gfx/map/terrain/masks/beach_02_mediterranean_mask.png +++ b/gfx/map/terrain/masks/beach_02_mediterranean_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a44e8b44988b5cd6a457a602aba941a190ecfcdf586b14b374deb23b300adad -size 1492614 +oid sha256:5af823b700984de4d0d1c7b64c6f5da88ac3adec118c98fa957084118b3eaad0 +size 1492550 diff --git a/gfx/map/terrain/masks/coastline_cliff_grey_mask.png b/gfx/map/terrain/masks/coastline_cliff_grey_mask.png index b817097b..101ef7a8 100644 --- a/gfx/map/terrain/masks/coastline_cliff_grey_mask.png +++ b/gfx/map/terrain/masks/coastline_cliff_grey_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0099f28c29ef22d8608eccc12500eaa2fe10a0cf74375b3bb4a6141418d55c2 -size 932222 +oid sha256:025470c9b6370f9f419f5c216371cb5a22d6b7f27fdf25735fc47696fbee2b66 +size 932250 diff --git a/gfx/map/terrain/masks/hills_01_rocks_mask.png b/gfx/map/terrain/masks/hills_01_rocks_mask.png index 8379f0a7..cde6c6f4 100644 --- a/gfx/map/terrain/masks/hills_01_rocks_mask.png +++ b/gfx/map/terrain/masks/hills_01_rocks_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5dcf929e8cdaef9c5337f4351ca760f6306b83e46f276afc78ffbeb374257b5 -size 1936143 +oid sha256:1ff7f44de95d5c82f62ffca114acd15a99deba6b81145f891b078e63ce0c90af +size 1936165 diff --git a/gfx/map/terrain/masks/hills_01_rocks_small_mask.png b/gfx/map/terrain/masks/hills_01_rocks_small_mask.png index 07f29e3f..0f24db4c 100644 --- a/gfx/map/terrain/masks/hills_01_rocks_small_mask.png +++ b/gfx/map/terrain/masks/hills_01_rocks_small_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d41318aea18326da979ad7af6e10a432cf537ac632c66d2c5ea4422343cdf18b -size 1505940 +oid sha256:ae24813df8c448bc1ebb674177822e27a48df13e37519550a5346e7bcf777506 +size 1505964 diff --git a/gfx/map/terrain/masks/mud_wet_01_mask.png b/gfx/map/terrain/masks/mud_wet_01_mask.png index cbc5f273..df5cad11 100644 --- a/gfx/map/terrain/masks/mud_wet_01_mask.png +++ b/gfx/map/terrain/masks/mud_wet_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7eb8895e264032f1f7fd26a3d384a8c4ab6fdd7df0b53589098ce726994ea17e -size 434386 +oid sha256:2cde53f4625034bc5074738d08625f8cdcb6ce513ad47098dde2c66ad9d53d04 +size 434467 diff --git a/gfx/map/terrain/masks/plains_01_dry_mud_mask.png b/gfx/map/terrain/masks/plains_01_dry_mud_mask.png index cc1e36af..dad57703 100644 --- a/gfx/map/terrain/masks/plains_01_dry_mud_mask.png +++ b/gfx/map/terrain/masks/plains_01_dry_mud_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68a406fcac63128c53a814a1f0ba3dc643fe2cc65ac33fbf04926251369365c4 -size 2067429 +oid sha256:3c99a3b51d76dc1302a3e2f608666826f1aa7d4aff9c2277bd09f30c0c94f472 +size 2067454 diff --git a/gfx/map/terrain/masks/plains_01_mask.png b/gfx/map/terrain/masks/plains_01_mask.png index de8f9a0f..4fdfda88 100644 --- a/gfx/map/terrain/masks/plains_01_mask.png +++ b/gfx/map/terrain/masks/plains_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a84298eb818c4b96a6c92d430b6589e56f5a2aeba83fa20297aacf82f8eca136 -size 3332061 +oid sha256:6fb0764e0d1ce49df3d687b6387af4000fcb924d60dcfc0336442499f27f21b2 +size 3332107 diff --git a/gfx/map/terrain/masks/plains_01_noisy_mask.png b/gfx/map/terrain/masks/plains_01_noisy_mask.png index ae7da86a..98d0c561 100644 --- a/gfx/map/terrain/masks/plains_01_noisy_mask.png +++ b/gfx/map/terrain/masks/plains_01_noisy_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40fbfd115d91a0305437595b82b390cab99ac32043919f6f18282346ca247aa2 -size 1648723 +oid sha256:e6d5f6e1bb0aa8ad608b88ef2579c30cfb9d585dd108946dcd6df68dd047003d +size 1648837 diff --git a/gfx/map/terrain/masks/plains_01_rough_mask.png b/gfx/map/terrain/masks/plains_01_rough_mask.png index 3e60d8a7..912ffeaf 100644 --- a/gfx/map/terrain/masks/plains_01_rough_mask.png +++ b/gfx/map/terrain/masks/plains_01_rough_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3ed55edfd0462021eb7d3ad7ebb5bfaa55bff8f589f1cd4ce052dd98a63491f -size 3106636 +oid sha256:d985da6dd077288999911e5ea5422b5855bac78e7186511258b76a17cb66d74a +size 3106720 diff --git a/gfx/map/terrain/masks/snow_mask.png b/gfx/map/terrain/masks/snow_mask.png index a6dc0ca8..af9e19a0 100644 --- a/gfx/map/terrain/masks/snow_mask.png +++ b/gfx/map/terrain/masks/snow_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24ebea77be4445b76a4f8701479137e2803b2453db3a395752de8742e088bacd -size 920904 +oid sha256:03a524359b1299aee053fb9812a3075a6404ec2b41c25c51716ac4f00d553691 +size 921057 diff --git a/gfx/map/terrain/masks/steppe_grass_mask.png b/gfx/map/terrain/masks/steppe_grass_mask.png index e641ead7..19d5a9c8 100644 --- a/gfx/map/terrain/masks/steppe_grass_mask.png +++ b/gfx/map/terrain/masks/steppe_grass_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:167b79b9ca3a2903063381549c84b7a712ee3503a0f6dd38048f2fff89257f44 -size 1380549 +oid sha256:64ae4ac46e4491a1a423e5311581444ee745dd2eec426b0eaf0d5bc2cc0570df +size 1380557 diff --git a/gfx/map/terrain/masks/steppe_rocks_mask.png b/gfx/map/terrain/masks/steppe_rocks_mask.png index d3af9025..037eb515 100644 --- a/gfx/map/terrain/masks/steppe_rocks_mask.png +++ b/gfx/map/terrain/masks/steppe_rocks_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13ba2a4f1f0bbfca3f8b082ae6fa13b15e143a568689977e3187b7a9366b75fb -size 1034856 +oid sha256:894fc3b946f6113d86c125aa3ca74b9d675c6ff7753361c8df5aea4645fb8f0b +size 1034875 diff --git a/gfx/map/terrain/masks/tells_wet_03_mask.png b/gfx/map/terrain/masks/tells_wet_03_mask.png index c62a4aec..1423a7e9 100644 --- a/gfx/map/terrain/masks/tells_wet_03_mask.png +++ b/gfx/map/terrain/masks/tells_wet_03_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c10a069b56c60dd4761a943254ef58efc2224ffe5dbefc2917ad6825be2f91ee -size 186096 +oid sha256:9a992cdf6cb679da7e85a1d925d1f3794c7e845f4676e138b8873bbb80c2735e +size 185832 diff --git a/gfx/map/terrain/masks/wetlands_02_mask.png b/gfx/map/terrain/masks/wetlands_02_mask.png index e616e924..5664896d 100644 --- a/gfx/map/terrain/masks/wetlands_02_mask.png +++ b/gfx/map/terrain/masks/wetlands_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7862c13b3f7f30b0f4e98949716831d457a21a9cd06dc8e0d4d09807382da130 -size 671586 +oid sha256:74b579e5c3b3ff3af26680e07d4a127fb1a4c204abd0db337c91a4ed40d19a0e +size 671382 diff --git a/gfx/map/terrain/masks/wetlands_02_mud_mask.png b/gfx/map/terrain/masks/wetlands_02_mud_mask.png index 5ffe6670..384b6a23 100644 --- a/gfx/map/terrain/masks/wetlands_02_mud_mask.png +++ b/gfx/map/terrain/masks/wetlands_02_mud_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:685fefa58f99664da074790932381e5975310f018b17916b7d068c2e1add1130 -size 292469 +oid sha256:2aea202f956933c6e9916d32ef309d5b0862c552718f9128819fa25396a124aa +size 292588 diff --git a/gfx/map/terrain/masks_gen/gen_central_base_mask.png b/gfx/map/terrain/masks_gen/gen_central_base_mask.png index bec547cf..ec6a8f6d 100644 --- a/gfx/map/terrain/masks_gen/gen_central_base_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_base_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a0d0821e7e21e706ae661468778c0e9321775b4889ea712f178a9d711bfa903 -size 4207471 +oid sha256:68fa7d67ef8d179813ba8f56c773b39dbae7e1524da92da07b2057edc7c09dbb +size 4207571 diff --git a/gfx/map/terrain/masks_gen/gen_central_hills_mask.png b/gfx/map/terrain/masks_gen/gen_central_hills_mask.png index 02b32fd4..524b1e61 100644 --- a/gfx/map/terrain/masks_gen/gen_central_hills_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_hills_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1aa8844ad847107428224eaf47dfd032e68946fa6122c33c2cd4fe1016d013a -size 4641912 +oid sha256:b9e994f46eed90801204a4845b404544999e87cdd147553d9d5d0dfedad351b9 +size 4641894 diff --git a/gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png b/gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png index 23a73f76..f9f864aa 100644 --- a/gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:363e694eef9dbd2f309ba45cfd46c8615f165fefc2ceb0f770cf1a3d8d23fa91 -size 6213123 +oid sha256:5bd3caa50313240b35ffd892f8207c00067481d232dd6a3d79e6dd783f2aeadd +size 6212804 diff --git a/gfx/map/terrain/masks_gen/gen_central_lowlands_03_mask.png b/gfx/map/terrain/masks_gen/gen_central_lowlands_03_mask.png index 91123ab6..824009c6 100644 --- a/gfx/map/terrain/masks_gen/gen_central_lowlands_03_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_lowlands_03_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:caba57a12247517091f4f9adc9c2eaf94a0a5b871c6a30e7ba4956eb2a5f49f0 -size 5797416 +oid sha256:1aa0e9c8e4354cf60077056192003dc5cdd628370d3215bd103f1ca7064adece +size 5797216 diff --git a/gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png b/gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png index 94045314..55672e81 100644 --- a/gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:148e23b983204061f4d3996ce5db31e2d52c22764bdfc69bb38b3d11c32d7b7f -size 6031741 +oid sha256:8711af2bb016b41541e042c6d570abf2ca81fe92c5f9207f55113c2498d6558e +size 6031971 diff --git a/gfx/map/terrain/masks_gen/gen_central_mountain_mask.png b/gfx/map/terrain/masks_gen/gen_central_mountain_mask.png index 5ef06cfe..ef90f3bd 100644 --- a/gfx/map/terrain/masks_gen/gen_central_mountain_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_mountain_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f7a37eb021b54875bbdef1d1e3d17216bf939c6c40eb85d0170daf448ba0c4e -size 2407673 +oid sha256:842f27867bd6106cf191088b4dfdd7f947da849d3e6b160e2b96abc9959bc261 +size 2407589 diff --git a/gfx/map/terrain/masks_gen/gen_drylands_mountain_mask.png b/gfx/map/terrain/masks_gen/gen_drylands_mountain_mask.png index 1073669d..732fa29d 100644 --- a/gfx/map/terrain/masks_gen/gen_drylands_mountain_mask.png +++ b/gfx/map/terrain/masks_gen/gen_drylands_mountain_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9caca410a782fada93dcd17e8f30bb7edfab54151d39da9d6af64275839b41eb -size 2077895 +oid sha256:240eea6231ad70616403107ffd558d8d1d9256df33aa04af4b22c186b7ea89f4 +size 2078030 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_base_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_base_mask.png index d55a7b7a..d546a584 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_base_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_base_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bf9ed45fe30248d4bb891916285d48463a1f6b1a2c28470d604cc83b5d49228 -size 902010 +oid sha256:39103494bd2d5eaf7c6160ff47a2f63a2e486ad9fed186b14fdf7a49d77f3b80 +size 902061 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_hills_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_hills_mask.png index 17bcbe1a..e51e7496 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_hills_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_hills_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4253031b1053f4ea0e96bdb8f5749a437fce0bd6baec993f7d66573595c49293 -size 958938 +oid sha256:48ad48e54da79c47430459b541c109ff0a168034d4972790060bc161dcff7fe1 +size 959003 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_02_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_02_mask.png index b6830c36..431b5e1f 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_02_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d5c685ea34a9c0708f11c06408b9d0afbdc8cfac77e4f2678d3c324a1668b43 -size 1057003 +oid sha256:042e98aaecde21a5771dabba999dab902547487c22f8a8e5e8b8d3dd74e7ef4e +size 1057157 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_03_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_03_mask.png index 8ef0cb6e..0387033b 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_03_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_03_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07dd809c2d0825615872ff4ebaf167a5709f6985ff2ae23c8aab1f0955a85675 -size 1004693 +oid sha256:0827685ed734a6145843896deddeb2101ed246cd6326a4b997e77fcb20f2963d +size 1004916 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_mask.png index a7df10ae..9cccda45 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:252e80ea014eca3ed7c38b7122e1df931610cdafbe80a447e99eb8045ae79074 -size 989266 +oid sha256:2abd59f597568a98d19f77209f9f8931671a2d1e74f4918c801da8945d720972 +size 989286 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_mountain_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_mountain_mask.png index b42ec2f4..54d812f5 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_mountain_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_mountain_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:508b786c5b1710e86c39a32a965ff8aac37fdc5ab2fc34f5177a5bd5cf538840 -size 592230 +oid sha256:6492a964f1904c01540715fa7d5495eb840d5ad678d9566b5f62061f6aab1118 +size 592372 diff --git a/gfx/map/terrain/masks_gen/gen_tropical_hills_mask.png b/gfx/map/terrain/masks_gen/gen_tropical_hills_mask.png index 194b474e..9286a85e 100644 --- a/gfx/map/terrain/masks_gen/gen_tropical_hills_mask.png +++ b/gfx/map/terrain/masks_gen/gen_tropical_hills_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c947a2ede5944456401b6dbfd9d1ce979e674aad6bbf8e55aed5b1e45ac52c8e -size 2114431 +oid sha256:3b90a5a0f61cdca728ee73780530ed42de46f623eecce5906559e04e4cf33ae6 +size 2114472 diff --git a/history/characters/NEOW_e_hispania.txt b/history/characters/NEOW_e_hispania.txt index c739e21e..2c9da1cb 100644 --- a/history/characters/NEOW_e_hispania.txt +++ b/history/characters/NEOW_e_hispania.txt @@ -19,22 +19,10 @@ 2531.1.1 = { birth = yes } - 2550.5.17={add_spouse=ana_maria_baio} 2600.1.1 = { death = yes } } -ana_maria_baio={ # Doomed Yuri - name="Ana_spc_Maria" - dynasty=baio_dynasty - religion="iberian" - culture=brazilian - sexuality=homosexual - female=yes - 2530.2.22={birth=yes} - 2550.5.17={add_spouse=hispania0001} - 2554.9.15={death=yes} -} hispania0002 = { name = "Alfonso" #The ruler of Castille and rightful heir to the Spanish throne. diff --git a/localization/english/replace/culture/cultures_l_english.yml b/localization/english/replace/culture/cultures_l_english.yml index 1404feee..52a6bc5b 100644 --- a/localization/english/replace/culture/cultures_l_english.yml +++ b/localization/english/replace/culture/cultures_l_english.yml @@ -125,9 +125,9 @@ celtic_group_collective_noun:0 "Celts" goidelic_group:0 "Goidelic" goidelic_group_collective_noun:0 "Goidels" - irish:0 "Hibernian" - irish_prefix:0 "Hibernian" - irish_collective_noun:0 "Hibernian" + irish:0 "Éireannach Bhocht" + irish_prefix:0 "Low Irish" + irish_collective_noun:0 "Low Irish" gaelic:0 "Albannach" gaelic_prefix:0 "Gaelo" gaelic_collective_noun:0 "Gaels" diff --git a/localization/english/replace/culture/traditions/cultural_languages_l_english.yml b/localization/english/replace/culture/traditions/cultural_languages_l_english.yml index 9177fe8e..4cd6cdd2 100644 --- a/localization/english/replace/culture/traditions/cultural_languages_l_english.yml +++ b/localization/english/replace/culture/traditions/cultural_languages_l_english.yml @@ -81,7 +81,6 @@ language_albanian_name: "Albanian" language_arbereshe_name: "Arbëreshë" language_hebrew_name: "Hebrew" - language_punjabi_name:0 "Punjabi" aesthetics_norwegian_name:0 "Norwegian" aesthetics_swedish_name:0 "Swedish" diff --git a/localization/english/replace/culture/traditions/zz_NEOW_cultural_heritages_l_english.yml b/localization/english/replace/culture/traditions/zz_NEOW_cultural_heritages_l_english.yml index 4797089e..7682c017 100644 --- a/localization/english/replace/culture/traditions/zz_NEOW_cultural_heritages_l_english.yml +++ b/localization/english/replace/culture/traditions/zz_NEOW_cultural_heritages_l_english.yml @@ -3,8 +3,6 @@ heritage_anglo_american_collective_noun:0 "American" heritage_anglo_frisian_name:0 "Anglo-Saxon" heritage_anglo_frisian_collective_noun:0 "Anglo-Saxon" - heritage_brazilian_name:0 "Brazilian" - heritage_brazilian_collective_noun:0 "Brazilians" heritage_french_name:0 "French" heritage_french_collective_noun:0 "French" heritage_cisalpine_name:0 "Gallo-Italian" @@ -13,8 +11,6 @@ heritage_greek_collective_noun:0 "Greek" heritage_hispanic_name:0 "Hispanic" heritage_hispanic_collective_noun:0 "Hispanics" - heritage_indo_aryan_name:0 "Indo-Aryan" - heritage_indo_aryan_collective_noun:0 "Indo-Aryans" heritage_italian_name:0 "Italian" heritage_italian_collective_noun:0 "Italian" heritage_lusotanian_name:0 "Lusitanian" 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 9e4f68f5..6952bf88 100644 --- a/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml +++ b/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml @@ -1,12 +1,4 @@ l_english: - #Brazilian - brazilian:0 "Brasileiro" - brazilian_collective_noun:0 "Brasileiros" - brazilian_prefix:0 "Brasilo" - #Pwnjaby - pwnjaby:0 "Pwnjaby" - pwnjaby_collective_noun:0 "Pwnjabys" - pwnjaby_prefix:0 "Pwnjabo" #french metropolitain:0 "Metropolitain" metropolitain_collective_noun:0 "Metropolitains" @@ -105,12 +97,9 @@ atlantannach:0 "Atlantannach" atlantannach_collective_noun:0 "Atlantannach" atlantannach_prefix:0 "Atlantannach" - high_irish:0 "Éireannach" - high_irish_collective_noun:0 "Gaelic Irish" - high_irish_prefix:0 "Gaelic Irish" - traveller:0 "Traveller" - traveller_collective_noun:0 "Travellers" - traveller_prefix:0 "Traveller" + high_irish:0 "Éireannach Uasal" + high_irish_collective_noun:0 "High Irish" + high_irish_prefix:0 "High Irish" norner:0 "Norner" norner_collective_noun:0 "Norners" norner_prefix:0 "Norno" @@ -354,6 +343,4 @@ ladin:0 "Ladin" ladin_collective_noun:0 "Ladins" - ladin_prefix:0 "Ladino" - - \ No newline at end of file + ladin_prefix:0 "Ladino" \ No newline at end of file diff --git a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml index 9da2f343..2dca895a 100644 --- a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml @@ -2050,5 +2050,4 @@ dynn_Schonfield:0 "Schonfield" dynn_Plata:0 "Plata" dynn_Calder_o_act_n:0 "Calderón" - dynn_Baio:0 "Baio" \ No newline at end of file diff --git a/localization/english/replace/names/NEOW_character_names_l_english.yml b/localization/english/replace/names/NEOW_character_names_l_english.yml index 2a15a6b2..80484bdf 100644 --- a/localization/english/replace/names/NEOW_character_names_l_english.yml +++ b/localization/english/replace/names/NEOW_character_names_l_english.yml @@ -6788,5 +6788,4 @@ Alda:0 "Alda" Devorah:0 "Devorah" Djibril:0 "Djibril" - Ana_spc_Maria:0 "Ana Maria" Plata:0 "Plata" diff --git a/map_data/heightmap.png b/map_data/heightmap.png index e5cd6e3f..8adf7c13 100644 --- a/map_data/heightmap.png +++ b/map_data/heightmap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ade593c5cb9886d38a0123591392121cfaa1f6238c35cc9eb1669d15b423e29 -size 122561891 +oid sha256:04c9be95bfedcd290b152b5d8435b58dbc0f1fa8c6b729b92600917c77ee013c +size 122561971 diff --git a/map_data/nodes.dat b/map_data/nodes.dat index 8c59606d..db2beef1 100644 Binary files a/map_data/nodes.dat and b/map_data/nodes.dat differ diff --git a/map_data/packed_heightmap.png b/map_data/packed_heightmap.png index 597a3c8c..69dc16c3 100644 --- a/map_data/packed_heightmap.png +++ b/map_data/packed_heightmap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bfae8010542981b99937a33a9dd7a9f135f405df99317b11d22b69dd3bed6b2 -size 16504689 +oid sha256:3c3bbe88e40b1dba380ce73ca4202759eb6e26b6052a42dc7d47662e2f570054 +size 16504706 diff --git a/map_data/provinces.png b/map_data/provinces.png index 4f750d68..4278d995 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:217459d270ecee8dbd3c1351a44469edee310ea6f62054065b8ffe7a9d2e0c58 -size 3437843 +oid sha256:6d9d13283f31e64d34d4f74790f92d3b97a14776baf5a2ab54c572250bec63e1 +size 2394507