diff --git a/.vs/FloatToolGUI/v16/.suo b/.vs/FloatToolGUI/v16/.suo index e29846c..ed83140 100644 Binary files a/.vs/FloatToolGUI/v16/.suo and b/.vs/FloatToolGUI/v16/.suo differ diff --git a/FloatToolGUI/About.Designer.cs b/FloatToolGUI/About.Designer.cs index 5d0fd73..6c00c5e 100644 --- a/FloatToolGUI/About.Designer.cs +++ b/FloatToolGUI/About.Designer.cs @@ -73,9 +73,9 @@ private void InitializeComponent() this.label2.ForeColor = System.Drawing.Color.White; this.label2.Location = new System.Drawing.Point(52, 56); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(132, 21); + this.label2.Size = new System.Drawing.Size(136, 21); this.label2.TabIndex = 2; - this.label2.Text = "Версия 0.4.1 GUI"; + this.label2.Text = "Версия 0.4.2 GUI"; // // label3 // diff --git a/FloatToolGUI/FloatToolGUI.csproj b/FloatToolGUI/FloatToolGUI.csproj index b5bd4fa..f24fe41 100644 --- a/FloatToolGUI/FloatToolGUI.csproj +++ b/FloatToolGUI/FloatToolGUI.csproj @@ -52,7 +52,7 @@ FloatToolGUI.Program - sketch-1586878181293.ico + floattool.ico true @@ -156,6 +156,7 @@ + diff --git a/FloatToolGUI/Main.cs b/FloatToolGUI/Main.cs index 4acb64e..8ebf5de 100644 --- a/FloatToolGUI/Main.cs +++ b/FloatToolGUI/Main.cs @@ -118,6 +118,7 @@ static public string getNextRarity(string rarity) } static public string getSkinData(string name) { + name = name.Replace("StatTrak™ ",""); //remove stattrack using (StreamReader r = new StreamReader("itemData.json")) { string json = r.ReadToEnd(); @@ -155,19 +156,19 @@ public void parseCraft(double[] inputs, List outputs, string want, bool inputStr[i] = "" + inputs[i]; } - string flot = craftF(inputStr, minWear, maxWear); - Console.WriteLine(flotOrigin + " | " + flot); + //string flot = craftF(inputStr, minWear, maxWear); + //Console.WriteLine(flotOrigin + " | " + flot); //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.Replace(".", ",")) || ("" + flotOrigin).StartsWith(want.Replace(".", ","))) + if (/*flot.StartsWith(want.Replace(".", ",")) ||*/ ("" + flotOrigin).StartsWith(want.Replace(".", ","))) { this.Invoke((MethodInvoker)(() => { textBox2.AppendText("Коомбинация найдена!" + Environment.NewLine); textBox2.AppendText("Возможный флоат: " + flotOrigin + Environment.NewLine); - textBox2.AppendText("Проверочный флоат: " + flot + Environment.NewLine); + //textBox2.AppendText("Проверочный флоат: " + flot + Environment.NewLine); textBox2.AppendText("Список флоатов: ["); if (!muteSound) { @@ -433,6 +434,7 @@ private void StartCalculation() progressBar1.Value = 0; textBox1.SelectionStart = textBox1.Text.Length; textBox2.ScrollToCaret(); + } )); @@ -440,6 +442,7 @@ private void StartCalculation() using (WebClient wc = new WebClient()) { string json = wc.DownloadString(url); + Console.WriteLine(json); dynamic r = JsonConvert.DeserializeObject(json); this.Invoke((MethodInvoker)(() => { diff --git a/FloatToolGUI/Main.resx b/FloatToolGUI/Main.resx index ec57190..523c54c 100644 --- a/FloatToolGUI/Main.resx +++ b/FloatToolGUI/Main.resx @@ -686,13 +686,13 @@ 137, 20 - 36, 15 + 38, 15 1 - v.0.4.1 + v.0.4.2 label9 diff --git a/FloatToolGUI/floattool.ico b/FloatToolGUI/floattool.ico new file mode 100644 index 0000000..5c5c73c Binary files /dev/null and b/FloatToolGUI/floattool.ico differ diff --git a/FloatToolGUI/sketch-1586878181293.ico b/FloatToolGUI/sketch-1586878181293.ico deleted file mode 100644 index e54431c..0000000 Binary files a/FloatToolGUI/sketch-1586878181293.ico and /dev/null differ