From f2959c4939c592dd9a8486a84bd121db27447bfd Mon Sep 17 00:00:00 2001
From: Nemesh <prevter@gmail.com>
Date: Tue, 14 Jul 2020 11:03:55 +0300
Subject: [PATCH] v.0.1.1

---
 .vs/FloatToolGUI/v16/.suo | Bin 59904 -> 57856 bytes
 FloatToolGUI/Form1.cs     |  34 ++++++++++++++++------------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/.vs/FloatToolGUI/v16/.suo b/.vs/FloatToolGUI/v16/.suo
index c7dae7241a75da8ffef74958095b2f0c9a5935a2..ad038ba6aecb0477317e3343631e92d8bdc6d579 100644
GIT binary patch
delta 2477
zcmcIl4Qx|Y6n^*Zm37@KbX&KT{jf2%(aqAWV<?O<9<0i;4c2XCprXL|QOJl0Enz@h
znNFq>rTvJSD2W^X5h2087#2b37%C<xNC;5_83BwM6E&nWEK%w`T|0_d(D-wcbMHIf
zJ?GqezkAMoo(plFQ*nDLnf(5o2_nnG<gQ%3^WmHi9=ynA2!h}#!8UOl`v^l~ho*%C
zy=afy&fddN+|-T)u7`Nbij2v892fb%#qlKmJ()`?mkC_Pb0PbQd`#hz7|}EMn8t;C
z(jyqz86w|#e0+jSCYRr7Vx(b$l;GW1$|}5#DW=MZZBt~78u>PqqEur{qS(!R&dFsl
zmsW4%baZRX`kWYtDc;6vpIA>ch&khbVUPR`9^!LGd7w3QJe-~josamCxJ1uHe2`6)
z4<pxUU&IID#78z4ZA2%G+9a;$Mlj-G1Rd!)ALBxW9K7XSIs0EyVTy@eKvd}Ll8<Ak
z(V0=N)56duVTW#+bd11DI+J>Ryv%&Ei@grF+`(SM5byWGt#6R0a+C5%JnT%#M^Nwh
z&w^=)H9;MoSj+TmI$tH4S+tVoIS%YYd*&`*zFm&yD6tiueVotspgq4%rmLbWicTSz
z?~qBMTpa~n1usI}a#A)&z|o1|ma}>xdZkfR18yc_IK5WSC|#%A5z6FYO&BsQ!hmRF
z4!9?FBs6dXx^DsVbSa!*gG8Bw{I+spTT53$hsEl)GdzzaJt<LXjQB`cy5U`aS~b&$
zw{7D-(fz=c?nI4orZ2fh8%vVvO5V+Uh4%1y?}>3>X>b=dgyGy+I2A*M%{VPvm=W%&
z9Z+UT+VfPHyy3~gOkBP8EPBj2jG^B=H-2P7z-LG9Lsij!`KHh;tl4B;wb?6}d2yxq
z^0u;iwCB}gK(-;6=aBE^F0^ZE;e>HbambYU(bt7QU$GRgjKoH0on6lgxI!g!+iSf;
zrh20{WfTmqcfh{AL(hsh8m+EyHjt?k!#Q;_y#v!?oK#mXXNc2gy#plLvTC#xn%c-t
zvm7$j@(2_GgIP{3(Qw-;+ac54mc)RG;Y8*DZwR?RzDt(HZi4|sGeT@JhKwD|33uuu
zy+D~lk8N~4O*2;{3>Ph6`_y^GCz!9Z8r8`*1P)2q+F7S(WLbRM!;G7qb*MJZf#>OJ
z%1{mClVZ5a!nfqg+>I}78OX47CAGf#Q|FQcyPm&N^vVnC+%Fdj{0+u{h5Jr(z%lKx
zKh4hM>D+&;Wc(-jvMCV1^ek1ZfKRQn5U`ptzsdxqB+y$d`b&2){Af!>XfPe;t|eo+
z+ooH^ZSSvG=4fj0S;ur%m68SGpWJ36@PmTGW&;dmrSM!liTPz!@Nmp)Q&d(PVk~qQ
zlSa9$yxcOYbjJfL+cvL(&6*8Q^EfD$<$ulCGxZEhyYjKIYmdL;j41uwbf5s|D*JHy
z&`gwy62CZORC=rA-n}}1j0<i!yRm4ANqwVbMSO3C*t<gXRi3$P5L{ib40~EL@LPjc
zeX7+ds^<?{S$K&X_F}eBox8T5`Mb~O-GPe>1^*|3c$7W%rn>s{EggD~Sn!o%Mdbx8
zq&@}3q5;ke7I^yX3G@f2#?;UIx*6MwmJc6gCY&>ykaBbh^1q&>b{;)0Cid`3q1upy
zw~%}JZRA`&sQ!9fVJxhwiGy7%>6>sQ>TaG0^8O+8Tv-ccAmI0Zq4}S8fW*OLzEcWz
zUanOG{VfddT+2lukd5nu2glyner15gn)i?WII30OcCxWDTUEaEFkguRd7cq3Sq!-T
H{iQzu=fBdL

delta 3136
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
PVu~V5*=LtPmapzV8~T1a

diff --git a/FloatToolGUI/Form1.cs b/FloatToolGUI/Form1.cs
index 9cbd24a..8682d30 100644
--- a/FloatToolGUI/Form1.cs
+++ b/FloatToolGUI/Form1.cs
@@ -217,13 +217,13 @@ public void parseCraft(double[] inputs, List<dynamic> outputs, string want, bool
                 float minWear = item["minWear"];
                 float maxWear = item["maxWear"];
                 decimal flotOrigin = Math.Round(craft(inputs.ToArray(), minWear, maxWear), 9);
-                string flot = ToExactString((double)flotOrigin);
-                Console.WriteLine(flot);
+                //string flot = ToExactString((double)flotOrigin);
+                Console.WriteLine(flotOrigin);
                 //Debug.WriteLine("[DEBUG] flot = " + flot);
                 // if (wasSort && ((!asc && (double.Parse(flot) > double.Parse(want))) || (asc && (double.Parse(flot) < double.Parse(want))))) {
                 //     okSort = true;
                 //}
-                if (flot.StartsWith(want) || ("" + flotOrigin).StartsWith(want.Replace(".", ",")))
+                if (/*flot.StartsWith(want) ||*/ ("" + flotOrigin).StartsWith(want.Replace(".", ",")))
                 {
                     this.Invoke((MethodInvoker)(() =>
                     {
@@ -241,27 +241,25 @@ public void parseCraft(double[] inputs, List<dynamic> outputs, string want, bool
                                 Console.Write("");
                             }
                         }
-                        textBox2.Text += "Коомбинация найдена!" + Environment.NewLine;
-                        textBox2.Text += "Возможный флоат: " + flotOrigin + Environment.NewLine;
-                        textBox2.Text += "Список флоатов: [";
+                        textBox2.AppendText("Коомбинация найдена!" + Environment.NewLine);
+                        textBox2.AppendText("Возможный флоат: " + flotOrigin + Environment.NewLine);
+                        textBox2.AppendText("Список флоатов: [");
                         for (int i = 0; i < 10; i++)
                         {
-                            textBox2.Text += inputs[i];
+                            textBox2.AppendText(inputs[i].ToString().Replace(",","."));
                             if (i != 9)
                             {
-                                textBox2.Text += ", ";
+                                textBox2.AppendText(", ");
                             }
                             else
                             {
-                                textBox2.Text += "]" + Environment.NewLine + "======================================" + Environment.NewLine;
+                                textBox2.AppendText("]" + Environment.NewLine + "======================================" + Environment.NewLine);
                             }
                         }
-                        textBox1.SelectionStart = textBox1.Text.Length;
-                        textBox2.ScrollToCaret();
                     }
                     ));
                     
-                    //textBox2.Text += "IEEE754: " + flot + Environment.NewLine;
+                    //textBox2.AppendText( "IEEE754: " + flot + Environment.NewLine;
                     return;
                 }
             }
@@ -368,7 +366,7 @@ private void StartCalculation()
             this.Invoke((MethodInvoker)(() =>
                 {
                     textBox2.Text = "Добро пожаловать в FloatTool!" + Environment.NewLine + "Инструмент для создания флоатов при помощи крафтов CS:GO" + Environment.NewLine;
-                    textBox2.Text += "Время начала процесса: " + DateTime.Now.ToString("HH:mm:ss tt") + Environment.NewLine;
+                    textBox2.AppendText( "Время начала процесса: " + DateTime.Now.ToString("HH:mm:ss tt") + Environment.NewLine);
                     button2.Text = "Стоп";
                     textBox1.SelectionStart = textBox1.Text.Length;
                     textBox2.ScrollToCaret();
@@ -383,7 +381,7 @@ private void StartCalculation()
             Console.WriteLine(url);
             this.Invoke((MethodInvoker)(() =>
             {
-                textBox2.Text += "Загрузка скинов с торговой площадки..." + Environment.NewLine;
+                textBox2.AppendText( "Загрузка скинов с торговой площадки..." + Environment.NewLine);
                 progressBar1.Maximum = int.Parse(count);
                 progressBar1.Value = 0;
                 textBox1.SelectionStart = textBox1.Text.Length;
@@ -398,7 +396,7 @@ private void StartCalculation()
                 dynamic r = JsonConvert.DeserializeObject(json);
                 this.Invoke((MethodInvoker)(() =>
                     {
-                        textBox2.Text += "Получение флоатов..." + Environment.NewLine;
+                        textBox2.AppendText( "Получение флоатов..." + Environment.NewLine);
                         textBox1.SelectionStart = textBox1.Text.Length;
                         textBox2.ScrollToCaret();
                     }
@@ -451,7 +449,7 @@ private void StartCalculation()
             //}
             this.Invoke((MethodInvoker)(() =>
             {
-                textBox2.Text += "Поиск ауткамов..." + Environment.NewLine;
+                textBox2.AppendText( "Поиск ауткамов..." + Environment.NewLine);
                 textBox1.SelectionStart = textBox1.Text.Length;
                 textBox2.ScrollToCaret();
             }
@@ -478,7 +476,7 @@ private void StartCalculation()
             }
             this.Invoke((MethodInvoker)(() =>
             {
-                textBox2.Text += "Ауткамы найдены! Начинаю подбор..." + Environment.NewLine + Environment.NewLine;
+                textBox2.AppendText( "Ауткамы найдены! Начинаю подбор..." + Environment.NewLine + Environment.NewLine);
                 textBox1.SelectionStart = textBox1.Text.Length;
                 textBox2.ScrollToCaret();
             }
@@ -515,7 +513,7 @@ private void StartCalculation()
             }
             this.Invoke((MethodInvoker)(() =>
                 {
-                    textBox2.Text += "Программа завершила проверку всех комбинаций!" + Environment.NewLine;
+                    textBox2.AppendText( "Программа завершила проверку всех комбинаций!" + Environment.NewLine);
                     textBox1.SelectionStart = textBox1.Text.Length;
                     textBox2.ScrollToCaret();
                 }