diff --git a/common/culture/cultures/NEOW_south_slavic.txt b/common/culture/cultures/NEOW_south_slavic.txt index dac806d8..336b80eb 100644 --- a/common/culture/cultures/NEOW_south_slavic.txt +++ b/common/culture/cultures/NEOW_south_slavic.txt @@ -128,7 +128,7 @@ NEOW_slovene = { NEOW_croatian = { color = { 16 53 165 } - ethos = ethos_ceremonious + ethos = ethos_courtly heritage = heritage_south_slavic language = NEOW_language_west_south_slavic #More or less a west slavic group who ended up adopting south slavic languages after the Avars cut off the slavs in the Pannonian basin martial_custom = martial_custom_equal @@ -230,7 +230,7 @@ NEOW_bulgarian = { traditions = { tradition_family_entrepreneurship - tradition_quarrelsome + tradition_by_the_sword tradition_stand_and_fight tradition_zealous_people } diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index 597d6723..e74dd801 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -470,7 +470,7 @@ default_coastal_sea=coastal_sea 467=hills 468=hills 469=mountains -470=plains +470=farmlands 471=mountains 472=hills 473=plains @@ -3210,8 +3210,8 @@ default_coastal_sea=coastal_sea 3576=plains 3577=mountains 3578=plains -3579=mountains -3580=plains +3579=hills +3580=mountains 3581=mountains 3582=mountains 3583=mountains @@ -3224,11 +3224,11 @@ default_coastal_sea=coastal_sea 3590=mountains 3591=mountains 3592=mountains -3593=mountains -3594=mountains +3593=hills +3594=hills 3595=hills -3596=hills -3597=hills +3596=farmlands +3597=plains 3598=hills 3599=mountains 3600=mountains @@ -3264,9 +3264,9 @@ default_coastal_sea=coastal_sea 3636=mountains 3637=mountains 3638=hills -3639=mountains +3639=hills 3640=hills -3641=mountains +3641=hills 3642=hills 3643=hills 3644=hills @@ -3284,8 +3284,8 @@ default_coastal_sea=coastal_sea 3656=mountains 3657=hills 3658=hills -3659=hills -3660=hills +3659=forest +3660=forest 3661=hills 3662=mountains 3663=mountains @@ -3336,18 +3336,18 @@ default_coastal_sea=coastal_sea 3708=mountains 3709=hills 3710=plains -3711=mountains +3711=hills 3712=mountains -3713=hills -3714=mountains -3715=mountains +3713=plains +3714=hills +3715=hills 3716=mountains 3717=plains 3718=mountains 3719=plains -3720=mountains +3720=hills 3721=mountains -3722=mountains +3722=hills 3723=mountains 3724=mountains 3725=hills diff --git a/common/religion/religions/NEOW_cosmist.txt b/common/religion/religions/NEOW_cosmist.txt index 8554a874..4bd15c53 100644 --- a/common/religion/religions/NEOW_cosmist.txt +++ b/common/religion/religions/NEOW_cosmist.txt @@ -267,6 +267,33 @@ holy_order_names = { #placeholder } + } + zimiran = { + color = { 20 33 102 } + icon = zimiran + + # religious_head = k_papal_state + + graphical_faith = "catholic_gfx" + #placeholder holy sites + holy_site = perth + holy_site = edinburgh + holy_site = london + holy_site = standrews + holy_site = belfast + holy_site = leath + #holy_site = segrada_familia + + #Special Tolerance | placeholder + + #Tenets | placeholder + doctrine = tenet_divine_progress + doctrine = tenet_astrology + doctrine = tenet_islamic_syncretism + + holy_order_names = { #placeholder + } + } cosmonaut = { color = { 204 51 20 } diff --git a/common/scripted_triggers/00_clothing_triggers.txt b/common/scripted_triggers/00_clothing_triggers.txt index f4d225ed..a23a6e9b 100644 --- a/common/scripted_triggers/00_clothing_triggers.txt +++ b/common/scripted_triggers/00_clothing_triggers.txt @@ -3168,7 +3168,6 @@ portrait_religious_african_trigger = { ### DDE HRE ### portrait_reichskrone_trigger = { - exists = this OR = { has_primary_title = title:e_european_union } diff --git a/gfx/interface/icons/faith/zimiran.dds b/gfx/interface/icons/faith/zimiran.dds new file mode 100644 index 00000000..0530525c --- /dev/null +++ b/gfx/interface/icons/faith/zimiran.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a69c84195437292b4b8b7b8ee749c4c33b86a09c903985d3178cc5197ed2d5f +size 40128 diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index f9bacef8..efd0cf1c 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -2797,7 +2797,7 @@ } { id=470 - position={ 2084.116943 0.000000 2455.870117 } + position={ 2088.680420 0.000000 2475.354736 } rotation={ -0.000000 -0.283679 -0.000000 0.958919 } scale={ 1.000000 1.000000 1.000000 } } @@ -2809,7 +2809,7 @@ } { id=472 - position={ 2120.412842 0.000000 2348.727051 } + position={ 2105.454346 0.000000 2360.354492 } rotation={ -0.000000 -0.411754 -0.000000 0.911295 } scale={ 1.000000 1.000000 1.000000 } } @@ -18049,7 +18049,7 @@ } { id=3520 - position={ 2118.716064 0.000000 2433.602539 } + position={ 2126.227783 0.000000 2424.489014 } rotation={ -0.000000 -0.627172 -0.000000 0.778880 } scale={ 1.000000 1.000000 1.000000 } } @@ -18409,7 +18409,7 @@ } { id=3580 - position={ 2073.351807 0.000000 2527.755859 } + position={ 2081.462402 0.000000 2537.286865 } rotation={ -0.000000 -0.536139 -0.000000 0.844130 } scale={ 1.000000 1.000000 1.000000 } } @@ -18493,7 +18493,7 @@ } { id=3594 - position={ 2127.375732 0.000000 2583.038086 } + position={ 2122.948486 0.000000 2599.665771 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -18757,7 +18757,7 @@ } { id=3639 - position={ 2148.797119 0.000000 2428.395264 } + position={ 2140.007080 0.000000 2428.504395 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -18769,7 +18769,7 @@ } { id=3641 - position={ 2143.000000 0.000000 2405.000000 } + position={ 2139.422852 0.000000 2410.614746 } rotation={ -0.000000 -0.287919 -0.000000 0.957655 } scale={ 1.000000 1.000000 1.000000 } } @@ -19165,7 +19165,7 @@ } { id=3707 - position={ 2130.356445 0.000000 2363.965576 } + position={ 2126.632080 0.000000 2367.811035 } rotation={ -0.000000 0.466060 -0.000000 0.884753 } scale={ 1.000000 1.000000 1.000000 } } @@ -19195,13 +19195,13 @@ } { id=3712 - position={ 2104.194824 0.000000 2361.505859 } + position={ 2090.201660 0.000000 2382.521484 } rotation={ -0.000000 -0.509240 -0.000000 0.860624 } scale={ 1.000000 1.000000 1.000000 } } { id=3713 - position={ 2104.923096 0.000000 2422.773193 } + position={ 2105.136230 0.000000 2441.332275 } rotation={ -0.000000 -0.352460 -0.000000 0.935827 } scale={ 1.000000 1.000000 1.000000 } } @@ -19225,13 +19225,13 @@ } { id=3717 - position={ 2069.693848 0.000000 2419.884766 } + position={ 2070.100586 0.000000 2420.774658 } rotation={ -0.000000 0.297957 -0.000000 0.954579 } scale={ 1.000000 1.000000 1.000000 } } { id=3718 - position={ 2102.176758 0.000000 2502.197266 } + position={ 2110.880859 0.000000 2501.515381 } rotation={ -0.000000 -0.491458 -0.000000 0.870901 } scale={ 1.000000 1.000000 1.000000 } } @@ -19243,7 +19243,7 @@ } { id=3720 - position={ 2098.024658 0.000000 2466.126465 } + position={ 2104.462891 0.000000 2456.694092 } rotation={ -0.000000 -0.717050 -0.000000 0.697022 } scale={ 1.000000 1.000000 1.000000 } } @@ -19267,7 +19267,7 @@ } { id=3724 - position={ 2138.617920 0.000000 2478.115723 } + position={ 2141.036621 0.000000 2464.320068 } rotation={ -0.000000 -0.306306 -0.000000 0.951933 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt index 6e4eb3f9..b84a5eb2 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -2797,8 +2797,8 @@ } { id=470 - position={ 2076.077637 0.000000 2453.085449 } - rotation={ -0.000000 -0.812819 -0.000000 0.582516 } + position={ 2067.951172 0.000000 2470.017822 } + rotation={ -0.000000 -0.704861 -0.000000 0.709345 } scale={ 1.000000 1.000000 1.000000 } } { @@ -2809,7 +2809,7 @@ } { id=472 - position={ 2120.968262 0.000000 2349.530273 } + position={ 2110.762451 0.000000 2352.164551 } rotation={ -0.000000 -0.264505 -0.000000 0.964384 } scale={ 1.000000 1.000000 1.000000 } } @@ -18049,8 +18049,8 @@ } { id=3520 - position={ 2118.077637 0.000000 2441.085449 } - rotation={ -0.000000 -0.623404 -0.000000 -0.781900 } + position={ 2124.408936 0.000000 2439.701416 } + rotation={ -0.000000 -0.988753 -0.000000 -0.149555 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18409,7 +18409,7 @@ } { id=3580 - position={ 2068.105957 0.000000 2524.309570 } + position={ 2063.498291 0.000000 2528.310303 } rotation={ -0.000000 -0.884900 -0.000000 0.465780 } scale={ 1.000000 1.000000 1.000000 } } @@ -18493,26 +18493,26 @@ } { id=3594 - position={ 2127.077637 0.000000 2576.085449 } - rotation={ -0.000000 -0.568495 -0.000000 -0.822687 } + position={ 2131.225342 0.000000 2593.974121 } + rotation={ -0.000000 0.100325 -0.000000 -0.994955 } scale={ 1.000000 1.000000 1.000000 } } { id=3595 - position={ 2115.077637 0.000000 2540.085449 } - rotation={ -0.000000 -0.086271 -0.000000 0.996272 } + position={ 2113.010498 0.000000 2552.673096 } + rotation={ -0.000000 -0.990293 -0.000000 -0.139001 } scale={ 1.000000 1.000000 1.000000 } } { id=3596 - position={ 2140.077637 0.000000 2561.085449 } - rotation={ -0.000000 -0.699354 -0.000000 0.714776 } + position={ 2146.579102 0.000000 2568.555908 } + rotation={ -0.000000 -0.942008 -0.000000 0.335591 } scale={ 1.000000 1.000000 1.000000 } } { id=3597 - position={ 2142.077637 0.000000 2542.085449 } - rotation={ -0.000000 -0.990392 -0.000000 0.138291 } + position={ 2130.075439 0.000000 2543.811523 } + rotation={ -0.000000 -0.352230 -0.000000 -0.935914 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18757,8 +18757,8 @@ } { id=3639 - position={ 2158.077637 0.000000 2424.085449 } - rotation={ -0.000000 -0.376998 -0.000000 0.926214 } + position={ 2141.541260 0.000000 2433.493164 } + rotation={ -0.000000 -0.011309 -0.000000 0.999936 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18769,8 +18769,8 @@ } { id=3641 - position={ 2146.077637 0.000000 2399.085449 } - rotation={ -0.000000 -0.086441 -0.000000 -0.996257 } + position={ 2151.416504 0.000000 2411.871582 } + rotation={ -0.000000 0.327578 -0.000000 -0.944824 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18787,8 +18787,8 @@ } { id=3644 - position={ 2155.077637 0.000000 2509.085449 } - rotation={ -0.000000 -0.957858 -0.000000 0.287243 } + position={ 2157.627930 0.000000 2518.112793 } + rotation={ -0.000000 -0.499694 -0.000000 -0.866202 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19159,13 +19159,13 @@ } { id=3706 - position={ 2150.077637 0.000000 2379.085449 } - rotation={ -0.000000 -0.398820 -0.000000 -0.917029 } + position={ 2141.373779 0.000000 2373.116211 } + rotation={ -0.000000 -0.784922 -0.000000 -0.619595 } scale={ 1.000000 1.000000 1.000000 } } { id=3707 - position={ 2137.077637 0.000000 2360.085449 } + position={ 2131.569580 0.000000 2361.494385 } rotation={ -0.000000 -0.170700 -0.000000 -0.985323 } scale={ 1.000000 1.000000 1.000000 } } @@ -19195,13 +19195,13 @@ } { id=3712 - position={ 2089.077637 0.000000 2379.085449 } - rotation={ -0.000000 -0.732051 -0.000000 -0.681250 } + position={ 2089.344727 0.000000 2374.308838 } + rotation={ -0.000000 -0.871297 -0.000000 -0.490756 } scale={ 1.000000 1.000000 1.000000 } } { id=3713 - position={ 2094.077637 0.000000 2417.085449 } + position={ 2099.538330 0.000000 2423.596191 } rotation={ -0.000000 -0.988046 -0.000000 0.154162 } scale={ 1.000000 1.000000 1.000000 } } @@ -19213,8 +19213,8 @@ } { id=3715 - position={ 2106.437988 0.000000 2403.602051 } - rotation={ -0.000000 -0.086193 -0.000000 -0.996278 } + position={ 2110.320557 0.000000 2379.994629 } + rotation={ -0.000000 -0.617063 -0.000000 -0.786913 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19225,38 +19225,38 @@ } { id=3717 - position={ 2078.077637 0.000000 2420.085449 } - rotation={ -0.000000 -0.496800 -0.000000 0.867865 } + position={ 2078.569092 0.000000 2411.067383 } + rotation={ -0.000000 -0.121293 -0.000000 0.992617 } scale={ 1.000000 1.000000 1.000000 } } { id=3718 - position={ 2106.077637 0.000000 2486.085449 } + position={ 2111.750000 0.000000 2495.101807 } rotation={ -0.000000 -0.444321 -0.000000 0.895867 } scale={ 1.000000 1.000000 1.000000 } } { id=3719 - position={ 2081.077637 0.000000 2499.085449 } + position={ 2072.832520 0.000000 2504.018311 } rotation={ -0.000000 -0.094600 -0.000000 -0.995515 } scale={ 1.000000 1.000000 1.000000 } } { id=3720 - position={ 2089.077637 0.000000 2471.085449 } - rotation={ -0.000000 -0.907264 -0.000000 0.420561 } + position={ 2087.569336 0.000000 2459.843018 } + rotation={ -0.000000 -0.672463 -0.000000 0.740130 } scale={ 1.000000 1.000000 1.000000 } } { id=3721 - position={ 2128.077637 0.000000 2459.085449 } - rotation={ -0.000000 -0.327822 -0.000000 0.944739 } + position={ 2132.734863 0.000000 2455.208984 } + rotation={ -0.000000 -0.992822 -0.000000 0.119599 } scale={ 1.000000 1.000000 1.000000 } } { id=3722 - position={ 2133.077637 0.000000 2526.085449 } - rotation={ -0.000000 -0.939921 -0.000000 -0.341392 } + position={ 2118.302734 0.000000 2530.435059 } + rotation={ -0.000000 -0.687413 -0.000000 -0.726267 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19267,7 +19267,7 @@ } { id=3724 - position={ 2132.077637 0.000000 2483.085449 } + position={ 2130.373535 0.000000 2485.436279 } rotation={ -0.000000 -0.382534 -0.000000 0.923942 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt index 79e8ea09..66a2d295 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -2815,8 +2815,8 @@ } { id=470 - position={ 2072.076416 0.000000 2469.316162 } - rotation={ -0.000000 0.246073 -0.000000 0.969251 } + position={ 2078.049072 0.000000 2459.207275 } + rotation={ -0.000000 0.619296 -0.000000 0.785157 } scale={ 1.000000 1.000000 1.000000 } } { @@ -2827,8 +2827,8 @@ } { id=472 - position={ 2126.520996 0.000000 2350.872070 } - rotation={ -0.000000 -0.562333 -0.000000 0.826911 } + position={ 2119.081299 0.000000 2344.077881 } + rotation={ -0.000000 -0.102183 -0.000000 0.994766 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19933,8 +19933,8 @@ } { id=3520 - position={ 2101.000000 0.000000 2445.000000 } - rotation={ -0.000000 -0.968215 -0.000000 0.250119 } + position={ 2115.654053 0.000000 2442.397461 } + rotation={ -0.000000 -0.851958 -0.000000 0.523609 } scale={ 1.000000 1.000000 1.000000 } } { @@ -20287,7 +20287,7 @@ } { id=3579 - position={ 2107.801514 0.000000 2522.107910 } + position={ 2101.309082 0.000000 2514.780029 } rotation={ -0.000000 0.353060 -0.000000 0.935601 } scale={ 1.000000 1.000000 1.000000 } } @@ -20377,14 +20377,14 @@ } { id=3594 - position={ 2127.000000 0.000000 2592.000000 } - rotation={ -0.000000 -0.946473 -0.000000 0.322783 } + position={ 2129.757324 0.000000 2586.722656 } + rotation={ -0.000000 -0.973120 -0.000000 0.230300 } scale={ 1.000000 1.000000 1.000000 } } { id=3595 - position={ 2109.000000 0.000000 2560.000000 } - rotation={ -0.000000 -0.911855 -0.000000 0.410513 } + position={ 2113.795898 0.000000 2570.800293 } + rotation={ -0.000000 -0.996594 -0.000000 0.082469 } scale={ 1.000000 1.000000 1.000000 } } { @@ -20641,8 +20641,8 @@ } { id=3639 - position={ 2140.000000 0.000000 2430.000000 } - rotation={ -0.000000 -0.632384 -0.000000 0.774655 } + position={ 2138.587158 0.000000 2430.435059 } + rotation={ -0.000000 -0.445658 -0.000000 0.895203 } scale={ 1.000000 1.000000 1.000000 } } { @@ -20653,8 +20653,8 @@ } { id=3641 - position={ 2138.587646 0.000000 2417.870605 } - rotation={ -0.000000 -0.983468 -0.000000 0.181081 } + position={ 2144.484131 0.000000 2416.304443 } + rotation={ -0.000000 -0.999840 -0.000000 0.017900 } scale={ 1.000000 1.000000 1.000000 } } { @@ -20671,7 +20671,7 @@ } { id=3644 - position={ 2165.850830 0.000000 2517.764160 } + position={ 2165.503174 0.000000 2520.900635 } rotation={ -0.000000 -0.864961 -0.000000 0.501839 } scale={ 1.000000 1.000000 1.000000 } } @@ -20761,8 +20761,8 @@ } { id=3659 - position={ 2157.758545 0.000000 2569.776367 } - rotation={ -0.000000 -0.732256 -0.000000 0.681030 } + position={ 2177.472168 0.000000 2566.547852 } + rotation={ -0.000000 -0.097231 -0.000000 0.995262 } scale={ 1.000000 1.000000 1.000000 } } { @@ -21043,13 +21043,13 @@ } { id=3706 - position={ 2139.000000 0.000000 2381.000000 } - rotation={ -0.000000 -0.751274 -0.000000 0.659990 } + position={ 2140.762207 0.000000 2382.455322 } + rotation={ -0.000000 -0.889564 -0.000000 0.456811 } scale={ 1.000000 1.000000 1.000000 } } { id=3707 - position={ 2152.789795 0.000000 2367.273682 } + position={ 2127.668457 0.000000 2364.554688 } rotation={ -0.000000 -0.991744 -0.000000 0.128234 } scale={ 1.000000 1.000000 1.000000 } } @@ -21079,14 +21079,14 @@ } { id=3712 - position={ 2104.445801 0.000000 2367.479492 } - rotation={ -0.000000 -0.405793 -0.000000 0.913965 } + position={ 2086.615479 0.000000 2379.262939 } + rotation={ -0.000000 -0.843345 -0.000000 0.537372 } scale={ 1.000000 1.000000 1.000000 } } { id=3713 - position={ 2107.347412 0.000000 2426.393066 } - rotation={ -0.000000 -0.438495 -0.000000 0.898734 } + position={ 2103.906006 0.000000 2433.566406 } + rotation={ -0.000000 0.200381 -0.000000 0.979718 } scale={ 1.000000 1.000000 1.000000 } } { @@ -21097,8 +21097,8 @@ } { id=3715 - position={ 2094.518555 -0.859863 2406.506836 } - rotation={ -0.000000 -0.976635 -0.000000 0.214904 } + position={ 2103.751709 -0.859863 2394.398682 } + rotation={ -0.000000 -0.999386 -0.000000 0.035037 } scale={ 1.000000 1.000000 1.000000 } } { @@ -21109,38 +21109,44 @@ } { id=3717 - position={ 2074.841309 0.000000 2437.013672 } - rotation={ -0.000000 -0.944085 -0.000000 0.329701 } + position={ 2083.614258 0.000000 2422.388916 } + rotation={ -0.000000 -0.997257 -0.000000 0.074017 } scale={ 1.000000 1.000000 1.000000 } } { id=3718 - position={ 2109.000000 0.000000 2503.000000 } - rotation={ -0.000000 -0.509436 -0.000000 0.860508 } + position={ 2103.580566 0.000000 2503.226318 } + rotation={ -0.000000 0.099461 -0.000000 0.995041 } scale={ 1.000000 1.000000 1.000000 } } { id=3719 - position={ 2089.941650 0.000000 2496.720215 } - rotation={ -0.000000 0.509818 -0.000000 0.860282 } + position={ 2070.213867 0.000000 2507.007080 } + rotation={ -0.000000 -0.045791 -0.000000 0.998951 } scale={ 1.000000 1.000000 1.000000 } } { id=3720 - position={ 2086.000000 0.000000 2485.000000 } - rotation={ -0.000000 -0.959698 -0.000000 0.281032 } + position={ 2079.371582 0.000000 2435.915771 } + rotation={ -0.000000 -0.993865 -0.000000 0.110601 } scale={ 1.000000 1.000000 1.000000 } } { id=3721 - position={ 2109.294434 0.000000 2459.150391 } + position={ 2117.369141 0.000000 2473.826172 } rotation={ -0.000000 -0.969319 -0.000000 0.245807 } scale={ 1.000000 1.000000 1.000000 } } + { + id=0 + position={ 2105.088623 0.000000 2534.008789 } + rotation={ -0.000000 -0.230068 -0.000000 0.973175 } + scale={ 1.000000 1.000000 1.000000 } + } { id=3722 - position={ 2134.500488 0.000000 2531.218262 } - rotation={ -0.000000 0.110158 -0.000000 0.993914 } + position={ 2105.088623 0.000000 2534.008789 } + rotation={ -0.000000 -0.230068 -0.000000 0.973175 } scale={ 1.000000 1.000000 1.000000 } } { @@ -21151,8 +21157,8 @@ } { id=3724 - position={ 2128.209961 0.000000 2490.979004 } - rotation={ -0.000000 0.303806 -0.000000 0.952734 } + position={ 2144.519531 0.000000 2470.171143 } + rotation={ -0.000000 0.095800 -0.000000 0.995401 } scale={ 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 e751f13a..4bddbf5f 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -2813,9 +2813,15 @@ rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } + { + id=0 + position={ 2075.469238 0.000000 2476.612793 } + rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + scale={ 1.000000 1.000000 1.000000 } + } { id=470 - position={ 2078.000000 0.000000 2461.000000 } + position={ 2075.469238 0.000000 2476.612793 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -2827,7 +2833,7 @@ } { id=472 - position={ 2115.587891 0.000000 2353.267822 } + position={ 2118.562012 0.000000 2354.075439 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -19933,7 +19939,7 @@ } { id=3520 - position={ 2119.000000 0.000000 2447.000000 } + position={ 2122.086670 0.000000 2428.351074 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -20377,19 +20383,19 @@ } { id=3594 - position={ 2131.774170 0.000000 2582.921631 } + position={ 2130.781494 0.000000 2577.222900 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3595 - position={ 2117.000000 0.000000 2546.000000 } + position={ 2108.972900 0.000000 2560.733154 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3596 - position={ 2147.000000 0.000000 2565.000000 } + position={ 2156.808105 0.000000 2562.656494 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -20641,7 +20647,7 @@ } { id=3639 - position={ 2163.452148 0.000000 2423.541260 } + position={ 2149.646973 0.000000 2435.265625 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -20653,7 +20659,7 @@ } { id=3641 - position={ 2149.000000 0.000000 2407.000000 } + position={ 2141.523438 0.000000 2397.802490 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -20671,7 +20677,7 @@ } { id=3644 - position={ 2156.395508 0.000000 2516.229004 } + position={ 2159.157959 0.000000 2524.266846 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -21043,13 +21049,13 @@ } { id=3706 - position={ 2155.000000 0.000000 2383.000000 } + position={ 2147.820801 0.000000 2375.479248 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3707 - position={ 2139.312988 0.000000 2365.954102 } + position={ 2137.783447 0.000000 2362.749512 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -21079,13 +21085,13 @@ } { id=3712 - position={ 2095.630371 0.000000 2377.095459 } + position={ 2093.762939 0.000000 2377.031494 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=3713 - position={ 2098.000000 0.000000 2425.000000 } + position={ 2108.142334 0.000000 2417.986084 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -21097,7 +21103,7 @@ } { id=3715 - position={ 2108.977295 0.000000 2401.884277 } + position={ 2117.945801 0.000000 2375.869141 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -21109,25 +21115,25 @@ } { id=3717 - position={ 2079.000000 0.000000 2428.000000 } + position={ 2086.562012 0.000000 2414.584717 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3718 - position={ 2107.000000 0.000000 2494.000000 } + position={ 2099.280518 0.000000 2498.208496 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3719 - position={ 2087.698975 0.000000 2502.245605 } + position={ 2081.234863 0.000000 2499.039551 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3720 - position={ 2090.000000 0.000000 2478.000000 } + position={ 2085.712158 0.000000 2447.362061 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -21139,7 +21145,7 @@ } { id=3722 - position={ 2138.531982 0.000000 2524.142334 } + position={ 2114.959473 0.000000 2539.014404 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -21151,7 +21157,7 @@ } { id=3724 - position={ 2137.376221 0.000000 2483.049316 } + position={ 2144.248047 0.000000 2474.526123 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } 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 0070a29b..e7dc2457 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -2797,8 +2797,8 @@ } { id=470 - position={ 2086.000000 0.000000 2450.000000 } - rotation={ 0.000000 0.802293 0.000000 -0.596931 } + position={ 2079.285889 0.000000 2471.886963 } + rotation={ -0.000000 0.625249 -0.000000 -0.780426 } scale={ 1.000000 1.000000 1.000000 } } { @@ -2809,8 +2809,8 @@ } { id=472 - position={ 2122.000000 0.000000 2343.000000 } - rotation={ 0.000000 0.794707 0.000000 -0.606994 } + position={ 2123.858643 0.000000 2350.581787 } + rotation={ -0.000000 0.733047 -0.000000 -0.680179 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18049,8 +18049,8 @@ } { id=3520 - position={ 2109.000000 0.000000 2438.000000 } - rotation={ 0.000000 0.811242 0.000000 0.584710 } + position={ 2127.832520 0.000000 2430.000244 } + rotation={ -0.000000 0.992437 -0.000000 -0.122756 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18410,7 +18410,7 @@ { id=3580 position={ 2069.000000 0.000000 2520.000000 } - rotation={ 0.000000 0.973249 0.000000 -0.229753 } + rotation={ -0.000000 0.955318 -0.000000 -0.295579 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18493,26 +18493,26 @@ } { id=3594 - position={ 2137.000000 0.000000 2578.000000 } - rotation={ -0.000000 -0.633989 -0.000000 0.773342 } + position={ 2134.365234 0.000000 2583.882812 } + rotation={ -0.000000 -0.984035 -0.000000 0.177973 } scale={ 1.000000 1.000000 1.000000 } } { id=3595 - position={ 2113.000000 0.000000 2530.000000 } - rotation={ 0.000000 0.995133 0.000000 0.098538 } + position={ 2115.491699 0.000000 2559.927979 } + rotation={ -0.000000 -0.151191 -0.000000 0.988504 } scale={ 1.000000 1.000000 1.000000 } } { id=3596 - position={ 2149.000000 0.000000 2560.000000 } - rotation={ 0.000000 0.745128 0.000000 -0.666921 } + position={ 2150.083008 0.000000 2559.071289 } + rotation={ -0.000000 0.962153 -0.000000 -0.272507 } scale={ 1.000000 1.000000 1.000000 } } { id=3597 - position={ 2132.000000 0.000000 2544.000000 } - rotation={ 0.000000 0.633989 0.000000 0.773342 } + position={ 2140.556152 0.000000 2546.409180 } + rotation={ -0.000000 -0.615388 -0.000000 0.788224 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18757,8 +18757,8 @@ } { id=3639 - position={ 2160.000000 0.000000 2413.000000 } - rotation={ 0.000000 0.995959 0.000000 -0.089806 } + position={ 2152.138916 0.000000 2427.562256 } + rotation={ -0.000000 0.893744 -0.000000 -0.448576 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18769,8 +18769,8 @@ } { id=3641 - position={ 2152.000000 0.000000 2392.000000 } - rotation={ 0.000000 0.937885 0.000000 -0.346946 } + position={ 2147.952393 0.000000 2402.099609 } + rotation={ -0.000000 0.997824 -0.000000 0.065927 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18787,8 +18787,8 @@ } { id=3644 - position={ 2146.000000 0.000000 2503.000000 } - rotation={ 0.000000 0.881675 0.000000 0.471858 } + position={ 2164.695801 0.000000 2528.157715 } + rotation={ -0.000000 -0.256596 -0.000000 0.966519 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19159,13 +19159,13 @@ } { id=3706 - position={ 2160.000000 0.000000 2380.000000 } - rotation={ -0.000000 -0.671005 -0.000000 0.741453 } + position={ 2146.290771 0.000000 2381.652100 } + rotation={ -0.000000 -0.240832 -0.000000 0.970567 } scale={ 1.000000 1.000000 1.000000 } } { id=3707 - position={ 2143.000000 0.000000 2352.000000 } + position={ 2137.491943 0.000000 2353.408936 } rotation={ 0.000000 0.948683 0.000000 -0.316228 } scale={ 1.000000 1.000000 1.000000 } } @@ -19195,13 +19195,13 @@ } { id=3712 - position={ 2094.000000 0.000000 2372.000000 } - rotation={ 0.000000 0.952295 0.000000 -0.305177 } + position={ 2096.986572 0.000000 2370.280762 } + rotation={ -0.000000 0.854278 -0.000000 -0.519816 } scale={ 1.000000 1.000000 1.000000 } } { id=3713 - position={ 2103.000000 0.000000 2420.000000 } + position={ 2108.460693 0.000000 2426.510742 } rotation={ -0.000000 -0.584710 -0.000000 0.811242 } scale={ 1.000000 1.000000 1.000000 } } @@ -19213,8 +19213,8 @@ } { id=3715 - position={ 2098.523438 0.000000 2391.479980 } - rotation={ -0.000000 0.960859 -0.000000 0.277038 } + position={ 2116.292480 0.000000 2370.563232 } + rotation={ -0.000000 0.955927 -0.000000 -0.293604 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19225,38 +19225,38 @@ } { id=3717 - position={ 2083.000000 0.000000 2410.000000 } - rotation={ 0.000000 0.973249 0.000000 -0.229753 } + position={ 2089.113770 0.000000 2407.400146 } + rotation={ -0.000000 0.807945 -0.000000 -0.589257 } scale={ 1.000000 1.000000 1.000000 } } { id=3718 - position={ 2097.000000 0.000000 2485.000000 } + position={ 2102.672363 0.000000 2494.016357 } rotation={ 0.000000 0.745128 0.000000 0.666921 } scale={ 1.000000 1.000000 1.000000 } } { id=3719 - position={ 2079.000000 0.000000 2490.000000 } - rotation={ 0.000000 0.994029 0.000000 0.109117 } + position={ 2078.200684 0.000000 2492.246338 } + rotation={ -0.000000 0.979782 -0.000000 -0.200067 } scale={ 1.000000 1.000000 1.000000 } } { id=3720 - position={ 2088.000000 0.000000 2460.000000 } - rotation={ 0.000000 0.998973 0.000000 0.045314 } + position={ 2093.430908 0.000000 2450.912354 } + rotation={ -0.000000 0.938039 -0.000000 -0.346532 } scale={ 1.000000 1.000000 1.000000 } } { id=3721 - position={ 2129.000000 0.000000 2449.000000 } - rotation={ 0.000000 0.998758 0.000000 -0.049814 } + position={ 2123.664551 0.000000 2462.433594 } + rotation={ -0.000000 0.482685 -0.000000 0.875794 } scale={ 1.000000 1.000000 1.000000 } } { id=3722 - position={ 2123.000000 0.000000 2522.000000 } - rotation={ 0.000000 0.828067 0.000000 0.560629 } + position={ 2109.019043 0.000000 2536.319824 } + rotation={ -0.000000 0.489201 -0.000000 0.872171 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19267,7 +19267,7 @@ } { id=3724 - position={ 2138.000000 0.000000 2474.000000 } + position={ 2136.295898 0.000000 2476.350830 } rotation={ 0.000000 0.957092 0.000000 -0.289784 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/history/provinces/e_germany.txt b/history/provinces/e_germany.txt index 35be15e3..69ad716a 100644 --- a/history/provinces/e_germany.txt +++ b/history/provinces/e_germany.txt @@ -835,7 +835,7 @@ ##d_carinthia ###c_klagenfurt 3105 = { - culture = austrian + culture = NEOW_carantanian religion = roman_catholic holding = tribal_holding } @@ -850,7 +850,7 @@ } ###c_villach 3099 = { - culture = austrian + culture = NEOW_carantanian religion = roman_catholic holding = tribal_holding } 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 d218bcf4..daa661db 100644 --- a/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml +++ b/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml @@ -330,8 +330,8 @@ NEOW_bosnian_collective_noun:0 "Bosnians" NEOW_bosnian_prefix:0 "Bosansko" #Bosnian - NEOW_albanian:0 "Shqip" - NEOW_albanian_collective_noun:0 "Shqip" + NEOW_albanian:0 "Shqiptar" + NEOW_albanian_collective_noun:0 "Albanians" NEOW_albanian_prefix:0 "Shqiptarët" NEOW_arvantika:0 "Arbërisht" NEOW_arvantika_collective_noun:0 "Arvanites" diff --git a/localization/english/replace/religion/zz_NEOW_religion_cosmist_l_english.yml b/localization/english/replace/religion/zz_NEOW_religion_cosmist_l_english.yml index 031315fe..029c131e 100644 --- a/localization/english/replace/religion/zz_NEOW_religion_cosmist_l_english.yml +++ b/localization/english/replace/religion/zz_NEOW_religion_cosmist_l_english.yml @@ -81,4 +81,10 @@ cosmonaut_adj:0 "Cosmonaut" cosmonaut_adherent:0 "Cosmonaut" cosmonaut_adherent_plural:0 "Cosmonauts" - cosmonaut_desc:0 "Cosmonauts believe the fire god Agni gifted the Fire of Heaven to the stars long before the beginning of time, from which would eventually emerge the fire which burns in the soul of every human. As humanity came from the stars, they believe it is also humanity's duty to return to them, and reclaim the holy flame in order to bolster their own divinity and conquer the heavens. Although returning to the stars carries quite a literal meaning to the Cosmonauts, a more metaphysical closeness to them is gained through rituals such as meditation and bodily purification. Asceticism is especially revered among the Cosmonauts, as the divine fire burning out of control is what caused humanity's initial fall, ending their holy reclamation of the cosmos." \ No newline at end of file + cosmonaut_desc:0 "Cosmonauts believe the fire god Agni gifted the Fire of Heaven to the stars long before the beginning of time, from which would eventually emerge the fire which burns in the soul of every human. As humanity came from the stars, they believe it is also humanity's duty to return to them, and reclaim the holy flame in order to bolster their own divinity and conquer the heavens. Although returning to the stars carries quite a literal meaning to the Cosmonauts, a more metaphysical closeness to them is gained through rituals such as meditation and bodily purification. Asceticism is especially revered among the Cosmonauts, as the divine fire burning out of control is what caused humanity's initial fall, ending their holy reclamation of the cosmos." + + zimiran:0 "Zimiran" + zimiran_adj:0 "Zimiran" + zimiran_adherent:0 "Zimiran" + zimiran_adherent_plural:0 "Zimiran" + zimiran_desc:0 "Along the sacred steppes and desert oases, the Zimiran faithful remember the days in which the men rode steel chariots to the stars. The world, however, now lies broken, with the secrets of the stars being long lost. As the almighty and merciful God decreed that his Messiah is to be the one to lead humanity back to the stars, the Zimiran faithful work to bring about the Day of Judgment by studying the mysteries of the stars. They hope that through wisdom and knowledge, they are brought closer to God. Only once one has achieved total awareness can they take the leap of faith to achieve cosmic oneness with the Almighty, and serve as companions to the next Prophet of this world." \ No newline at end of file