Merge pull request #573 from Cold-War-Project/state-fixing

State Fixing
Cold-War-Project · Aug 21, 2023 · 61044bc · 61044bc
2 parents df1f270 + defe392
commit 61044bc
Show file tree

Hide file tree

Showing 63 changed files with 342 additions and 286 deletions.
diff --git a/common/history/buildings/14_siberia.txt b/common/history/buildings/14_siberia.txt
@@ -269,6 +269,14 @@
 					"pm_advanced_mechanized_mills"
 				}
 			}
+			create_building = {
+				building = "building_port"
+				level = 1
+				reserves = 1
+				activate_production_methods = {
+					"pm_anchorage"
+				}
+			}
 		}
 	}
 	s:STATE_OB = {
@@ -284,6 +292,14 @@
 					"pm_government_run_building_railway"
 				}
 			}
+			create_building = {
+				building = "building_port"
+				level = 1
+				reserves = 1
+				activate_production_methods = {
+					"pm_anchorage"
+				}
+			}
 		}
 	}
 	s:STATE_NENETSIA = {
@@ -299,6 +315,14 @@
 					"pm_government_run_building_railway"
 				}
 			}
+			create_building = {
+				building = "building_port"
+				level = 1
+				reserves = 1
+				activate_production_methods = {
+					"pm_anchorage"
+				}
+			}
 		}
 	}
 	s:STATE_CHUKOTKA = {
@@ -360,6 +384,14 @@
 					"pm_government_run_building_railway"
 				}
 			}
