From 314f45b9028d34d1c7eda42fba48d46a95c6c645 Mon Sep 17 00:00:00 2001 From: Aaron Yau Date: Sat, 14 Jan 2023 09:56:00 +0800 Subject: [PATCH] bugfix, update hemlok and prowler's patterns --- AHK/debug/make_recoil/ae_pattern.txt | 436 +++++++++++++---------- AHK/debug/make_recoil/pattern.txt | 438 ++++++++++++++---------- AHK/debug/make_recoil/pattern_maker.ahk | 10 +- AHK/src/apexmaster.ahk | 24 +- AHK/src/green.ahk | 23 +- AHK/src/gui.ahk | 2 +- AHK/src/pattern/Hemlok.txt | 294 ++++++++++++++-- AHK/src/pattern/HemlokAuto.txt | 9 + AHK/src/pattern/Prowler.txt | 22 +- 9 files changed, 841 insertions(+), 417 deletions(-) create mode 100644 AHK/src/pattern/HemlokAuto.txt diff --git a/AHK/debug/make_recoil/ae_pattern.txt b/AHK/debug/make_recoil/ae_pattern.txt index 5f106ec..a13db14 100644 --- a/AHK/debug/make_recoil/ae_pattern.txt +++ b/AHK/debug/make_recoil/ae_pattern.txt @@ -1,179 +1,257 @@ - 0 1769 435 - 1 1759.29 447 - 2 1753.71 449.078 - 3 1754.74 456.559 - 4 1751.51 453.496 - 5 1752.45 456.422 - 6 1752.41 464.348 - 7 1746.62 463.48 - 8 1747.4 469.945 - 9 1747.15 471.738 - 10 1745.52 469.824 - 11 1748.74 481.652 - 12 1743.62 479.465 - 13 1744.65 485.211 - 14 1745.65 489.191 - 15 1743.12 484.91 - 16 1745.47 497 - 17 1738.76 496.051 - 18 1738.92 501.645 - 19 1739.84 506.344 - 20 1737.03 501.441 - 21 1740.5 512.434 - 22 1736.77 508.477 - 23 1737.43 512.168 - 24 1738.68 515.949 - 25 1736.5 511.324 - 26 1741.63 521.676 - 27 1739.48 516.109 - 28 1740.74 518.734 - 29 1742.73 523.32 - 30 1740.33 517.621 - 31 1745.21 528.688 - 32 1743.1 523.742 - 33 1743.86 526.66 - 34 1745.83 531.387 - 35 1743.57 525.812 - 36 1749.37 537.215 - 37 1748.17 532.309 - 38 1750.2 536.543 - 39 1751.69 539.727 - 40 1749.88 535.219 - 41 1754.45 546.098 - 42 1752.18 539.684 - 43 1753.38 543.586 - 44 1754.72 547.285 - 45 1752.76 541.871 - 46 1756.14 553.871 - 47 1752.61 547.691 - 48 1753.3 551.625 - 49 1754.52 556.117 - 50 1752.42 550.223 - 51 1752.7 561.391 - 52 1747.48 556.285 - 53 1746.85 559.855 - 54 1747.22 563.301 - 55 1745.28 558.648 - 56 1744.54 567.652 - 57 1738.62 560.621 - 58 1738.17 564.188 - 59 1737.75 566.18 - 60 1736.29 561.77 - 61 1737.17 569.523 - 62 1733.16 561.227 - 63 1733.43 563.848 - 64 1733.55 565.324 - 65 1732.25 561.312 - 66 1730.11 569.254 - 67 1723.18 562.301 - 68 1722.15 565.598 - 69 1721.41 566.68 - 70 1719.73 563.383 - 71 1719.64 571.766 - 72 1715.27 568.379 - 73 1715.27 572.586 - 74 1714.74 574.367 - 75 1713.6 571.559 - 76 1715.16 580.34 - 77 1712.38 576.699 - 78 1712.77 581.562 - 79 1712.8 583.285 - 80 1712.21 580.465 - 81 1715.59 587.395 - 82 1714.25 579.727 - 83 1716.36 585.59 - 84 1715.8 583.551 - 85 1715.75 582.711 - 86 1719.81 590.746 - 87 1718.55 584.281 - 88 1721.32 591.707 - 89 1720.55 588.5 - 90 1720.77 589.402 - 91 1725.38 591.375 - 92 1724.71 582.23 - 93 1727.62 587.559 - 94 1726.83 583.398 - 95 1727.46 584.246 - 96 1730.15 589.629 - 97 1728.61 582.758 - 98 1730.71 589.352 - 99 1729.44 584.344 - 100 1730.39 587.398 - 101 1734.29 586.766 - 102 1734.4 582.605 - 103 1736.75 589.188 - 104 1735.41 582.586 - 105 1736.71 586.77 - 106 1736.24 591.527 - 107 1734.71 589.707 - 108 1736.58 597.797 - 109 1734.66 591.586 - 110 1735.89 596.266 - 111 1733.95 601.242 - 112 1732.5 600.195 - 113 1733.73 607.375 - 114 1732.2 602.078 - 115 1734.48 611.426 - 116 1734 610.523 - 117 1734.47 613.172 - 118 1735.31 616.742 - 119 1734.43 613.039 - 120 1735.17 616.176 - 121 1736.68 616.426 - 122 1737.75 620.156 - 123 1738.45 623.113 - 124 1737.67 618.168 - 125 1738.47 621.895 - 126 1737.75 622.531 - 127 1738.47 627.68 - 128 1739.12 630.992 - 129 1738.02 625.773 - 130 1741.71 638.797 - 131 1741.21 634.43 - 132 1742.89 641.496 - 133 1743.13 642.309 - 134 1742.74 639.066 - 135 1749.12 646.953 - 136 1750.05 640.434 - 137 1753.01 646.461 - 138 1753.19 643.352 - 139 1753.47 643.082 - 140 1757.91 651.566 - 141 1758.24 644.039 - 142 1760.36 652.246 - 143 1760.34 649.379 - 144 1760.2 647.297 - 145 1764.2 657.348 - 146 1766.16 652.297 - 147 1767.43 657.34 - 148 1768.27 658.043 - 149 1768.39 657.586 - 150 1770.23 667.938 - 151 1770.01 661.102 - 152 1771.25 671.52 - 153 1771.3 670.879 - 154 1771.2 668.195 - 155 1769.98 677.578 - 156 1766.84 670.105 - 157 1766.91 679.895 - 158 1766.43 678.484 - 159 1766.1 676.504 - 160 1765.68 685.422 - 161 1764.76 679.551 - 162 1764.86 688.09 - 163 1764.79 686.457 - 164 1764.77 683.18 - 165 1764.96 693.488 - 166 1764.78 688.93 - 167 1765.09 698.453 - 168 1765.02 692.961 - 169 1765.08 696.473 - 170 1762.41 704.613 - 171 1760.81 697.5 - 172 1760.29 706.867 - 173 1760.01 703.211 - 174 1759.91 703.695 - 175 1755.92 713.996 - 176 1753.1 710.473 - 177 1752.71 717.434 - 178 1752.13 712.52 + 0.150391 1272.38 254.125 + 1.15039 1269.47 260.543 + 2.15039 1274.77 263.492 + 3.15039 1270.68 264.801 + 4.15039 1272.91 265.398 + 5.15039 1272.89 265.633 + 6.15039 1271.58 265.57 + 7.15039 1273.28 265.395 + 8.15234 1271.94 265.027 + 9.15234 1266.59 277.902 + 10.1523 1267.58 290.902 + 11.1523 1266.29 301.84 + 12.1523 1267.54 303.629 + 13.1523 1266.45 304.383 + 14.1523 1266.6 304.516 + 15.1543 1266.88 304.266 + 16.1543 1266.35 303.668 + 17.1543 1266.86 302.715 + 18.1543 1269.55 314.59 + 19.1543 1267.88 326.215 + 20.1543 1272.84 328.965 + 21.1543 1268.87 330.172 + 22.1543 1271.59 330.652 + 23.1563 1270.92 330.68 + 24.1563 1270.38 330.254 + 25.1563 1271.72 329.375 + 26.1563 1270.45 328.055 + 27.1563 1268.06 340.93 + 28.1563 1265.97 353.93 + 29.1563 1268.9 360.785 + 30.1562 1266.06 362.406 + 31.1582 1267.59 363.047 + 32.1582 1267.28 363.078 + 33.1582 1266.77 362.551 + 34.1582 1267.78 361.387 + 35.1582 1277.84 369.145 + 36.1582 1270.73 378.617 + 37.1582 1275.36 382.984 + 38.1582 1277.43 385.027 + 39.1602 1273.93 385.883 + 40.1602 1278.54 386.352 + 41.1602 1274.61 387.477 + 42.1602 1276.34 386.656 + 43.1602 1276.36 385.121 + 44.1602 1279.4 397.047 + 45.1602 1280.75 404.32 + 46.1602 1281.31 407.602 + 47.1621 1281.91 409.168 + 48.1621 1282.05 409.953 + 49.1621 1282.34 410.156 + 50.1621 1282.46 409.641 + 51.1621 1282.52 408.398 + 52.1621 1282.73 406.426 + 53.1621 1289.36 416.113 + 54.1621 1291.1 419.52 + 55.1641 1292.21 421.191 + 56.1641 1292.73 422.09 + 57.1641 1293.14 422.539 + 58.1641 1293.39 422.52 + 59.1641 1293.48 421.82 + 60.1641 1293.7 420.461 + 61.1641 1293.72 418.27 + 62.1641 1300.27 427.914 + 63.166 1300.84 431.227 + 64.166 1303.4 433.117 + 65.166 1302.67 433.832 + 66.166 1303.77 434.508 + 67.166 1303.95 434.508 + 68.166 1303.86 433.797 + 69.166 1304.29 432.316 + 70.166 1303.75 429.816 + 71.168 1305.02 441.93 + 72.168 1305.25 450.699 + 73.168 1305.34 453.266 + 74.168 1305.7 454.523 + 75.168 1305.7 455.094 + 76.168 1305.79 455.031 + 77.168 1305.79 454.156 + 78.168 1305.76 452.445 + 79.1699 1305.68 449.793 + 80.1699 1306.07 461.93 + 81.1699 1305.78 470.402 + 82.1699 1306.62 472.98 + 83.1699 1306.05 474.027 + 84.1699 1306.48 474.594 + 85.1699 1306.44 474.359 + 86.1699 1306.35 473.316 + 87.1719 1306.38 471.32 + 88.1719 1306.08 468.266 + 89.1719 1316.27 476.723 + 90.1719 1316.63 479.109 + 91.1719 1320.95 481.008 + 92.1719 1318.9 481.035 + 93.1719 1320.98 481.605 + 94.1738 1320.71 481.148 + 95.1738 1320.26 479.824 + 96.1738 1321.02 477.82 + 97.1738 1326.96 482.309 + 98.1738 1325.48 487.344 + 99.1738 1327.88 490.332 + 100.174 1329.05 491.699 + 101.174 1327.88 491.84 + 102.176 1329.78 492.375 + 103.176 1328.63 491.441 + 104.176 1328.96 490.027 + 105.176 1328.95 487.52 + 106.176 1333.55 490.238 + 107.176 1334.38 494.121 + 108.176 1335.69 496.082 + 109.176 1336.81 497.113 + 110.178 1336.36 497.281 + 111.178 1337.2 497.512 + 112.178 1336.96 496.809 + 113.178 1336.84 495.301 + 114.178 1336.8 492.848 + 115.178 1341.33 494.754 + 116.178 1340.36 496.781 + 117.178 1341.89 498.355 + 118.18 1343.06 499.18 + 119.18 1342.02 499.004 + 120.18 1343.39 499.332 + 121.18 1342.67 498.352 + 122.18 1342.66 496.699 + 123.18 1342.62 494.207 + 124.18 1341.93 497.988 + 125.18 1339.2 503.004 + 126.182 1339.22 505.57 + 127.182 1339.28 506.766 + 128.182 1338.45 506.969 + 129.182 1339.2 507.125 + 130.182 1338.49 506.023 + 131.182 1338.51 504.117 + 132.182 1338.17 501.062 + 133.182 1335.47 507.68 + 134.184 1336.16 512.34 + 135.184 1334.61 513.754 + 136.184 1335.11 514.746 + 137.184 1334.86 514.98 + 138.184 1334.6 514.477 + 139.184 1334.84 513.27 + 140.184 1334.19 510.684 + 141.184 1334.09 505.848 + 142.186 1329.74 511.254 + 143.186 1327.23 514.145 + 144.186 1326.71 513.816 + 145.186 1324.2 514.422 + 146.186 1323.88 514.543 + 147.186 1323.9 514.422 + 148.186 1323.62 513.344 + 149.186 1323.46 511.391 + 150.188 1323.2 508.344 + 151.188 1318.96 516.031 + 152.188 1313.08 519.523 + 153.188 1314.53 522.039 + 154.188 1312.69 522.438 + 155.187 1312.32 522.66 + 156.188 1313.01 522.461 + 157.188 1311.79 520.828 + 158.189 1312.49 518.543 + 159.189 1311.67 514.625 + 160.189 1305.31 521.539 + 161.189 1301.89 523.207 + 162.189 1303.44 524.348 + 163.189 1300.61 524.164 + 164.189 1302.05 524.25 + 165.189 1301.22 523.289 + 166.191 1300.9 521.332 + 167.191 1301.45 518.535 + 168.191 1298.75 519.273 + 169.191 1294.73 521.27 + 170.191 1294.27 522.234 + 171.191 1294.2 522.59 + 172.191 1292.9 522.488 + 173.193 1293.75 522.312 + 174.193 1293 521.129 + 175.193 1293.09 519.09 + 176.193 1293.15 515.836 + 177.193 1286.45 513.582 + 178.193 1284.32 512.746 + 179.193 1282.15 512.184 + 180.193 1281.18 511.832 + 181.195 1281.14 511.57 + 182.195 1280.44 511.129 + 183.195 1280.69 509.996 + 184.195 1280.4 507.887 + 185.195 1280.36 504.723 + 186.195 1280.43 502.066 + 187.195 1275.77 513.492 + 188.195 1275.95 515.852 + 189.197 1275.94 516.727 + 190.197 1274.74 517.012 + 191.197 1275.73 516.719 + 192.197 1274.91 515.617 + 193.197 1275.21 513.469 + 194.197 1275.26 510.203 + 195.197 1271.54 517.316 + 196.197 1271.75 521.543 + 197.199 1270.21 523.332 + 198.199 1270.37 523.969 + 199.199 1270.2 524.051 + 200.199 1269.89 523.527 + 201.199 1270.17 522.664 + 202.199 1269.92 519.414 + 203.199 1270.17 515.609 + 204.199 1275.05 522.695 + 205.201 1275.15 524.215 + 206.201 1276.99 525.312 + 207.201 1276.75 525.617 + 208.201 1277.08 525.598 + 209.201 1277.33 524.605 + 210.201 1277.26 522.668 + 211.201 1276.49 521.57 + 212.201 1276.3 518.812 + 213.203 1284.89 521.793 + 214.203 1286.98 522.242 + 215.203 1288.27 522.301 + 216.203 1287.25 522.043 + 217.203 1289.08 521.641 + 218.203 1287.93 520.234 + 219.203 1288.1 518.848 + 220.203 1288.4 514.344 + 221.205 1293.77 515.883 + 222.205 1290.28 516.188 + 223.205 1294.29 516.766 + 224.205 1292.75 516.531 + 225.205 1293.04 516.383 + 226.205 1294.12 515.914 + 227.205 1292.64 514.438 + 228.205 1293.5 512.223 + 229.207 1293.19 508.734 + 230.207 1299.66 511.773 + 231.207 1299.09 513.09 + 232.207 1301.71 514 + 233.207 1301.62 514.086 + 234.207 1301.48 514.02 + 235.207 1302.31 513.793 + 236.207 1301.77 512.711 + 237.209 1301.95 509.719 + 238.209 1301.53 506.055 + 239.209 1306.59 508.625 + 240.209 1306.54 509.57 + 241.209 1308.31 510.629 + 242.209 1308.26 510.676 + 243.209 1308.12 510.609 + 244.209 1308.76 510.082 + 245.211 1308.19 508.469 + 246.211 1308.27 506.984 + 247.211 1307.95 502.297 + 248.211 1307.77 510.012 + 249.211 1306.35 511.969 + 250.211 1307.91 513.172 + 251.211 1306.33 513.203 + 252.213 1307.04 513.27 + 253.213 1307.17 512.891 + 254.213 1306.27 510.785 + 255.213 1306.64 508.137 + 256.213 1306.11 505.582 diff --git a/AHK/debug/make_recoil/pattern.txt b/AHK/debug/make_recoil/pattern.txt index 0b8427c..1fb889c 100644 --- a/AHK/debug/make_recoil/pattern.txt +++ b/AHK/debug/make_recoil/pattern.txt @@ -1,180 +1,258 @@ --4,5,17.3 --3,1,17.3 -0,3,17.3 --1,-1,17.3 -0,1,17.3 -0,3,17.3 --3,0,17.3 -0,3,17.3 -0,1,17.3 --1,-1,17.3 -1,5,17.3 --2,-1,17.3 -0,2,17.3 -0,2,17.3 --1,-2,17.3 -1,5,17.3 --3,0,17.3 -0,2,17.3 -0,2,17.3 --1,-2,17.3 -2,5,17.3 --2,-2,17.3 -0,2,17.3 -1,2,17.3 --1,-2,17.3 -2,4,17.3 --1,-2,17.3 -1,1,17.3 -1,2,17.3 --1,-2,17.3 -2,5,17.3 --1,-2,17.3 -0,1,17.3 -1,2,17.3 --1,-2,17.3 -3,5,17.3 --1,-2,17.3 -1,2,17.3 -1,1,17.3 --1,-2,17.3 -2,5,17.3 --1,-3,17.3 -1,2,17.3 -1,2,17.3 --1,-2,17.3 -2,5,17.3 --2,-3,17.3 -0,2,17.3 -1,2,17.3 --1,-3,17.3 -0,5,17.3 --2,-2,17.3 -0,2,17.3 -0,1,17.3 --1,-2,17.3 -0,4,17.3 --3,-3,17.3 -0,2,17.3 -0,1,17.3 --1,-2,17.3 -0,3,17.3 --2,-4,17.3 -0,1,17.3 -0,1,17.3 --1,-2,17.3 --1,3,17.3 --3,-3,17.3 -0,1,17.3 -0,0,17.3 --1,-1,17.3 -0,4,17.3 --2,-1,17.3 -0,2,17.3 -0,1,17.3 --1,-1,17.3 -1,4,17.3 --1,-2,17.3 -0,2,17.3 -0,1,17.3 -0,-1,17.3 -2,3,17.3 --1,-3,17.3 -1,3,17.3 -0,-1,17.3 -0,0,17.3 -2,3,17.3 --1,-3,17.3 -1,3,17.3 -0,-1,17.3 -0,0,17.3 -2,1,17.3 -0,-4,17.3 -1,2,17.3 -0,-2,17.3 -0,0,17.3 -1,2,17.3 --1,-3,17.3 -1,3,17.3 --1,-2,17.3 -0,1,17.3 -2,0,17.3 -0,-2,17.3 -1,3,17.3 --1,-3,17.3 -1,2,17.3 -0,2,17.3 --1,-1,17.3 -1,3,17.3 --1,-3,17.3 -1,2,17.3 --1,2,17.3 --1,0,17.3 -1,3,17.3 --1,-2,17.3 -1,4,17.3 -0,0,17.3 -0,1,17.3 -0,2,17.3 -0,-2,17.3 -0,1,17.3 -1,0,17.3 -0,2,17.3 -0,1,17.3 -0,-2,17.3 -0,2,17.3 -0,0,17.3 -0,2,17.3 -0,1,17.3 -0,-2,17.3 -2,6,17.3 -0,-2,17.3 -1,3,17.3 -0,0,17.3 -0,-1,17.3 -3,3,17.3 -0,-3,17.3 -1,3,17.3 -0,-1,17.3 -0,0,17.3 -2,4,17.3 -0,-3,17.3 -1,4,17.3 -0,-1,17.3 -0,-1,17.3 -2,4,17.3 -1,-2,17.3 -1,2,17.3 -0,0,17.3 -0,0,17.3 -1,4,17.3 -0,-3,17.3 -1,4,17.3 -0,0,17.3 -0,-1,17.3 --1,4,17.3 --1,-3,17.3 -0,4,17.3 -0,-1,17.3 -0,-1,17.3 -0,4,17.3 -0,-3,17.3 -0,4,17.3 -0,-1,17.3 -0,-1,17.3 -0,4,17.3 -0,-2,17.3 -0,4,17.3 -0,-2,17.3 -0,2,17.3 --1,4,17.3 --1,-3,17.3 -0,4,17.3 -0,-2,17.3 -0,0,17.3 --2,4,17.3 --1,-2,17.3 -0,3,17.3 -0,-2,17.3 -0,0,17.3 -0,0,17.3 +-1,2,16.8 +2,1,16.8 +-1,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +1,0,16.8 +0,0,16.8 +-2,4,16.8 +0,4,16.8 +0,3,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +1,3,16.8 +-1,3,16.8 +2,1,16.8 +-1,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +-1,4,16.8 +-1,4,16.8 +1,2,16.8 +-1,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +4,2,16.8 +-2,3,16.8 +2,1,16.8 +1,1,16.8 +-1,0,16.8 +2,0,16.8 +-1,0,16.8 +1,0,16.8 +0,0,16.8 +1,3,16.8 +0,2,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +2,3,16.8 +1,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +2,3,16.8 +0,1,16.8 +1,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,3,16.8 +0,2,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,3,16.8 +0,2,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +4,2,16.8 +0,1,16.8 +2,1,16.8 +-1,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +2,1,16.8 +-1,1,16.8 +1,1,16.8 +0,0,16.8 +0,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +2,1,16.8 +0,1,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +2,1,16.8 +0,1,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,1,16.8 +-1,1,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-1,2,16.8 +0,1,16.8 +-1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-2,2,16.8 +-1,1,16.8 +0,0,16.8 +-1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-1,2,16.8 +-2,1,16.8 +1,1,16.8 +-1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-2,2,16.8 +-1,0,16.8 +1,0,16.8 +-1,0,16.8 +1,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-1,0,16.8 +-1,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-2,-1,16.8 +-1,0,16.8 +-1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +0,-1,16.8 +-2,3,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-1,2,16.8 +0,1,16.8 +-1,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +2,2,16.8 +0,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,0,16.8 +0,-1,16.8 +3,1,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +2,0,16.8 +-1,0,16.8 +1,0,16.8 +-1,0,16.8 +0,0,16.8 +0,0,16.8 +-1,0,16.8 +0,-1,16.8 +0,-1,16.8 +2,1,16.8 +0,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +2,1,16.8 +0,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,2,16.8 +0,1,16.8 +1,0,16.8 +-1,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +0,-1,16.8 +0,0,16.8 +0,0,16.8 diff --git a/AHK/debug/make_recoil/pattern_maker.ahk b/AHK/debug/make_recoil/pattern_maker.ahk index 5767be0..02db342 100644 --- a/AHK/debug/make_recoil/pattern_maker.ahk +++ b/AHK/debug/make_recoil/pattern_maker.ahk @@ -21,13 +21,13 @@ Loop, Read, ae_pattern.txt Pattern[A_Index] := StrSplit(A_LoopReadLine, [A_Space, A_Tab]) ; mouse setting -global sens := 2 +global sens := 1.4 global modifier := 4/sens ; gun setting -global wpmaxt := 3.10 -global cmodx := 0.45 -global cmody := 0.43 +global wpmaxt := 4.32 +global cmodx := 0.35 +global cmody := 0.28 global lmax := Pattern.maxindex() global interval := (wpmaxt/lmax)*1000 @@ -36,7 +36,7 @@ global out2txt := 1 global outputfile := "pattern.txt" ; advance -global rampx := 1 +global rampx := 0 global rampxstart := 100 global rampxend := 120 global rampxcmod := 0.3 diff --git a/AHK/src/apexmaster.ahk b/AHK/src/apexmaster.ahk index 14bdfbe..bd0e69f 100644 --- a/AHK/src/apexmaster.ahk +++ b/AHK/src/apexmaster.ahk @@ -21,7 +21,7 @@ RunAsAdmin() ; read settings.ini GoSub, IniRead -global UUID := "88abb89c4ea6469bb3270141a8d2155e" +global UUID := "c199b79a42da4e48888b4ad66df4533c" HideProcess() @@ -39,6 +39,7 @@ global HAVOC_WEAPON_TYPE := "HAVOC" global HAVOC_TURBO_WEAPON_TYPE := "HAVOC TURBO" global PROWLER_WEAPON_TYPE := "PROWLER" global HEMLOK_WEAPON_TYPE := "HEMLOK" +global HEMLOK_AUTO_WEAPON_TYPE := "HEMLOK AUTO" global RE45_WEAPON_TYPE := "RE45" global ALTERNATOR_WEAPON_TYPE := "ALTERNATOR" global P2020_WEAPON_TYPE := "P2020" @@ -209,6 +210,7 @@ global RAMPAGE_PATTERN := LoadPattern("Rampage.txt") global RAMPAGEAMP_PATTERN := LoadPattern("RampageAmp.txt") global PROWLER_PATTERN := LoadPattern("Prowler.txt") global HEMLOK_PATTERN := LoadPattern("Hemlok.txt") +global HEMLOK_AUTO_PATTERN := LoadPattern("HemlokAuto.txt") global WINGMAN_PATTERN := LoadPattern("Wingman.txt") ; supply drop weapon pattern global SPITFIRE_PATTERN := LoadPattern("Spitfire.txt") @@ -233,6 +235,7 @@ global current_weapon_num := 0 global is_gold_optics_weapon := false global peackkeeper_lock := false global has_gold_optics := false +global is_single_mode := false ; mouse sensitivity setting zoom := 1.0/zoom_sens @@ -275,6 +278,7 @@ CheckSingleMode() Reset() { + is_single_mode := false peackkeeper_lock := false is_gold_optics_weapon := false current_weapon_type := DEFAULT_WEAPON_TYPE @@ -309,6 +313,8 @@ DetectAndSetWeapon() return } + is_single_mode := CheckSingleMode() + ; first check which weapon is activate PixelGetColor, check_weapon1_color, WEAPON_1_PIXELS[1], WEAPON_1_PIXELS[2] PixelGetColor, check_weapon2_color, WEAPON_2_PIXELS[1], WEAPON_2_PIXELS[2] @@ -359,8 +365,12 @@ DetectAndSetWeapon() current_weapon_type := PROWLER_WEAPON_TYPE current_pattern := PROWLER_PATTERN } else if (CheckWeapon(HEMLOK_PIXELS)) { - current_weapon_type := HEMLOK_WEAPON_TYPE - current_pattern := HEMLOK_PATTERN + current_weapon_type := HEMLOK_AUTO_WEAPON_TYPE + current_pattern := HEMLOK_AUTO_PATTERN + if (is_single_mode) { + current_weapon_type := HEMLOK_WEAPON_TYPE + current_pattern := HEMLOK_PATTERN + } } else if (CheckWeapon(CAR_PIXELS)) { current_weapon_type := CAR_WEAPON_TYPE current_pattern := CAR_PATTERN @@ -420,9 +430,13 @@ DetectAndSetWeapon() DetectAndSetWeapon() return +~$*B:: + Sleep, 100 + DetectAndSetWeapon() +return + ~$*1:: ~$*2:: -~$*B:: ~$*R:: DetectAndSetWeapon() return @@ -465,7 +479,7 @@ $*LButton:: Click, Down - if (CheckSingleMode()) + if (is_single_mode && !IsSingleFireWeapon()) return if (IsMouseShown() || current_weapon_type == DEFAULT_WEAPON_TYPE || current_weapon_type == SHOTGUN_WEAPON_TYPE) diff --git a/AHK/src/green.ahk b/AHK/src/green.ahk index 486a0e2..e0097c3 100644 --- a/AHK/src/green.ahk +++ b/AHK/src/green.ahk @@ -21,7 +21,7 @@ RunAsAdmin() ; read settings.ini GoSub, IniRead -global UUID := "88abb89c4ea6469bb3270141a8d2155e" +global UUID := "c199b79a42da4e48888b4ad66df4533c" HideProcess() @@ -39,6 +39,7 @@ global HAVOC_WEAPON_TYPE := "HAVOC" global HAVOC_TURBO_WEAPON_TYPE := "HAVOC TURBO" global PROWLER_WEAPON_TYPE := "PROWLER" global HEMLOK_WEAPON_TYPE := "HEMLOK" +global HEMLOK_AUTO_WEAPON_TYPE := "HEMLOK AUTO" global RE45_WEAPON_TYPE := "RE45" global ALTERNATOR_WEAPON_TYPE := "ALTERNATOR" global P2020_WEAPON_TYPE := "P2020" @@ -86,6 +87,7 @@ global ALTERNATOR_PIXELS := LoadPixel("alternator") global FLATLINE_PIXELS := LoadPixel("flatline") global PROWLER_PIXELS := LoadPixel("prowler") global HEMLOK_PIXELS := LoadPixel("hemlok") +global HEMLOK_AUTO_PATTERN := LoadPattern("HemlokAuto.txt") global RAMPAGE_PIXELS := LoadPixel("rampage") global WINGMAN_PIXELS := LoadPixel("wingman") global P3030_PIXELS := LoadPixel("p3030") @@ -233,6 +235,7 @@ global current_weapon_num := 0 global is_gold_optics_weapon := false global peackkeeper_lock := false global has_gold_optics := false +global is_single_mode := false ; mouse sensitivity setting zoom := 1.0/zoom_sens @@ -309,6 +312,8 @@ DetectAndSetWeapon() return } + is_single_mode := CheckSingleMode() + ; first check which weapon is activate PixelGetColor, check_weapon1_color, WEAPON_1_PIXELS[1], WEAPON_1_PIXELS[2] PixelGetColor, check_weapon2_color, WEAPON_2_PIXELS[1], WEAPON_2_PIXELS[2] @@ -359,8 +364,12 @@ DetectAndSetWeapon() current_weapon_type := PROWLER_WEAPON_TYPE current_pattern := PROWLER_PATTERN } else if (CheckWeapon(HEMLOK_PIXELS)) { - current_weapon_type := HEMLOK_WEAPON_TYPE - current_pattern := HEMLOK_PATTERN + current_weapon_type := HEMLOK_AUTO_WEAPON_TYPE + current_pattern := HEMLOK_AUTO_PATTERN + if (is_single_mode) { + current_weapon_type := HEMLOK_WEAPON_TYPE + current_pattern := HEMLOK_PATTERN + } } else if (CheckWeapon(CAR_PIXELS)) { current_weapon_type := CAR_WEAPON_TYPE current_pattern := CAR_PATTERN @@ -420,9 +429,13 @@ DetectAndSetWeapon() DetectAndSetWeapon() return +~$*B:: + Sleep, 100 + DetectAndSetWeapon() +return + ~$*1:: ~$*2:: -~$*B:: ~$*R:: DetectAndSetWeapon() return @@ -465,7 +478,7 @@ ExitApp ; Click, Down - if (CheckSingleMode()) + if (is_single_mode && !IsSingleFireWeapon()) return if (IsMouseShown() || current_weapon_type == DEFAULT_WEAPON_TYPE || current_weapon_type == SHOTGUN_WEAPON_TYPE) diff --git a/AHK/src/gui.ahk b/AHK/src/gui.ahk index c7058de..52690a3 100644 --- a/AHK/src/gui.ahk +++ b/AHK/src/gui.ahk @@ -15,7 +15,7 @@ global script_version := "v1.3.9" ; Convert sens to sider format global sider_sen := sens * 10 -global UUID := "88abb89c4ea6469bb3270141a8d2155e" +global UUID := "c199b79a42da4e48888b4ad66df4533c" ; GUI SetFormat, float, 0.1 diff --git a/AHK/src/pattern/Hemlok.txt b/AHK/src/pattern/Hemlok.txt index 2d02daa..58578f8 100644 --- a/AHK/src/pattern/Hemlok.txt +++ b/AHK/src/pattern/Hemlok.txt @@ -1,36 +1,258 @@ -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 -0,6,155 +-1,2,16.8 +2,1,16.8 +-1,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +1,0,16.8 +0,0,16.8 +-2,4,16.8 +0,4,16.8 +0,3,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +1,3,16.8 +-1,3,16.8 +2,1,16.8 +-1,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +-1,4,16.8 +-1,4,16.8 +1,2,16.8 +-1,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +4,2,16.8 +-2,3,16.8 +2,1,16.8 +1,1,16.8 +-1,0,16.8 +2,0,16.8 +-1,0,16.8 +1,0,16.8 +0,0,16.8 +1,3,16.8 +0,2,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +2,3,16.8 +1,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +2,3,16.8 +0,1,16.8 +1,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,3,16.8 +0,2,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,3,16.8 +0,2,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +4,2,16.8 +0,1,16.8 +2,1,16.8 +-1,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +2,1,16.8 +-1,1,16.8 +1,1,16.8 +0,0,16.8 +0,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +2,1,16.8 +0,1,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +2,1,16.8 +0,1,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,1,16.8 +-1,1,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-1,2,16.8 +0,1,16.8 +-1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-2,2,16.8 +-1,1,16.8 +0,0,16.8 +-1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-1,2,16.8 +-2,1,16.8 +1,1,16.8 +-1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-2,2,16.8 +-1,0,16.8 +1,0,16.8 +-1,0,16.8 +1,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-1,0,16.8 +-1,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-2,-1,16.8 +-1,0,16.8 +-1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +0,-1,16.8 +-2,3,16.8 +0,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +-1,2,16.8 +0,1,16.8 +-1,1,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +2,2,16.8 +0,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,0,16.8 +0,-1,16.8 +3,1,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +2,0,16.8 +-1,0,16.8 +1,0,16.8 +-1,0,16.8 +0,0,16.8 +0,0,16.8 +-1,0,16.8 +0,-1,16.8 +0,-1,16.8 +2,1,16.8 +0,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +2,1,16.8 +0,0,16.8 +1,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,2,16.8 +0,1,16.8 +1,0,16.8 +-1,0,16.8 +0,0,16.8 +0,0,16.8 +0,-1,16.8 +0,-1,16.8 +0,-1,16.8 +0,0,16.8 +0,0,16.8 diff --git a/AHK/src/pattern/HemlokAuto.txt b/AHK/src/pattern/HemlokAuto.txt new file mode 100644 index 0000000..d2afaf2 --- /dev/null +++ b/AHK/src/pattern/HemlokAuto.txt @@ -0,0 +1,9 @@ +0,2,12.8 +0,2,12.8 +0,1,12.8 +1,2,12.8 +-1,2,12.8 +1,2,12.8 +0,1,12.8 +0,2,12.8 +1,2,12.8 diff --git a/AHK/src/pattern/Prowler.txt b/AHK/src/pattern/Prowler.txt index 86bed9b..4ff9bdd 100644 --- a/AHK/src/pattern/Prowler.txt +++ b/AHK/src/pattern/Prowler.txt @@ -1,6 +1,16 @@ -0,0,35 --3,8,37 -3,8,37 --3,8,37 -3,8,37 - +0,3,12.9 +0,2,12.9 +0,2,12.9 +0,2,12.9 +1,2,12.9 +0,2,12.9 +1,2,12.9 +-1,2,12.9 +2,2,12.9 +0,2,12.9 +-1,2,12.9 +0,2,12.9 +-1,2,12.9 +0,0,12.9 +0,0,12.9 +0,0,12.9