From 5d546cfc8b1c0f7c5a7cf0c9733d656de2015d2b Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com> Date: Tue, 1 Oct 2024 07:26:18 +0300 Subject: [PATCH] [Maps] Tushkan hotfix #3 (#2636) --- Resources/Maps/corvax_tushkan.yml | 309 +++++++++++------------------- 1 file changed, 112 insertions(+), 197 deletions(-) diff --git a/Resources/Maps/corvax_tushkan.yml b/Resources/Maps/corvax_tushkan.yml index 3bbf242385c..4fdc400aad7 100644 --- a/Resources/Maps/corvax_tushkan.yml +++ b/Resources/Maps/corvax_tushkan.yml @@ -8166,7 +8166,7 @@ entities: 0: 62702 -3,4: 0: 4111 - 1: 60928 + 6: 60928 -2,0: 0: 61567 -2,1: @@ -8220,7 +8220,7 @@ entities: 7,2: 0: 61389 7,-1: - 0: 7632 + 0: 7664 7,3: 0: 61160 7,4: @@ -8231,7 +8231,7 @@ entities: 0: 3067 8,2: 0: 4881 - 2: 4 + 1: 4 8,3: 0: 65008 9,0: @@ -8243,7 +8243,7 @@ entities: -8,0: 0: 45294 -9,0: - 0: 56543 + 0: 56797 -8,1: 0: 15355 -9,1: @@ -8292,23 +8292,24 @@ entities: 0: 65295 -11,1: 0: 3584 - 2: 4 + 1: 4 + -11,0: + 1: 1024 -11,2: - 2: 4 + 1: 4 -10,0: - 0: 61644 - 2: 16 + 0: 65535 -10,1: 0: 65535 -10,2: - 0: 35760 + 0: 35762 -10,3: 0: 63240 - 2: 1 + 1: 1 + -10,-1: + 0: 61440 -10,4: 0: 30471 - -10,-1: - 0: 49152 -9,3: 0: 30471 -9,-1: @@ -8320,24 +8321,19 @@ entities: 0,-5: 0: 32767 -1,-4: - 3: 1 - 0: 53724 + 0: 53725 0,-3: - 0: 65301 - 3: 2 + 0: 65303 -1,-3: - 3: 9 - 0: 65284 + 0: 65293 0,-2: 0: 47935 -1,-2: 0: 48015 1,-4: - 3: 515 - 0: 12592 + 0: 13107 1,-3: - 3: 3 - 0: 65280 + 0: 65283 1,-2: 0: 47887 2,-4: @@ -8412,21 +8408,21 @@ entities: 0: 65529 0,10: 0: 127 - 2: 34816 + 1: 34816 -1,10: 0: 207 - 2: 8960 + 1: 8960 0,11: - 2: 3983 + 1: 3983 -1,11: - 2: 3646 + 1: 3646 1,9: 0: 65521 1,10: 0: 3 - 2: 17856 + 1: 17856 1,11: - 2: 116 + 1: 116 2,9: 0: 61190 2,10: @@ -8439,7 +8435,7 @@ entities: 0: 65535 4,9: 0: 15 - 2: 2048 + 1: 2048 0,-8: 0: 65535 -1,-8: @@ -8476,87 +8472,87 @@ entities: 0: 62719 4,-8: 0: 61713 - 2: 136 + 1: 136 4,-7: 0: 4373 - 2: 17472 + 1: 17472 4,-6: 0: 4113 - 2: 3268 + 1: 3268 4,-5: 0: 56541 0,-12: - 2: 4880 + 1: 4880 -1,-12: - 2: 3840 + 1: 3840 0,-11: - 2: 4593 + 1: 4593 -1,-11: - 2: 62451 + 1: 62451 0,-10: - 2: 4383 - 4: 17408 + 1: 4383 + 2: 17408 -1,-10: - 2: 2051 + 1: 2051 0: 13056 0,-9: - 2: 3857 - 4: 4 + 1: 3857 + 2: 4 -1,-9: - 2: 128 + 1: 128 0: 13059 1,-11: - 2: 8944 + 1: 8944 1,-10: - 2: 15 - 4: 21760 + 1: 15 + 2: 21760 1,-9: - 4: 5 - 2: 3840 + 2: 5 + 1: 3840 2,-11: - 2: 35064 + 1: 35064 2,-10: - 2: 15 - 5: 4352 - 4: 17408 + 1: 15 + 3: 4352 + 2: 17408 2,-9: - 5: 1 - 2: 3840 - 4: 4 + 3: 1 + 1: 3840 + 2: 4 3,-11: - 2: 240 + 1: 240 3,-10: - 2: 15 - 6: 4352 - 7: 17408 + 1: 15 + 4: 4352 + 5: 17408 3,-9: - 6: 1 - 2: 3840 - 7: 4 + 4: 1 + 1: 3840 + 5: 4 4,-11: - 2: 4592 + 1: 4592 4,-10: - 2: 7953 + 1: 7953 4,-9: - 2: 49649 + 1: 49649 5,-11: - 2: 4401 + 1: 4401 5,-10: - 2: 4369 + 1: 4369 5,-9: - 2: 30065 + 1: 30065 5,-8: - 2: 65348 + 1: 65348 5,-7: - 4: 30578 + 2: 30578 5,-5: 0: 65535 5,-4: 0: 61007 5,-6: - 2: 3200 + 1: 3200 6,-6: - 2: 256 + 1: 256 0: 2184 6,-5: 0: 56797 @@ -8592,47 +8588,45 @@ entities: 0: 30583 8,-1: 0: 272 - 2: 1088 + 1: 1088 8,-8: 0: 8192 8,-7: 0: 8738 9,-7: - 2: 4096 + 1: 4096 9,-6: 0: 12336 9,-4: 0: 12336 9,-3: - 2: 16 + 1: 16 8,4: 0: 4368 - 2: 3200 + 1: 3200 8,5: - 0: 17615 - 8: 8704 - 9: 34816 + 0: 61135 7,5: 0: 61007 7,6: 0: 61678 8,6: 0: 6372 - 2: 49152 + 1: 49152 8,7: 0: 273 - 2: 3276 + 1: 3276 7,7: 0: 43263 8,8: - 2: 2 + 1: 2 0: 26368 9,4: - 2: 256 + 1: 256 9,6: - 2: 4096 + 1: 4096 9,7: - 2: 273 + 1: 273 7,8: 0: 39864 7,9: @@ -8669,7 +8663,7 @@ entities: 0: 11 -5,9: 0: 11 - 2: 512 + 1: 512 -3,8: 0: 61917 -3,9: @@ -8683,12 +8677,12 @@ entities: -2,9: 0: 61408 -2,10: - 2: 17504 + 1: 17504 0: 8 -2,7: 0: 57599 -2,11: - 2: 196 + 1: 196 -4,5: 0: 48059 -5,5: @@ -8701,7 +8695,7 @@ entities: 0: 61627 -3,5: 0: 56576 - 1: 14 + 6: 14 -3,6: 0: 61919 -2,5: @@ -8711,7 +8705,7 @@ entities: -8,8: 0: 192 -8,7: - 2: 34816 + 1: 34816 0: 14 -7,8: 0: 3838 @@ -8744,7 +8738,7 @@ entities: -6,6: 0: 30706 -11,4: - 2: 6 + 1: 6 0: 52224 -11,5: 0: 52428 @@ -8755,38 +8749,36 @@ entities: -10,6: 0: 4064 -10,7: - 2: 6 + 1: 6 -10,-4: 0: 2048 -9,-4: 0: 53198 -9,-3: - 2: 1 + 1: 1 0: 61132 -9,-2: 0: 52238 -9,-5: 0: 61164 -8,-4: - 0: 53533 - 3: 192 + 0: 53725 -8,-3: - 0: 65305 - 10: 4 + 0: 65309 -8,-2: 0: 65295 -10,-6: 0: 32768 -9,-6: 0: 64716 - 2: 16 + 1: 16 -9,-8: 0: 32768 -9,-7: 0: 34952 -8,-6: 0: 4369 - 2: 16384 + 1: 16384 -8,-5: 0: 7633 -7,-4: @@ -8798,16 +8790,13 @@ entities: -7,-5: 0: 61172 -6,-4: - 0: 33760 - 3: 10240 - 11: 16384 + 0: 61408 -6,-3: 0: 53216 -6,-2: 0: 3855 -6,-5: - 0: 53216 - 3: 8192 + 0: 61408 -5,-3: 0: 65318 -5,-2: @@ -8826,11 +8815,11 @@ entities: 0: 65534 -6,-6: 0: 56592 - 2: 4 + 1: 4 -6,-8: 0: 61166 -6,-7: - 2: 58432 + 1: 58432 -5,-8: 0: 65262 -5,-6: @@ -8846,16 +8835,15 @@ entities: -4,-5: 0: 4095 -6,-12: - 2: 36736 + 1: 36736 -6,-10: 0: 60940 -6,-9: 0: 3822 -6,-11: 0: 52224 - 2: 8 -5,-12: - 2: 3840 + 1: 3840 -5,-11: 0: 21760 -5,-10: @@ -8863,10 +8851,9 @@ entities: -5,-9: 0: 4095 -4,-12: - 2: 12064 + 1: 12064 -4,-11: 0: 30464 - 2: 2 -4,-10: 0: 65287 -4,-9: @@ -8880,11 +8867,9 @@ entities: -3,-5: 0: 53247 -2,-4: - 0: 37009 - 3: 2056 + 0: 39065 -2,-3: - 0: 65297 - 3: 8 + 0: 65305 -2,-2: 0: 65039 -2,-5: @@ -8906,19 +8891,19 @@ entities: -2,-9: 0: 61198 -3,-12: - 2: 61422 - -3,-11: - 2: 4334 - 0: 17408 + 1: 61422 -3,-10: 0: 60996 + -3,-11: + 1: 238 + 0: 17408 -2,-12: - 2: 36736 + 1: 36736 -2,-11: - 2: 65279 + 1: 65279 -2,-10: 0: 65024 - 2: 14 + 1: 14 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -8935,21 +8920,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 235 - moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 immutable: True moles: @@ -8965,21 +8935,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.14975 - moles: - - 20.078888 - - 75.53487 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 temperature: 293.15 moles: @@ -9041,52 +8996,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.14948 - moles: - - 18.472576 - - 69.49208 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 21.6852 - - 81.57766 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 23.43119 - - 88.145905 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.14975 + temperature: 235 moles: - 21.824879 - 82.10312 @@ -11895,6 +11805,11 @@ entities: - type: Transform pos: -32.5,-28.5 parent: 2 + - uid: 10934 + components: + - type: Transform + pos: 33.5,-28.5 + parent: 2 - proto: AtmosFixBlockerMarker entities: - uid: 10223