+			create_building = {
+				building = "building_port"
+				level = 1
+				reserves = 1
+				activate_production_methods = {
+					"pm_anchorage"
+				}
+			}
 		}
 	}
 	s:STATE_TRANS_BAIKAL = {

diff --git a/common/history/states/00_states.txt b/common/history/states/00_states.txt
@@ -16489,24 +16489,20 @@
 			owned_provinces = {
 				x0021B0
 				x00B4D8
-				x03443A
 				x03A9D5
-				x067D66
 				x088648
 				x0B832C
 				x0E946E
 				x0F3CD6
 				x0F5F2B
 				x0FC5DF
 				x10DCC5
-				x1148FC
 				x1B710F
 				x1DCC94
 				x1FB9E5
 				x24FD6F
 				x257980
 				x2594A3
-				x2C6C50
 				x31CD31
 				x334783
 				x361EE6
@@ -16516,44 +16512,34 @@
 				x42596B
 				x454794
 				x466E2C
-				x4A6B07
-				x4D1F19
-				x4D49C2
-				x4D929D
 				x4DC624
 				x4DC9E5
 				x4F8725
 				x5A795B
 				x5E4391
 				x60C0F0
 				x651796
-				x727FD6
 				x73B395
 				x7EA30A
 				x7F122F
 				x841D25
 				x8706BD
 				x89DBD1
-				x8A3F78
 				x8CCFFD
 				x8D0A9E
 				x8E584E
-				x907EFD
 				x94589F
 				x9CDC33
-				xA04170
 				xA67B3F
 				xA6FC81
 				xABB36B
 				xACC25D
-				xAD31E7
 				xAFCC81
 				xB10505
 				xB63BAD
 				xB74540
 				xB7D892
 				xBBF9A0
-				xBD3AF3
 				xBF51C8
 				xC4AB87
 				xC61ADF
@@ -16572,12 +16558,9 @@
 				xDA6F61
 				xDC3EF4
 				xDE11F9
-				xEF7E14
 				xF0B1F6
-				xF30D3D
 				xF4DD1F
 				xF56551
-				xF610F7
 				xF6D2AB
 				xF72535
 				xF81AEB

diff --git a/common/journal_entries/CWP_korean_war.txt b/common/journal_entries/CWP_korean_war.txt
@@ -249,6 +249,7 @@
 				create_diplomatic_play = {
 					type = dp_korean_unification
 					target_country = scope:korean_war_target
+					escalation = 30
 					add_war_goal = {
 						holder = c:NRK
 						type = humiliation

diff --git a/common/terrain_manipulators/provinces/allowed_provinces.txt b/common/terrain_manipulators/provinces/allowed_provinces.txt
diff --git a/gfx/map/map_object_data/generated/asian_dynamic_farmland_objects_generator_1.txt b/gfx/map/map_object_data/generated/asian_dynamic_farmland_objects_generator_1.txt
@@ -5,7 +5,7 @@
 	generated_content=yes
 	layer="farms_dynamic"
 	pdxmesh="asian_province_farm_01_mesh"
-	count=1683
+	count=1681
 	transform="6591.586426 0.000000 1352.575195 0.000000 0.307907 0.000000 0.951416 1.000000 1.000000 1.000000
 6598.215332 0.000000 1348.078247 0.000000 0.146607 0.000000 0.989195 0.000000 0.000000 0.000000
 6606.953125 0.000000 1353.112305 0.000000 0.036045 0.000000 0.999350 0.000000 0.000000 0.000000
@@ -760,10 +760,8 @@
 6868.994629 0.000000 1923.021484 0.000000 0.470896 0.000000 0.882189 1.000000 1.000000 1.000000
 6914.356934 0.000000 1812.398193 0.000000 0.078952 0.000000 0.996878 0.000000 0.000000 0.000000
 6674.127930 0.000000 2046.713501 0.000000 0.231076 0.000000 0.972936 0.000000 0.000000 0.000000
-6692.045898 0.000000 2038.712402 0.000000 0.195963 0.000000 0.980611 1.000000 1.000000 1.000000
 6677.668945 0.000000 2043.226440 0.000000 0.249282 0.000000 0.968431 0.000000 0.000000 0.000000
 6674.190430 0.000000 2042.959717 0.000000 0.379955 0.000000 0.925005 1.000000 1.000000 1.000000
-6702.042969 0.000000 2039.292114 0.000000 0.531721 0.000000 0.846919 1.000000 1.000000 1.000000
 6679.836426 0.000000 2084.050293 0.000000 0.447541 0.000000 0.894263 1.000000 1.000000 1.000000
 6681.916992 0.000000 2078.203613 0.000000 0.386946 0.000000 0.922102 0.000000 0.000000 0.000000
 6684.380371 0.000000 2088.287842 0.000000 0.058332 0.000000 0.998297 1.000000 1.000000 1.000000
@@ -1697,7 +1695,7 @@ object={
 	generated_content=yes
 	layer="farms_dynamic"
 	pdxmesh="asian_province_farm_02_mesh"
-	count=1687
+	count=1686
 	transform="6527.586426 0.000000 1352.575195 0.000000 0.821655 0.000000 0.569986 0.000000 0.000000 0.000000
 6570.009766 0.000000 1354.077271 0.000000 0.959228 0.000000 0.282633 0.000000 0.000000 0.000000
 6576.647949 0.000000 1339.616333 0.000000 0.899253 0.000000 0.437428 0.000000 0.000000 0.000000
@@ -2478,7 +2476,6 @@ object={
 6663.914551 0.000000 2035.274414 0.000000 0.708628 0.000000 0.705583 1.000000 1.000000 1.000000
 6710.173828 0.000000 2039.621704 0.000000 0.769552 0.000000 0.638584 0.000000 0.000000 0.000000
 6661.464844 0.000000 2038.219482 0.000000 0.793017 0.000000 0.609200 1.000000 1.000000 1.000000
-6694.686523 0.000000 2033.743286 0.000000 0.950977 0.000000 0.309261 1.000000 1.000000 1.000000
 6671.197266 0.000000 2045.070312 0.000000 0.939778 0.000000 0.341786 1.000000 1.000000 1.000000
 6658.356934 0.000000 2038.335693 0.000000 0.981943 0.000000 0.189179 0.000000 0.000000 0.000000
 6673.664551 0.000000 2040.093506 0.000000 0.987288 0.000000 0.158943 1.000000 1.000000 1.000000
@@ -3393,7 +3390,7 @@ object={
 	generated_content=yes
 	layer="farms_dynamic"
 	pdxmesh="asian_province_subfarm_01_mesh"
-	count=1684
+	count=1683
 	transform="6558.236816 0.000000 1351.670532 0.000000 0.975991 0.000000 -0.217809 1.000000 1.000000 1.000000
 6569.260742 0.000000 1343.362793 0.000000 0.985618 0.000000 -0.168986 0.000000 0.000000 0.000000
 6542.875488 0.000000 1343.902710 0.000000 0.985519 0.000000 -0.169567 0.000000 0.000000 0.000000
@@ -4207,7 +4204,6 @@ object={
 6671.831543 0.000000 2037.609375 0.000000 0.995823 0.000000 0.091301 1.000000 1.000000 1.000000
 6677.502930 0.000000 2081.756592 0.000000 0.999972 0.000000 -0.007540 0.000000 0.000000 0.000000
 6685.020508 0.000000 2046.267822 0.000000 0.910063 0.000000 -0.414471 1.000000 1.000000 1.000000
-6698.835938 0.000000 2039.443726 0.000000 0.913339 0.000000 -0.407201 1.000000 1.000000 1.000000
 6673.722656 0.000000 2085.614746 0.000000 0.999288 0.000000 0.037727 1.000000 1.000000 1.000000
 6665.084961 0.000000 2044.255371 0.000000 0.935238 0.000000 -0.354019 1.000000 1.000000 1.000000
 6659.820801 0.000000 2047.242920 0.000000 0.999921 0.000000 -0.012577 1.000000 1.000000 1.000000
@@ -6841,7 +6837,7 @@ object={
 	generated_content=yes
 	layer="farms_dynamic"
 	pdxmesh="windmill_01_mesh"
-	count=708
+	count=707
 	transform="6548.968750 0.000000 1351.265747 0.000000 0.249484 0.000000 -0.968379 0.000000 0.000000 0.000000
 6562.735840 0.000000 1338.793701 0.000000 0.206581 0.000000 -0.978430 0.000000 0.000000 0.000000
 6655.487305 0.000000 1329.368286 0.000000 0.110946 0.000000 -0.993826 0.000000 0.000000 0.000000
@@ -7170,7 +7166,6 @@ object={
 6914.396484 0.000000 1809.362183 0.000000 0.261859 0.000000 -0.965106 0.000000 0.000000 0.000000
 6664.407715 0.000000 2041.249878 0.000000 0.137967 0.000000 -0.990437 0.000000 0.000000 0.000000
 6670.220703 0.000000 2050.518311 0.000000 0.233482 0.000000 -0.972361 1.000000 1.000000 1.000000
-6691.104004 0.000000 2041.979614 0.000000 0.243357 0.000000 -0.969937 1.000000 1.000000 1.000000
 6680.795410 0.000000 2061.349609 0.000000 0.146795 0.000000 -0.989167 1.000000 1.000000 1.000000
 6691.200195 0.000000 2046.234497 0.000000 0.273850 0.000000 -0.961772 1.000000 1.000000 1.000000
 6736.939453 0.000000 2049.366211 0.000000 0.237440 0.000000 -0.971402 1.000000 1.000000 1.000000

diff --git a/gfx/map/map_object_data/generated/asian_dynamic_forestry_objects_generator_2.txt b/gfx/map/map_object_data/generated/asian_dynamic_forestry_objects_generator_2.txt
@@ -5,7 +5,7 @@
 	generated_content=yes
 	layer="forestry_dynamic"
 	pdxmesh="generic_forestry_lumberpile_02_mesh"
-	count=6972
+	count=6973
 	transform="6518.864258 0.000000 1354.139282 0.000000 0.894954 0.000000 -0.446158 0.500000 0.500000 0.500000
 6566.230957 0.000000 1337.669678 0.000000 0.998311 0.000000 0.058105 0.500000 0.500000 0.500000
 6576.205566 0.000000 1355.599365 0.000000 0.395334 0.000000 -0.918537 0.500000 0.500000 0.500000
@@ -90,6 +90,7 @@
 6455.638184 0.000000 1540.821533 0.000000 0.053794 0.000000 -0.998552 0.500000 0.500000 0.500000
 6415.272949 0.000000 1546.996704 0.000000 0.083436 0.000000 -0.996513 0.500000 0.500000 0.500000
 6441.260742 0.000000 1569.300293 0.000000 0.801533 0.000000 0.597950 0.500000 0.500000 0.500000
+6455.819336 0.000000 1543.909058 0.000000 0.573918 0.000000 -0.818913 0.500000 0.500000 0.500000
 6439.778320 0.000000 1580.913086 0.000000 0.997353 0.000000 0.072716 0.500000 0.500000 0.500000
 6442.281250 0.000000 1567.289917 0.000000 0.333178 0.000000 -0.942864 0.500000 0.500000 0.500000
 6591.487305 0.000000 1498.821411 0.000000 0.980061 0.000000 -0.198694 0.500000 0.500000 0.500000

diff --git a/gfx/map/map_object_data/generated/bush_01_generator_1.txt b/gfx/map/map_object_data/generated/bush_01_generator_1.txt
@@ -53256,7 +53256,7 @@ object={
 	generated_content=yes
 	layer="semidynamic_medium"
 	pdxmesh="tree_bush_02_mesh"
-	count=22936
+	count=22938
 	transform="2271.890381 0.000000 1458.350586 0.000000 0.436149 0.000000 -0.899875 0.207127 0.207127 0.207127
 2278.581055 0.000000 1503.718140 0.000000 0.384846 0.000000 -0.922981 0.207485 0.207485 0.207485
 2278.469482 0.000000 1495.187744 0.000000 0.776404 0.000000 -0.630236 0.145958 0.145958 0.145958
@@ -59842,6 +59842,8 @@ object={
 5099.365234 0.000000 2584.784668 0.000000 0.603603 0.000000 -0.797285 0.205875 0.205875 0.205875
 5098.279785 0.000000 2586.653564 0.000000 0.008945 0.000000 -0.999960 0.209943 0.209943 0.209943
 5098.410156 0.000000 2582.832764 0.000000 0.317166 0.000000 -0.948370 0.207945 0.207945 0.207945
+4864.254883 0.000000 2645.422119 0.000000 0.562318 0.000000 -0.826921 0.131112 0.131112 0.131112
+4878.875488 0.000000 2643.043213 0.000000 0.761689 0.000000 -0.647943 0.159809 0.159809 0.159809
 4869.141602 0.000000 2623.787598 0.000000 0.153240 0.000000 -0.988189 0.157497 0.157497 0.157497
 4883.253418 0.000000 2645.867920 0.000000 0.497185 0.000000 -0.867644 0.151108 0.151108 0.151108
 4891.673340 0.000000 2651.054688 0.000000 0.630440 0.000000 -0.776238 0.188375 0.188375 0.188375

diff --git a/gfx/map/map_object_data/generated/bush_01_generator_2.txt b/gfx/map/map_object_data/generated/bush_01_generator_2.txt
@@ -5,7 +5,7 @@
 	generated_content=yes
 	layer="semidynamic_high"
 	pdxmesh="tree_bush_01_mesh"
-	count=128522
+	count=128531
 	transform="2268.944580 0.000000 1391.492432 0.000000 0.735691 0.000000 0.677318 0.125253 0.125253 0.125253
 2276.144287 0.000000 1461.070801 0.000000 0.496720 0.000000 0.867911 0.099633 0.099633 0.099633
 2274.508057 0.000000 1458.675049 0.000000 0.821687 0.000000 0.569940 0.126914 0.126914 0.126914
@@ -39278,6 +39278,7 @@
 4863.487305 0.000000 2628.509033 0.000000 0.959907 0.000000 0.280320 0.099096 0.099096 0.099096
 4861.125000 0.000000 2650.760498 0.000000 0.995321 0.000000 -0.096623 0.100308 0.100308 0.100308
 4862.390625 0.000000 2654.041748 0.000000 0.936954 0.000000 0.349452 0.124064 0.124064 0.124064
+4862.994629 0.000000 2645.905029 0.000000 0.613970 0.000000 0.789329 0.109344 0.109344 0.109344
 4862.854492 0.000000 2624.864746 0.000000 0.284765 0.000000 0.958597 0.104248 0.104248 0.104248
 4862.675293 0.000000 2650.032471 0.000000 0.755676 0.000000 0.654946 0.116615 0.116615 0.116615
 4863.352051 0.000000 2619.975098 0.000000 0.991946 0.000000 0.126665 0.171293 0.171293 0.171293
@@ -39633,14 +39634,22 @@
 5105.277344 0.000000 2590.125732 0.000000 0.574173 0.000000 0.818734 0.193894 0.193894 0.193894
 5097.811035 0.000000 2583.360840 0.000000 0.015085 0.000000 0.999886 0.190096 0.190096 0.190096
 5087.141602 0.000000 2592.908936 0.000000 0.917836 0.000000 0.396960 0.197401 0.197401 0.197401
+4879.130859 0.000000 2637.653076 0.000000 0.706571 0.000000 0.707643 0.103779 0.103779 0.103779
 4902.893555 0.000000 2617.728516 0.000000 0.999450 0.000000 -0.033161 0.100106 0.100106 0.100106
 4890.364746 0.000000 2623.842529 0.000000 0.088463 0.000000 0.996079 0.095282 0.095282 0.095282
+4875.941895 0.000000 2640.085205 0.000000 0.998309 0.000000 -0.058122 0.122916 0.122916 0.122916
+4887.371094 0.000000 2641.295166 0.000000 0.142398 0.000000 0.989809 0.106417 0.106417 0.106417
+4868.957520 0.000000 2638.128418 0.000000 0.993898 0.000000 -0.110300 0.104006 0.104006 0.104006
 4864.009766 0.000000 2640.473877 0.000000 0.947312 0.000000 -0.320311 0.113774 0.113774 0.113774
+4870.057129 0.000000 2643.218994 0.000000 0.894075 0.000000 0.447917 0.128051 0.128051 0.128051
 4871.437500 0.000000 2653.324951 0.000000 0.999003 0.000000 0.044635 0.113004 0.113004 0.113004
 4876.721191 0.000000 2636.606201 0.000000 0.708357 0.000000 0.705854 0.097506 0.097506 0.097506
 4876.375000 0.000000 2652.948975 0.000000 0.989693 0.000000 -0.143204 0.106929 0.106929 0.106929
 4866.575684 0.000000 2639.408203 0.000000 0.984315 0.000000 0.176422 0.103056 0.103056 0.103056
 4891.698730 0.000000 2644.780518 0.000000 0.561563 0.000000 0.827434 0.096898 0.096898 0.096898
+4865.118652 0.000000 2643.011475 0.000000 0.997587 0.000000 -0.069423 0.123522 0.123522 0.123522
+4878.401855 0.000000 2639.977051 0.000000 0.947220 0.000000 0.320585 0.122523 0.122523 0.122523
+4881.493164 0.000000 2642.254150 0.000000 0.810402 0.000000 -0.585874 0.125705 0.125705 0.125705
 4872.237305 0.000000 2646.307861 0.000000 0.951109 0.000000 -0.308856 0.127310 0.127310 0.127310
 4877.139648 0.000000 2641.825928 0.000000 0.993258 0.000000 -0.115929 0.133826 0.133826 0.133826
 4868.035156 0.000000 2604.500977 0.000000 0.962732 0.000000 0.270456 0.111623 0.111623 0.111623
@@ -128536,7 +128545,7 @@ object={
 	generated_content=yes
 	layer="semidynamic_high"
 	pdxmesh="tree_bush_02_mesh"
-	count=55162
+	count=55167
 	transform="2269.264404 0.000000 1458.890625 0.000000 0.615317 0.000000 -0.788280 0.152750 0.152750 0.152750
 2271.740967 0.000000 1457.078003 0.000000 0.256505 0.000000 -0.966543 0.161660 0.161660 0.161660
 2270.176025 0.000000 1463.267334 0.000000 0.250785 0.000000 -0.968043 0.147096 0.147096 0.147096
@@ -145360,6 +145369,7 @@ object={
 4862.419434 0.000000 2640.428467 0.000000 0.168502 0.000000 -0.985701 0.104461 0.104461 0.104461
 4861.032715 0.000000 2620.469238 0.000000 0.081787 0.000000 -0.996650 0.121462 0.121462 0.121462
 4861.638184 0.000000 2618.004395 0.000000 0.075725 0.000000 -0.997129 0.106226 0.106226 0.106226
+4863.697754 0.000000 2643.005371 0.000000 0.314004 0.000000 -0.949422 0.112430 0.112430 0.112430
 4863.814453 0.000000 2616.725830 0.000000 0.694357 0.000000 -0.719630 0.103419 0.103419 0.103419
 4856.096680 0.000000 2625.925293 0.000000 0.132810 0.000000 -0.991141 0.123031 0.123031 0.123031
 4863.116211 0.000000 2618.031006 0.000000 0.543491 0.000000 -0.839415 0.177443 0.177443 0.177443
@@ -145515,6 +145525,8 @@ object={
 5100.874023 0.000000 2584.696289 0.000000 0.131153 0.000000 -0.991362 0.209163 0.209163 0.209163
 5097.299805 0.000000 2583.971436 0.000000 0.301303 0.000000 -0.953529 0.208052 0.208052 0.208052
 5104.683105 0.000000 2591.560059 0.000000 0.401328 0.000000 -0.915934 0.207371 0.207371 0.207371
+4871.979980 0.000000 2640.416504 0.000000 0.061712 0.000000 -0.998094 0.122124 0.122124 0.122124
+4867.505371 0.000000 2641.707520 0.000000 0.227719 0.000000 -0.973727 0.125006 0.125006 0.125006
 4902.346680 0.000000 2652.538818 0.000000 0.380700 0.000000 -0.924699 0.103757 0.103757 0.103757
 4870.507812 0.000000 2650.372314 0.000000 0.052592 0.000000 -0.998616 0.122158 0.122158 0.122158
 4885.235840 0.000000 2618.142334 0.000000 0.150064 0.000000 -0.988676 0.137604 0.137604 0.137604
@@ -145527,10 +145539,12 @@ object={
 4895.888672 0.000000 2619.825439 0.000000 0.364130 0.000000 -0.931348 0.116318 0.116318 0.116318
 4864.712402 0.000000 2616.502197 0.000000 0.588140 0.000000 -0.808759 0.115982 0.115982 0.115982
 4900.342285 0.000000 2653.949951 0.000000 0.512508 0.000000 -0.858682 0.110520 0.110520 0.110520
+4869.572266 0.000000 2645.212158 0.000000 0.063124 0.000000 -0.998006 0.133274 0.133274 0.133274
 4874.234863 0.000000 2645.727051 0.000000 0.673492 0.000000 -0.739195 0.148365 0.148365 0.148365
 4879.799805 0.000000 2641.344971 0.000000 0.002019 0.000000 -0.999998 0.147638 0.147638 0.147638
 4880.905273 0.000000 2652.180664 0.000000 0.530285 0.000000 -0.847819 0.151506 0.151506 0.151506
 4874.618164 0.000000 2649.724609 0.000000 0.748006 0.000000 -0.663692 0.121511 0.121511 0.121511
+4865.843750 0.000000 2644.660889 0.000000 0.788334 0.000000 -0.615247 0.129853 0.129853 0.129853
 4871.784180 0.000000 2651.597656 0.000000 0.575570 0.000000 -0.817753 0.120078 0.120078 0.120078
 4876.919922 0.000000 2648.316895 0.000000 0.804072 0.000000 -0.594532 0.143466 0.143466 0.143466
 4901.265137 0.000000 2617.944824 0.000000 0.274951 0.000000 -0.961458 0.138235 0.138235 0.138235