From 5850eaf4b3b6e8da7901f88f5796455eb19d79ff Mon Sep 17 00:00:00 2001 From: cadaei Date: Mon, 12 Mar 2018 20:56:14 +0100 Subject: [PATCH] fix for extraction. tab-order-fix for stat-multipliers. --- ARKBreedingStats/Extraction.cs | 2 +- ARKBreedingStats/Properties/AssemblyInfo.cs | 2 +- ARKBreedingStats/json/ocr_3840x2160_100.json | 1 + ARKBreedingStats/settings/MultiplierSetting.Designer.cs | 8 ++++---- ARKBreedingStats/ver.txt | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 ARKBreedingStats/json/ocr_3840x2160_100.json diff --git a/ARKBreedingStats/Extraction.cs b/ARKBreedingStats/Extraction.cs index a76cacea..5b025fcd 100644 --- a/ARKBreedingStats/Extraction.cs +++ b/ARKBreedingStats/Extraction.cs @@ -358,7 +358,7 @@ public void extractLevels(int speciesI, int level, List statIOs, double { int postTameLevelMin = (int)Math.Floor((double)wildLevel * (1 + tamingEffectivenessMin / 2)); int postTameLevelMax = (int)Math.Floor((double)wildLevel * (1 + tamingEffectivenessMax / 2)); - if (wildLevelSum <= postTameLevelMin && wildLevelSum >= postTameLevelMax) + if (wildLevelSum >= postTameLevelMin && wildLevelSum <= postTameLevelMax) impossibleTE = false; } } diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs index ebe636e8..7d956bf3 100644 --- a/ARKBreedingStats/Properties/AssemblyInfo.cs +++ b/ARKBreedingStats/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("0.26.1")] +[assembly: AssemblyFileVersion("0.26.2")] diff --git a/ARKBreedingStats/json/ocr_3840x2160_100.json b/ARKBreedingStats/json/ocr_3840x2160_100.json new file mode 100644 index 00000000..cdbb466b --- /dev/null +++ b/ARKBreedingStats/json/ocr_3840x2160_100.json @@ -0,0 +1 @@ +{"description":"","fontSizes":[13,15,23,18],"guiZoom":100,"labelRectangles":[{"height":12,"width":158,"x":960,"y":508},{"height":12,"width":158,"x":960,"y":551},{"height":12,"width":158,"x":960,"y":594},{"height":12,"width":158,"x":960,"y":637},{"height":12,"width":158,"x":960,"y":680},{"height":12,"width":158,"x":960,"y":723},{"height":12,"width":158,"x":960,"y":766},{"height":12,"width":158,"x":960,"y":809},{"height":12,"width":158,"x":960,"y":852},{"height":23,"width":132,"x":1219,"y":262},{"height":23,"width":306,"x":1126,"y":216},{"height":18,"width":202,"x":1178,"y":310},{"height":13,"width":92,"x":1238,"y":291}],"letterArrays":[[[2,0,3,3,3,3,1,1,0,3,3],[8,0,72,40,40,254,36,127,20,20,18],[5,4,30,7,5,7,28,20,28,15,4],[9,0,71,69,37,501,341,335,328,324,452],[8,0,30,50,18,30,142,155,113,115,158],[1,0,1,1,1],[2,0,2,3,1,1,1,1,1,1,1,3,2],[2,0,1,3,2,2,2,2,2,2,2,3,1],[5,4,4,31,14,10,10],[5,0,0,4,4,4,31,4,4,4],[1,0,0,0,0,0,0,0,0,0,1,1,1],[2,0,0,0,0,0,0,3],[2,0,0,0,0,0,0,0,0,3,3],[5,0,24,8,8,12,4,6,2,2,3],[5,0,14,27,17,17,17,17,17,27,14],[4,0,12,14,13,12,12,12,12,12,12],[5,0,14,25,16,24,8,4,2,3,31],[5,0,15,25,16,24,14,24,16,24,15],[7,0,48,56,56,52,54,50,127,48,48],[5,0,31,3,1,15,24,16,16,24,15],[5,0,28,2,1,13,19,17,17,27,14],[5,0,31,16,24,8,8,12,4,6,2],[5,0,14,25,17,27,14,27,17,17,14],[5,0,14,27,17,17,27,22,16,24,7],[2,0,0,0,3,3,0,0,0,3,3],[2,0,0,0,3,3,0,0,0,0,3,1,1],[5,0,0,0,24,6,3,7,28],[5,0,0,0,31,0,0,31],[5,0,0,0,3,12,24,28,7],[4,0,15,8,8,12,6,2,0,2,2],[10,0,248,390,626,585,589,581,585,441,6,124],[9,0,16,56,40,108,68,254,198,130,387],[7,0,63,99,99,99,63,99,67,99,63],[6,0,60,38,3,1,1,1,3,6,60],[8,0,63,99,195,195,131,195,195,99,63],[5,0,31,3,3,3,31,3,3,3,31],[5,0,31,3,3,3,31,3,3,3,3],[7,0,60,6,3,1,113,97,67,102,124],[8,0,195,195,195,195,255,195,195,195,195],[2,0,3,3,3,3,3,3,3,3,3],[3,0,0,4,4,4,4,4,4,4,4,4,6,3],[7,0,35,51,27,15,15,27,19,51,99],[6,0,3,3,3,3,3,3,3,3,63],[10,0,771,903,903,975,843,843,827,819,819],[8,0,195,199,207,203,219,211,243,227,195],[8,0,60,102,195,129,129,129,195,102,60],[6,0,31,51,35,51,31,3,3,3,3],[8,0,60,102,195,129,129,129,195,102,60,96,64],[6,0,31,63,49,49,29,25,25,49],[5,0,30,19,1,3,14,24,16,25,15],[7,0,127,8,8,8,8,8,8,8,8],[8,0,195,195,195,195,195,195,195,102,60],[8,0,195,66,66,102,36,36,60,24,24],[12,0,3171,1122,1122,1266,1686,660,924,780,780],[8,0,66,102,36,24,24,60,36,102,195],[8,0,195,66,38,60,24,24,24,24,24],[5,0,31,24,24,12,4,6,3,3,31],[3,0,7,1,1,1,1,1,1,1,1,1,7],[5,0,3,2,2,6,4,12,8,8,24],[3,0,7,4,4,4,4,4,4,4,4,4,7],[5,0,4,6,10,9,17,17],[6,0,0,0,0,0,0,0,0,0,0,0,63],[2,1,2],[6,0,0,0,30,48,48,62,49,49,47],[6,1,1,1,31,51,35,35,35,51,29],[4,0,0,0,14,3,1,1,1,3,14],[6,32,32,32,62,51,49,33,49,51,46],[5,0,0,0,14,31,19,31,3,31,4],[4,14,2,2,15,3,2,2,2,2,2],[7,0,0,0,124,50,34,50,28,2,62,99,35,30],[6,1,1,1,31,51,35,33,33,33,33],[2,0,3,0,3,3,3,3,3,3],[3,6,6,0,6,6,6,6,6,6,6,6,6,3],[5,1,1,1,17,9,13,7,11,25,17],[2,3,3,3,3,3,3,3,3,3,3],[9,0,0,0,0,511,307,273,273,273,273,273],[6,0,0,0,29,51,35,33,33,33,33],[6,0,0,0,30,51,33,33,33,51,30],[6,0,0,0,29,51,35,35,35,51,31,1,1,1],[6,0,0,0,46,51,49,33,49,51,62,32,32,32],[5,0,0,0,25,7,3,3,3,3,3],[4,0,0,0,15,1,3,14,8,8,15],[3,0,2,3,7,3,3,3,3,3,6],[6,0,0,0,33,33,33,33,49,51,46],[7,0,0,0,99,34,34,54,20,28,8],[11,0,0,0,1571,626,594,854,476,396,396],[5,0,0,0,17,27,14,14,14,27,17],[7,0,0,0,99,34,34,54,20,28,8,8,12,7],[4,0,0,0,15,12,4,6,2,1,15],[5,0,24,12,4,4,4,3,6,4,4,12,24],[2,3,3,3,3,3,3,3,3,3,3,3,3,3],[5,0,3,6,4,4,4,24,12,4,4,14,7],[2,0,0,0,0,3,1]],[[3,0,0,7,7,7,7,7,7,7,0,7,7],[12,0,0,952,408,4095,4095,460,204,2047,204,230,102],[7,0,0,28,63,55,3,63,126,112,127,31,28],[13,3710,3687,1895,1023,1022,448,224,4080,8176,6584,6556,8092,8078,1024],[10,0,0,127,7,3,199,1022,199,195,231,255,126],[2,0,0,3,3,3],[4,0,0,14,7,7,7,7,3,3,3,7,7,7,6,14],[4,0,0,7,7,7,6,14,14,14,14,14,6,7,7,3],[5,0,0,23,31,15,11],[6,0,0,0,0,0,12,12,63,63,12,12],[3,0,0,0,0,0,0,0,0,0,0,0,7,3,3],[4,0,0,0,0,0,0,0,15,15],[3,0,0,0,0,0,0,0,0,0,0,0,7,7,7],[10,960,448,480,224,240,112,120,56,28,28,30,14,7,7],[13,1016,4092,3870,7694,7183,7175,7175,7175,7175,7183,3598,4094,2044,1016],[5,30,31,28,28,28,28,28,28,28,28,28,28,28,12],[10,510,511,967,896,896,896,448,480,240,120,60,927,1023,1023],[10,254,511,963,896,896,448,508,508,896,896,896,963,511,254],[11,480,224,112,120,952,924,926,910,975,2047,2047,896,896,896],[10,1022,510,6,7,7,255,1023,962,896,896,896,511,511,126],[11,240,248,60,30,207,1023,2047,1799,1799,1799,1927,1023,510,248],[10,1023,1023,896,384,448,192,224,96,112,56,56,28,28,14],[11,1022,2047,1799,1799,1935,1022,510,2047,1799,1799,1799,2047,1022,248],[11,1022,1935,1799,1799,1799,1807,2046,2046,896,960,496,248,56,16],[3,0,0,0,0,7,7,0,0,0,0,0,0,0,7,7],[4,0,0,0,0,14,14,0,0,0,0,0,15,7,7],[7,0,0,0,0,0,112,124,31,15,62,112,64],[6,0,0,0,0,0,0,63,63,0,63],[7,0,0,0,0,0,3,31,124,120,63,7,1],[7,0,0,127,112,96,112,126,30,14,0,14,14],[15,0,480,4092,7710,14823,16375,30471,30691,30707,30527,14335,16375,7694,124,112],[11,0,0,120,120,252,252,462,510,502,911,903,1795],[9,0,0,255,455,455,231,127,487,455,455,511,255],[9,0,112,510,271,7,7,7,7,7,15,510,508],[10,0,0,511,455,903,903,903,903,903,967,511,255],[11,2047,2047,7,7,7,7,2047,2047,1023,7,7,7,7,2047,2047],[8,0,0,255,7,7,7,127,127,7,7,7,7],[9,0,112,510,271,7,7,7,455,455,455,510,508],[10,0,0,903,903,903,903,1023,1023,903,903,903,903],[3,0,0,7,7,7,7,7,7,7,7,7,7],[4,0,0,14,14,14,14,14,14,14,14,15,7],[11,0,0,967,231,119,127,63,127,247,231,455,1927],[9,7,7,7,7,7,7,7,7,7,7,7,7,7,511,511],[12,0,0,3591,3855,3855,3999,3999,4095,4095,3831,3831,3687],[10,0,0,903,911,927,959,951,1015,999,967,967,903],[11,0,112,510,911,1799,1799,1799,1799,1799,903,1022,508],[9,0,0,255,487,455,455,247,127,7,7,7,7],[11,0,112,510,911,1799,1799,1799,1799,1799,903,1022,508,224,448,384],[10,0,0,255,455,455,455,255,63,119,231,487,967],[9,0,56,255,135,3,7,255,254,448,448,255,127],[8,0,0,255,28,28,28,28,28,28,28,28,28],[10,0,0,903,903,903,903,903,903,903,903,510,252],[16,61447,28687,30735,30750,14366,15388,7228,7740,3704,3704,3952,2032,2016,992,992],[13,0,0,7395,7411,7667,7671,3519,3999,3999,3855,3854,1550],[11,0,0,1927,462,254,252,120,120,252,494,463,1927],[10,0,0,967,455,238,238,124,56,56,56,56,56],[8,0,0,255,224,96,112,56,28,14,6,255,255],[4,0,0,15,3,3,3,3,3,3,3,3,3,3,15,15],[7,0,0,7,7,14,14,28,28,56,56,112,112],[5,0,0,31,28,28,28,28,28,28,28,28,28,28,31,31],[7,0,0,28,30,62,51,115],[7,0,0,0,0,0,0,0,0,0,0,0,0,127,127],[4,0,0,15],[7,0,0,0,0,30,127,112,126,127,115,127,127],[8,0,0,7,7,63,127,231,231,231,231,127,63],[6,0,0,0,0,60,63,7,3,3,7,63,62],[7,0,0,96,96,124,127,103,99,99,103,127,126],[7,0,0,0,0,28,127,119,127,127,3,127,126],[6,0,62,63,7,31,31,7,7,7,7,7,7],[8,0,0,0,0,124,255,231,227,227,231,255,254,96,127,31],[8,0,0,7,7,63,127,231,231,231,231,231,231],[3,0,0,7,0,7,7,7,7,7,7,7,7],[3,0,0,7,0,7,7,7,7,7,7,7,7,7,3,3],[8,0,0,7,7,127,255,231,231,127,63,119,231],[3,0,0,7,7,7,7,7,7,7,7,7,7],[12,0,0,0,0,1979,4095,3703,3703,3703,3703,3703,3703],[8,0,0,0,0,59,127,231,231,231,231,231,231],[8,0,0,0,0,60,127,231,227,227,227,127,62],[8,0,0,0,0,30,127,231,231,231,231,127,63,7,7,7],[8,0,0,0,0,124,255,231,227,227,227,255,254,224,224,224],[5,0,0,0,0,27,31,7,7,7,7,7,7],[7,0,0,0,0,62,63,3,31,127,112,127,63],[4,0,0,0,3,15,15,7,7,7,7,15,15],[8,0,0,0,0,231,231,231,231,231,231,255,254],[8,0,0,0,0,227,115,119,55,62,62,30,28],[11,0,0,0,0,1843,1907,1915,1023,1023,991,974,462],[8,0,0,0,0,227,119,62,30,28,62,119,243],[8,0,0,0,0,227,115,119,55,62,62,30,28,12,14,7],[7,0,0,0,0,127,127,56,28,14,6,7,63],[5,0,0,28,14,14,14,14,7,7,14,14,14,14,14,28],[3,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7],[5,0,0,7,7,7,7,7,30,30,7,7,7,7,7,3],[6,0,0,0,0,0,0,0,47,63],[11,136,260,260,260,136,112,32,32,2047,32,32,32,32],[13,6144,5120,4608,4352,4224,4188,34,65,65,65,34,28]],[[3,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,0,7,7,7],[19,0,0,0,57792,29120,29120,28864,524286,524286,14561,14432,6256,7280,262143,131071,3128,3640,3640,3612],[11,0,0,0,120,120,508,1022,991,7,15,511,1022,1984,1920,967,1023,510,120,120],[16,0,0,0,30846,15615,7399,7911,4071,2046,1980,960,480,16096,32752,30712,25528,62396,32542,15887],[15,0,0,0,2044,2046,1823,15,15,3599,7710,32764,32766,7711,7695,7695,7695,4031,4094,1016],[4,0,0,0,15,15,7,7,7],[6,0,0,0,60,28,30,30,30,14,15,15,15,15,15,15,15,15,15,14,30,30,28,60],[5,0,0,0,7,7,15,15,15,14,30,30,30,30,30,30,30,30,14,15,15,15,7,7],[7,0,0,0,12,45,127,78,30,63],[8,0,0,0,0,0,0,0,0,0,28,28,28,255,255,28,28,28],[5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,15,15,7,7],[5,0,0,0,0,0,0,0,0,0,0,0,0,31,31],[3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7],[11,0,0,0,1920,1920,960,960,480,480,240,240,120,124,60,62,30,31,15,7],[15,0,0,0,2032,8188,16254,15390,31759,30735,30735,30735,30735,30735,30735,31759,15390,16254,8188,2032],[5,0,0,0,30,31,30,30,30,30,30,30,30,30,30,30,30,30,30,30],[12,0,0,0,1020,2047,4063,3843,3840,3840,3840,1920,1984,992,496,248,124,4095,4095,4095],[12,0,0,0,511,2047,1999,3840,3840,1792,1984,1020,1020,1920,3840,3840,3840,2047,2047,511],[13,0,0,0,960,480,480,240,120,3960,3900,3870,3870,3855,4095,8191,8191,3840,3840,3840],[12,0,0,0,2046,2046,14,14,14,14,511,2047,1991,3841,3840,3840,3840,1927,2047,510],[13,0,0,256,448,992,1016,124,60,30,2046,4095,7951,7695,7695,7695,7695,7998,4092,1016],[11,0,0,0,2047,2047,2047,1920,960,960,480,480,240,240,120,60,60,30,30,15],[13,0,0,0,2044,4094,8127,7695,7695,7695,4094,2044,4094,7695,7695,7695,7695,8127,4094,2044],[13,0,0,0,2040,4094,7966,7695,7695,7183,7183,7711,8190,8188,3840,3968,1984,1008,504,112],[4,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,7,7,7],[5,0,0,0,0,0,0,0,30,30,30,0,0,0,0,0,0,0,30,15,15,7,7],[10,0,0,0,0,0,0,0,0,896,992,1016,255,31,15,127,1020,992,896],[8,0,0,0,0,0,0,0,0,0,0,255,255,0,0,255,255],[11,0,0,0,0,0,0,0,0,7,31,127,1020,2016,1984,1016,255,31,7],[10,0,0,0,255,511,995,960,896,960,960,510,254,30,30,30,0,30,30,30],[23,0,0,0,131008,524272,1032696,2031740,1982238,3997598,4063119,3792911,3792911,7995279,7995343,3793871,3793871,4060111,4063198,2097054,2080828,491772,2032,2016],[17,0,0,0,960,2016,2016,4080,4080,3696,7800,7800,15420,16316,32732,32734,28766,61455,61455,122887],[13,0,0,0,2047,4095,4095,7687,3591,3847,1927,999,4071,3847,7687,7687,7687,4095,4095,1023],[14,0,0,0,16368,16376,15612,62,30,15,15,15,15,15,15,30,62,15868,16376,16352],[15,0,0,0,1023,4095,8191,15879,15367,30727,30727,30727,30727,30727,15367,15367,15879,8191,4095,1023],[12,0,0,0,2047,2047,2047,7,7,7,7,2047,2047,7,7,7,7,4095,4095,4095],[11,0,0,0,2047,2047,2047,7,7,7,7,2047,2047,7,7,7,7,7,7,7],[14,0,0,0,16368,16376,15612,62,30,15,15,15,15,15375,15375,15390,15422,16124,16376,16352],[14,0,0,0,15367,15367,15367,15367,15367,15367,15367,16383,16383,15367,15367,15367,15367,15367,15367,15367],[3,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7],[6,0,0,0,56,56,56,56,56,56,56,56,56,56,56,56,60,63,31,15],[15,0,0,0,31751,7687,3847,1927,1991,999,503,247,503,999,1991,1927,3847,7943,15879,31751],[10,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,1023,1023,1023],[17,0,0,0,122895,122895,127007,127007,129087,129087,129087,121983,121975,122615,118503,118759,118759,116679,116679,115591],[15,0,0,0,30735,30751,30751,30783,30847,30847,30967,31207,31687,31687,32647,32519,32519,32263,31751,30727],[17,0,0,0,8176,32764,32508,63550,61470,122895,122895,122895,122895,122895,122895,61470,63550,32508,16376,8176],[13,0,0,0,1023,4095,4095,3847,7687,3847,3847,4039,2023,487,7,7,7,7,7,7],[17,0,0,0,8176,32764,32508,63550,61470,122895,122895,122895,122895,122895,122895,61470,63550,65276,32760,8176,3840,7680,15360,15360],[14,0,0,0,2047,4095,4095,7687,7687,3847,3847,2023,1015,487,999,1991,1927,3847,7943,15879],[13,0,0,0,4088,8190,7999,15,15,15,31,4095,8190,7680,7680,7680,7680,8095,4095,1022],[12,0,0,0,4095,4095,4095,112,112,112,112,112,112,112,112,112,112,112,112,112],[14,0,0,0,15367,15367,15367,15367,15367,15367,15367,15367,15367,15367,15367,15375,15375,8190,8190,2040],[17,0,0,0,126991,61455,63503,30751,30750,15422,15420,7740,7800,7800,4088,4080,2032,2016,992,992],[21,0,0,0,1969927,921351,991119,991119,999311,999375,473551,489966,522478,520446,520446,258174,254078,254076,254012,245820],[16,0,0,0,63503,30751,15422,15932,8056,4080,2032,992,2016,2032,4080,8056,15932,15422,30751,63503],[15,0,0,0,30735,15375,15390,7710,7740,3900,1912,2032,1008,992,480,480,480,480,480,480],[12,0,0,0,4095,4095,4095,1920,1920,960,480,240,120,120,60,30,15,4095,4095,4095],[7,0,0,0,127,127,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,127,127],[11,0,0,0,15,15,31,30,60,60,120,120,240,240,480,480,960,960,1920,1920],[6,0,0,0,63,63,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,63,63],[11,0,0,0,112,120,248,252,478,974,911,1927],[11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2047,2047],[5,0,0,0,15,15,30],[11,0,0,0,0,0,0,0,252,1022,2046,1920,1920,2046,2047,1935,1935,1999,2047,1918],[12,0,0,0,15,15,15,15,511,2047,2047,3855,3855,3855,3855,3855,3855,2015,2047,511],[10,0,0,0,0,0,0,0,1016,1022,1022,15,15,15,15,15,15,830,1022,1016],[12,0,0,0,3840,3840,3840,3840,4088,4094,4095,3855,3855,3855,3855,3855,3855,4094,4094,2040],[12,0,0,0,0,0,0,0,248,1022,2046,1935,1807,2047,4095,15,15,1598,2046,2040],[9,0,0,240,508,510,30,15,255,255,255,15,15,15,15,15,15,15,15,15],[12,0,0,0,0,0,0,0,1008,4092,4094,3855,3855,3855,3855,3855,3855,4095,4094,4088,3840,1922,2046,510],[12,0,0,0,15,15,15,15,1007,2047,4095,3855,3855,3855,3855,3855,3855,3855,3855,3855],[4,0,0,0,15,15,0,0,15,15,15,15,15,15,15,15,15,15,15,15],[4,0,0,0,15,15,0,0,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,7],[13,0,0,0,15,15,15,15,1007,4095,4095,3599,7695,3855,2031,495,975,1935,3983,7951],[4,0,0,0,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15],[19,0,0,0,0,0,0,0,61935,262143,262143,233359,231311,493455,493455,493455,493455,493455,493455,493455],[12,0,0,0,0,0,0,0,1007,2047,4095,3855,3855,3855,3855,3855,3855,3855,3855,3855],[12,0,0,0,0,0,0,0,504,2046,2046,3855,3855,3855,3855,3855,3855,3999,2046,504],[12,0,0,0,0,0,0,0,510,2047,2047,3855,3855,3855,3855,3855,3855,2047,2047,511,15,15,15,15],[12,0,0,0,0,0,0,0,2032,4092,4094,3855,3855,3855,3855,3855,3855,4095,4094,4092,3840,3840,3840,3840],[7,0,0,0,0,0,0,0,111,127,127,31,15,15,15,15,15,15,15,15],[11,0,0,0,0,0,0,0,508,1022,991,7,15,511,1022,1984,1920,967,1023,510],[7,0,0,0,0,0,7,7,127,127,127,15,15,15,15,15,15,31,127,126],[12,0,0,0,0,0,0,0,3855,3855,3855,3855,3855,3855,3855,3855,3855,4062,4094,3964],[12,0,0,0,0,0,0,0,3847,1927,1935,1935,974,990,478,508,508,252,248,120],[17,0,0,0,0,0,0,0,123847,123847,124879,59375,59375,61422,65278,32382,32382,31868,31804,15420],[12,0,0,0,0,0,0,0,3847,1935,990,510,508,248,248,508,508,990,1935,3975],[12,0,0,0,0,0,0,0,3847,1799,1935,1935,974,990,478,508,508,252,248,120,120,60,62,30],[10,0,0,0,0,0,0,0,1023,1023,1023,480,480,240,120,60,30,15,1023,1023],[7,0,0,0,124,60,60,28,30,30,30,30,31,15,7,15,30,30,30,30,30,28,60,124],[3,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7],[7,0,0,0,15,15,14,30,30,30,30,30,62,124,124,60,30,30,30,30,30,14,15,15],[8,0,0,0,0,0,0,0,0,0,0,0,3,255,255,240],[32,4261539840,4279238144,3753901952,3758096320,2415919088,134088696,66585592,132120828,130023548,264241214,260046910,260046911,528482335,528482335,528482335,528482335,260046911,260046911,264241214,130023550,132120828,66060792,66979832],[32,534774780,532677116,1065353470,1056964734,2130706559,2130706559,2113929279,2113929279,2113929279,2130706495,2130706559,2130706687,1065353470,532677116,535824380,536838140,268435448,134217712,67108800,16777088,4193792,1046528,520192]],[[3,0,7,7,7,7,7,7,7,7,7,7,0,7,7],[15,0,3168,3696,1648,1584,32767,1849,824,792,792,8191,412,396,462],[8,0,60,60,126,255,135,7,127,254,224,227,255,60,60],[12,0,3614,1855,947,947,511,254,240,112,4088,3804,3292,4046,1991],[11,0,56,254,143,7,391,911,2046,2047,903,903,967,511,252],[3,0,7,7,7,7],[5,0,28,14,14,15,7,7,7,7,7,7,7,7,7,14,14,30],[5,0,7,7,15,14,14,14,14,14,30,14,14,14,14,14,7,7],[5,0,6,6,31,22,15,13],[6,0,0,0,0,0,0,14,14,63,63,14,14,14],[4,0,0,0,0,0,0,0,0,0,0,0,0,15,7,7,7],[4,0,0,0,0,0,0,0,0,15,15],[2,0,0,0,0,0,0,0,0,0,0,0,0,3,3],[9,0,480,224,240,112,120,56,60,28,30,14,15,7,7],[12,0,240,1020,2014,1807,1799,3847,3847,3847,3847,1799,1935,1022,508],[3,0,6,7,7,7,7,7,7,7,7,7,7,7,7],[9,0,60,255,487,448,448,448,480,240,120,60,30,511,511],[9,0,62,255,487,448,448,480,254,254,448,448,481,255,127],[10,0,224,112,120,56,476,478,462,463,511,1023,960,448,448],[9,0,511,511,7,7,7,127,255,480,448,448,448,511,127],[10,0,96,240,252,30,14,511,1023,903,903,903,911,1022,252],[9,0,511,511,224,224,112,112,56,56,28,30,14,15,7],[10,0,120,510,975,903,903,510,510,1023,903,903,903,1023,510],[10,0,120,510,975,903,903,903,975,1022,960,480,240,124,60],[3,0,0,0,0,0,7,7,0,0,0,0,0,7,7],[3,0,0,0,0,0,7,7,0,0,0,0,0,7,7,7,3],[8,0,0,0,0,0,192,240,126,31,7,31,252,240,128],[7,0,0,0,0,0,0,0,127,127,0,127,127],[9,0,0,0,0,0,1,15,63,248,480,252,63,7,1],[8,0,14,127,113,224,224,112,127,31,7,7,0,7,7],[16,0,1984,16376,63612,57374,53231,57319,56327,57223,57319,56567,56439,57335,65518,63518,508,504],[13,0,240,240,496,504,1016,924,924,1822,2030,4094,3607,7687,7175],[11,0,255,1023,967,1927,903,967,503,967,1927,1927,1927,1023,511],[11,0,480,2044,1854,15,7,7,7,7,7,15,1054,2044,2040],[12,0,127,1023,1991,3847,3591,3591,3591,3591,3591,3847,1927,2047,511],[10,0,1023,1023,7,7,7,7,511,511,7,7,7,1023,1023],[9,0,511,511,7,7,7,7,511,511,7,7,7,7,7],[11,0,480,2044,1854,15,7,7,7,1799,1799,1807,1822,2046,2040],[12,0,3591,3591,3591,3591,3591,3591,4095,4095,3591,3591,3591,3591,3591],[3,0,7,7,7,7,7,7,7,7,7,7,7,7,7],[5,0,28,28,28,28,28,28,28,28,28,28,30,15,7],[13,0,3591,1799,903,455,487,247,119,247,487,967,1927,1799,7943],[8,0,7,7,7,7,7,7,7,7,7,7,7,255,255],[14,0,14351,14351,15375,15391,15903,15935,16191,16247,15223,15351,15335,14823,14791],[12,0,3591,3599,3615,3647,3647,3703,3815,4071,4039,3975,3975,3847,3591],[13,0,496,2044,4030,7695,7175,7175,7175,7175,7175,7695,3870,4094,1016],[11,0,255,1023,967,1927,1927,903,1015,503,55,7,7,7,7],[13,0,496,2044,4030,7695,7175,7175,7175,7175,7175,7695,3870,4094,1016,960,1920,1792,768],[12,0,255,1023,967,1927,1927,903,503,247,231,487,967,1927,3847],[10,0,248,1022,911,7,7,15,511,1020,896,896,897,1023,255],[9,0,511,511,56,56,56,56,56,56,56,56,56,56,56],[12,0,3591,3591,3591,3591,3591,3591,3591,3591,3591,3855,1806,2046,1016],[13,0,7687,7687,3591,3855,1806,1950,926,924,1020,504,504,240,240],[16,0,57795,58311,58343,29671,30695,30583,30583,32311,32318,15934,15390,15390,15390],[13,0,7687,3855,1934,924,1020,504,240,248,504,1020,1950,3855,7687],[12,0,3847,1799,1935,910,476,476,248,248,112,112,112,112,112],[10,0,1023,1023,896,448,480,224,112,56,28,30,15,1023,1023],[5,0,31,31,7,7,7,7,7,7,7,7,7,7,7,7,31,31],[9,0,7,7,15,14,30,28,60,56,120,112,240,224,480],[6,0,63,63,56,56,56,56,56,56,56,56,56,56,56,56,63,63],[9,0,24,60,60,126,118,231,451],[9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,511,511],[4,0,3,7,14],[9,0,0,0,0,0,255,255,480,508,511,487,487,511,510],[9,0,7,7,7,7,255,511,455,455,455,455,455,511,127],[8,0,0,0,0,0,254,255,7,7,7,7,7,255,252],[9,0,448,448,448,448,510,511,455,455,455,455,455,511,508],[9,0,0,0,0,0,254,255,455,455,511,7,7,254,252],[5,0,30,31,7,3,31,31,3,3,3,3,3,3,3],[9,0,0,0,0,0,510,511,455,455,455,455,455,511,508,448,511,255],[9,0,7,7,7,7,255,511,455,455,455,455,455,455,455],[3,0,7,7,0,0,7,7,7,7,7,7,7,7,7],[3,0,7,7,0,0,7,7,7,7,7,7,7,7,7,7,7,3,3],[10,0,7,7,7,7,511,1023,903,967,487,119,231,487,967],[3,0,7,7,7,7,7,7,7,7,7,7,7,7,7],[14,0,0,0,0,0,8191,16383,14823,14791,14791,14791,14791,14791,14791],[9,0,0,0,0,0,255,511,455,455,455,455,455,455,455],[10,0,0,0,0,0,254,511,455,455,967,455,455,511,124],[9,0,0,0,0,0,255,511,455,455,455,455,455,511,127,7,7,7],[9,0,0,0,0,0,510,511,455,455,455,455,455,511,510,448,448,448],[6,0,0,0,0,0,63,63,7,7,7,7,7,7,7],[8,0,0,0,0,0,255,255,7,63,255,224,224,255,127],[5,0,0,0,3,7,31,31,7,7,7,7,7,31,30],[9,0,0,0,0,0,455,455,455,455,455,455,455,511,510],[9,0,0,0,0,0,451,487,231,239,126,126,126,60,60],[14,0,0,0,0,0,15591,7415,7671,7671,4031,4030,3998,1822,1822],[9,0,0,0,0,0,487,239,126,60,60,124,126,231,487],[9,0,0,0,0,0,451,487,231,239,126,126,126,60,60,28,30,15,6],[8,0,0,0,0,0,255,255,112,56,28,30,15,255,255],[5,0,28,14,14,14,14,14,15,7,3,7,15,14,14,14,14,30],[3,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7],[6,0,7,7,7,15,15,14,14,62,60,30,14,14,15,15,7,7],[6,0,0,0,0,0,0,0,0,39,63,56]]],"letters":[["!","#","$","%","&","'","(",")","*","+",",","-",".","\/","0","1","2","3","4","5","6","7","8","9",":",";","<","=",">","?","@","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","[","\\","]","^","_","`","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","{","|","}","~"],["!","#","$","%","&","'","(",")","*","+",",","-",".","\/","0","1","2","3","4","5","6","7","8","9",":",";","<","=",">","?","@","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","[","\\","]","^","_","`","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","{","|","}","~","♀","♂"],["!","#","$","%","&","'","(",")","*","+",",","-",".","\/","0","1","2","3","4","5","6","7","8","9",":",";","<","=",">","?","@","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","[","\\","]","^","_","`","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","{","|","}","~","♂","♀"],["!","#","$","%","&","'","(",")","*","+",",","-",".","\/","0","1","2","3","4","5","6","7","8","9",":",";","<","=",">","?","@","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","[","\\","]","^","_","`","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","{","|","}","~"]],"resize":0.75,"resolutionHeight":2160,"resolutionWidth":3840,"statDistance":0} \ No newline at end of file diff --git a/ARKBreedingStats/settings/MultiplierSetting.Designer.cs b/ARKBreedingStats/settings/MultiplierSetting.Designer.cs index fef0d4ef..db774c04 100644 --- a/ARKBreedingStats/settings/MultiplierSetting.Designer.cs +++ b/ARKBreedingStats/settings/MultiplierSetting.Designer.cs @@ -56,7 +56,7 @@ private void InitializeComponent() 0}); this.numericUpDownWildLevel.Name = "numericUpDownWildLevel"; this.numericUpDownWildLevel.Size = new System.Drawing.Size(54, 20); - this.numericUpDownWildLevel.TabIndex = 2; + this.numericUpDownWildLevel.TabIndex = 0; this.numericUpDownWildLevel.Value = new decimal(new int[] { 1, 0, @@ -80,7 +80,7 @@ private void InitializeComponent() 0}); this.numericUpDownTameMult.Name = "numericUpDownTameMult"; this.numericUpDownTameMult.Size = new System.Drawing.Size(54, 20); - this.numericUpDownTameMult.TabIndex = 1; + this.numericUpDownTameMult.TabIndex = 3; this.numericUpDownTameMult.Value = new decimal(new int[] { 1, 0, @@ -104,7 +104,7 @@ private void InitializeComponent() 0}); this.numericUpDownTameAdd.Name = "numericUpDownTameAdd"; this.numericUpDownTameAdd.Size = new System.Drawing.Size(54, 20); - this.numericUpDownTameAdd.TabIndex = 0; + this.numericUpDownTameAdd.TabIndex = 2; this.numericUpDownTameAdd.Value = new decimal(new int[] { 1, 0, @@ -128,7 +128,7 @@ private void InitializeComponent() 0}); this.numericUpDownDomLevel.Name = "numericUpDownDomLevel"; this.numericUpDownDomLevel.Size = new System.Drawing.Size(54, 20); - this.numericUpDownDomLevel.TabIndex = 3; + this.numericUpDownDomLevel.TabIndex = 1; this.numericUpDownDomLevel.Value = new decimal(new int[] { 1, 0, diff --git a/ARKBreedingStats/ver.txt b/ARKBreedingStats/ver.txt index 43f45680..4a289303 100644 --- a/ARKBreedingStats/ver.txt +++ b/ARKBreedingStats/ver.txt @@ -1 +1 @@ -278.42.1,0.26.1 +278.42.1,0.26.2