Random HWID Generator Bug Fixed

SSinist3r · Jul 31, 2020 · 37373a6 · 37373a6
1 parent ccfbf89
commit 37373a6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/SSinSS/App.xaml.cs b/SSinSS/App.xaml.cs
@@ -19,7 +19,7 @@ public static void InitializeVersion()
             Assembly assembly = typeof(App).Assembly;
             AssemblyName assemblyName = assembly.GetName();
             Name = assemblyName.Name;
-            Version = assemblyName.Version.ToString(3) + "-beta8_a2";
+            Version = assemblyName.Version.ToString(3) + "-beta8_d2";
             IsBeta = true;
             Author = ((AssemblyCompanyAttribute)Attribute.GetCustomAttribute(assembly, typeof(AssemblyCompanyAttribute), false)).Company;
             Description = ((AssemblyDescriptionAttribute)Attribute.GetCustomAttribute(assembly, typeof(AssemblyDescriptionAttribute), false)).Description;

diff --git a/SSinSS/Views/LoginWindow.xaml.cs b/SSinSS/Views/LoginWindow.xaml.cs
@@ -99,7 +99,7 @@ private void LoginButton_Click(object sender, RoutedEventArgs e)
                 return;
             }
 
-            string deviceIdText = !MacRandomCheckBox.IsChecked.Value ? MacAddressTextBox.Text.Trim() : null;
+            string deviceIdText = !MacRandomCheckBox.IsChecked.Value ? MacAddressTextBox.Text.Trim() : HardwareHash.GenerateRandom().ToString();
             if (deviceIdText != null)
             {
                 if (Guid.TryParse(deviceIdText, out Guid deviceId))

diff --git a/SSinSS/Views/MainWindow.xaml.cs b/SSinSS/Views/MainWindow.xaml.cs
@@ -1409,14 +1409,14 @@ private void PokePokedexButton_Click(object sender, RoutedEventArgs e)
             try
             {
                 Bot.Game.SendPokedexRequest();
-                string pokedexdata = "Total Pokemons\nKanto: " + Bot.Game.KantoAllPoke.ToString().PadRight(8) + "Johto: " + Bot.Game.JohtoAllPoke.ToString() + "\nHoenn: " + Bot.Game.HoennAllPoke.ToString().PadRight(8) + "Sinnoh: " + Bot.Game.SinnohAllPoke.ToString().PadRight(8) + "Others: " + Bot.Game.OtherAllPoke.ToString()
-                                     + "\n\nKanto Pokemons\nSeen: " + Bot.Game.KantoSeen.ToString().PadRight(8) + "Captured: " + Bot.Game.KantoOwned.ToString().PadRight(8) + "Evolved: " + Bot.Game.KantoEvolved.ToString()
-                                     + "\n\nJohto Pokemons\nSeen: " + Bot.Game.JohtoSeen.ToString().PadRight(8) + "Captured: " + Bot.Game.JohtoOwned.ToString().PadRight(8) + "Evolved: " + Bot.Game.JohtoEvolved.ToString()
-                                     + "\n\nHoenn Pokemons\nSeen: " + Bot.Game.HoennSeen.ToString().PadRight(8) + "Captured: " + Bot.Game.HoennOwned.ToString().PadRight(8) + "Evolved: " + Bot.Game.HoennEvolved.ToString()
-                                     + "\n\nSinnoh Pokemons\nSeen: " + Bot.Game.SinnohSeen.ToString().PadRight(8) + "Captured: " + Bot.Game.SinnohOwned.ToString().PadRight(8) + "Evolved: " + Bot.Game.SinnohEvolved.ToString()
-                                     + "\n\nOther Pokemons\nSeen: " + Bot.Game.OtherSeen.ToString().PadRight(8) + "Captured: " + Bot.Game.OtherOwned.ToString().PadRight(8) + "Evolved: " + Bot.Game.OtherEvolved.ToString();
-
-                //string pokedexdata = "TotalPokemons\nKanto:" + Bot.Game.KantoAllPoke.ToString() + "\tJohto:" + Bot.Game.JohtoAllPoke.ToString() + "\nHoenn:" + Bot.Game.HoennAllPoke.ToString() + "\tSinnoh:" + Bot.Game.SinnohAllPoke.ToString() + "\tOthers:" + Bot.Game.OtherAllPoke.ToString() + "\nKantoPokemons\nSeen:" + Bot.Game.KantoSeen.ToString() + "\tCaptured:" + Bot.Game.KantoOwned.ToString() + "\tEvolved:" + Bot.Game.KantoEvolved.ToString() + "\nJohtoPokemons\nSeen:" + Bot.Game.JohtoSeen.ToString() + "\tCaptured:" + Bot.Game.JohtoOwned.ToString() + "\tEvolved:" + Bot.Game.JohtoEvolved.ToString() + "\nHoennPokemons\nSeen:" + Bot.Game.HoennSeen.ToString() + "\tCaptured:" + Bot.Game.HoennOwned.ToString() + "\tEvolved:" + Bot.Game.HoennEvolved.ToString() + "\nSinnohPokemons\nSeen:" + Bot.Game.SinnohSeen.ToString() + "\tCaptured:" + Bot.Game.SinnohOwned.ToString() + "\tEvolved:" + Bot.Game.SinnohEvolved.ToString() + "\nOtherPokemons\nSeen:" + Bot.Game.OtherSeen.ToString() + "\tCaptured:" + Bot.Game.OtherOwned.ToString() + "\tEvolved:" + Bot.Game.OtherEvolved.ToString(); 
+                string pokedexdata = "Total Pokemon\nKanto: " + Bot.Game.KantoAllPoke.ToString().PadRight(8) + "Johto: " + Bot.Game.JohtoAllPoke.ToString() + "\nHoenn: " + Bot.Game.HoennAllPoke.ToString().PadRight(8) + "Sinnoh: " + Bot.Game.SinnohAllPoke.ToString().PadRight(8) + "Others: " + Bot.Game.OtherAllPoke.ToString()
+                                     + "\n\nKanto Pokemon\nSeen: " + Bot.Game.KantoSeen.ToString().PadRight(8) + "Captured: " + Bot.Game.KantoOwned.ToString().PadRight(8) + "Evolved: " + Bot.Game.KantoEvolved.ToString()
+                                     + "\n\nJohto Pokemon\nSeen: " + Bot.Game.JohtoSeen.ToString().PadRight(8) + "Captured: " + Bot.Game.JohtoOwned.ToString().PadRight(8) + "Evolved: " + Bot.Game.JohtoEvolved.ToString()
+                                     + "\n\nHoenn Pokemon\nSeen: " + Bot.Game.HoennSeen.ToString().PadRight(8) + "Captured: " + Bot.Game.HoennOwned.ToString().PadRight(8) + "Evolved: " + Bot.Game.HoennEvolved.ToString()
+                                     + "\n\nSinnoh Pokemon\nSeen: " + Bot.Game.SinnohSeen.ToString().PadRight(8) + "Captured: " + Bot.Game.SinnohOwned.ToString().PadRight(8) + "Evolved: " + Bot.Game.SinnohEvolved.ToString()
+                                     + "\n\nOther Pokemon\nSeen: " + Bot.Game.OtherSeen.ToString().PadRight(8) + "Captured: " + Bot.Game.OtherOwned.ToString().PadRight(8) + "Evolved: " + Bot.Game.OtherEvolved.ToString();
+
+                //string pokedexdata = "TotalPokemon\nKanto:" + Bot.Game.KantoAllPoke.ToString() + "\tJohto:" + Bot.Game.JohtoAllPoke.ToString() + "\nHoenn:" + Bot.Game.HoennAllPoke.ToString() + "\tSinnoh:" + Bot.Game.SinnohAllPoke.ToString() + "\tOthers:" + Bot.Game.OtherAllPoke.ToString() + "\nKantoPokemon\nSeen:" + Bot.Game.KantoSeen.ToString() + "\tCaptured:" + Bot.Game.KantoOwned.ToString() + "\tEvolved:" + Bot.Game.KantoEvolved.ToString() + "\nJohtoPokemon\nSeen:" + Bot.Game.JohtoSeen.ToString() + "\tCaptured:" + Bot.Game.JohtoOwned.ToString() + "\tEvolved:" + Bot.Game.JohtoEvolved.ToString() + "\nHoennPokemon\nSeen:" + Bot.Game.HoennSeen.ToString() + "\tCaptured:" + Bot.Game.HoennOwned.ToString() + "\tEvolved:" + Bot.Game.HoennEvolved.ToString() + "\nSinnohPokemon\nSeen:" + Bot.Game.SinnohSeen.ToString() + "\tCaptured:" + Bot.Game.SinnohOwned.ToString() + "\tEvolved:" + Bot.Game.SinnohEvolved.ToString() + "\nOtherPokemon\nSeen:" + Bot.Game.OtherSeen.ToString() + "\tCaptured:" + Bot.Game.OtherOwned.ToString() + "\tEvolved:" + Bot.Game.OtherEvolved.ToString(); 
 
                 Clipboard.SetDataObject(pokedexdata + Environment.NewLine + GameClient.Evolution_Left + Environment.NewLine + "Total Evolutions Left: " + (GameClient.Evolution_Counter+8));
                 PokeIconButton.ToolTip = pokedexdata;