Update

PROBot/BattleAI.cs

@@ -47,6 +47,7 @@ public int UsablePokemonsCount
                 return usablePokemons;
             }
         }
+
         public bool UseMandatoryAction()
         {
             return RepeatAttack();
@@ -152,10 +153,10 @@ public bool UseMove(string moveName)
             return false;
         }
 
-        public bool UseItem(int itemId, int pokemonUid = 0)
+        public bool UseItem(int itemId, int pokemonUid = 0, int moveIndex = 0)
         {
             if (ActivePokemon.CurrentHealth == 0) return false;
-            _client.UseItem(itemId, pokemonUid);
+            _client.UseItem(itemId, pokemonUid, moveIndex);
             return true;
         }
 
@@ -237,6 +238,12 @@ private bool UseAttack(bool useBestAttack)
                     }
                 }
 
+                if (move.Id == DragonRage)
+                {
+                    if (opponentType1 == PokemonType.Fairy || opponentType2 == PokemonType.Fairy)
+                        power = 0;
+                }
+
                 if (power < 0.01) continue;
 
                 if (bestMove == null || power > bestPower)

PROBot/BotClient.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 
 namespace PROBot
 {
@@ -46,6 +47,7 @@ public enum State
         public Dictionary<int, TextOption> TextOptions { get; set; }
 
         private bool _loginRequested;
+        private bool _authenticationRequired;
 
         private Timeout _actionTimeout = new Timeout();
 
@@ -161,6 +163,8 @@ private void LoginUpdate()
             {
                 client = new GameClient(new GameConnection(server), new MapConnection());
             }
+
+            Encryption.Reset();
             SetClient(client);
             client.Open();
         }
@@ -176,6 +180,19 @@ public void Logout(bool allowAutoReconnect)
 
         public void Update()
         {
+            if (_authenticationRequired)
+            {
+                if (Encryption.StateReady)
+                {
+                    // TODO: Add an option to select the OS we want, it could be useful.
+                    Game.SendAuthentication(Account.Name,
+                        Account.Password,
+                        Account.DeviceId ?? Hardware.GenerateRandomHash(),
+                        Hardware.GenerateRandomOsInfo());
+                    _authenticationRequired = false;
+                }
+                return;
+            }
             AutoReconnector.Update();
 
             if (_loginRequested)
@@ -198,7 +215,7 @@ public void Update()
             if (Game.IsCreatingNewCharacter)
             {
                 LogMessage("Creating a new character with a random skin...");
-                Game.CreateCharacter(Rand.Next(14), Rand.Next(28), Rand.Next(8), Rand.Next(6), Rand.Next(5));
+                Game.CreateCharacter(Rand.Next(14), Rand.Next(28), Rand.Next(4), 695 + Rand.Next(6), Rand.Next(5));
                 return;
             }
 
@@ -261,17 +278,13 @@ public void LoadScript(string filename)
         {
             string input = File.ReadAllText(filename);
 
-            List<string> libs = new List<string>();
+            var libs = new List<string>();
             if (Directory.Exists("Libs"))
             {
-                string[] files = Directory.GetFiles("Libs");
-                foreach (string file in files)
-                {
-                    if (file.ToUpperInvariant().EndsWith(".LUA"))
-                    {
-                        libs.Add(File.ReadAllText(file));
-                    }
-                }
+                libs = Directory.GetFiles("Libs")
+                    .Where(f => f.EndsWith(".lua", StringComparison.InvariantCultureIgnoreCase))
+                    .Select(File.ReadAllText)
+                    .ToList();
             }
 
             BaseScript script = new LuaScript(this, Path.GetFullPath(filename), input, libs);
@@ -283,10 +296,10 @@ public void LoadScript(string filename)
                 Script.ScriptMessage += Script_ScriptMessage;
                 Script.Initialize();
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 Script = null;
-                throw ex;
+                throw;
             }
         }
 
@@ -402,7 +415,7 @@ private void ExecuteNextAction()
         private void Client_ConnectionOpened()
         {
             ConnectionOpened?.Invoke();
-            Game.SendAuthentication(Account.Name, Account.Password, Account.DeviceId ?? HardwareHash.GenerateRandom());
+            _authenticationRequired = true;
         }
 
         private void Client_ConnectionClosed(Exception ex)
@@ -441,7 +454,7 @@ private void Client_ConnectionFailed(Exception ex)
             SetClient(null);
         }
 
-        private void Client_DialogOpened(string message)
+        private void Client_DialogOpened(string message, string[] options)
         {
             if (Running == State.Started)
             {

PROBot/Modules/AutoReconnector.cs

@@ -29,6 +29,7 @@ public bool IsEnabled
         private bool _relogging;
         private double _reloggingDelay;
         private DateTime _autoReconnectTimeout;
+        private DateTime _botScriptDelay = DateTime.MaxValue;
 
         public AutoReconnector(BotClient bot)
         {
@@ -58,6 +59,12 @@ public void Update()
                     _autoReconnectTimeout = DateTime.UtcNow.AddSeconds(_bot.Rand.Next(MinDelay, MaxDelay + 1));
                 }
             }
+
+            if (_botScriptDelay < DateTime.UtcNow)
+            {
+                _bot.Start();
+                _botScriptDelay = DateTime.MaxValue;
+            }
         }
 
         public void Relog(double delay)
@@ -84,16 +91,18 @@ private void Client_LoggedIn()
             {
                 _reconnecting = false;
                 _relogging = false;
-                _bot.Start();
+                _botScriptDelay = DateTime.UtcNow.AddSeconds(10);
             }
         }
 
-        private void Client_AuthenticationFailed(AuthenticationResult result)
+        private void Client_AuthenticationFailed(string message)
         {
             _relogging = false;
-            if (result == AuthenticationResult.InvalidUser || result == AuthenticationResult.InvalidPassword
+            message = message.ToLowerInvariant();
+            if (/*result == AuthenticationResult.InvalidUser || result == AuthenticationResult.InvalidPassword
                 || result == AuthenticationResult.InvalidVersion || result == AuthenticationResult.Banned
-                || result == AuthenticationResult.EmailNotActivated)
+                || result == AuthenticationResult.EmailNotActivated*/
+                message.Contains("invalid") || message.Contains("ban") || message.Contains("email"))
             {
                 IsEnabled = false;
                 _reconnecting = false;

PROBot/Modules/MoveTeacher.cs

@@ -5,7 +5,7 @@ namespace PROBot.Modules
     public class MoveTeacher
     {
         public bool IsLearning { get; private set; }
-        public int PokemonUid { get; private set; }
+        public int PokemonDBid { get; private set; }
         public int MoveToForget { get; set; }
 
         private readonly BotClient _bot;
@@ -23,7 +23,7 @@ public bool Update()
             if (_learningTimeout.IsActive && !_learningTimeout.Update())
             {
                 IsLearning = false;
-                _bot.Game.LearnMove(PokemonUid, MoveToForget);
+                _bot.Game.LearnMove(PokemonDBid, MoveToForget);
                 return true;
             }
             return _learningTimeout.IsActive;
@@ -37,16 +37,15 @@ private void Bot_ClientChanged()
             }
         }
 
-        private void Game_LearningMove(int moveId, string moveName, int pokemonUid)
+        private void Game_LearningMove(int moveId, string moveName, int pokemonDBid)
         {
             if (_bot.Game == null || _bot.Script == null) return;
 
             IsLearning = true;
-            PokemonUid = pokemonUid;
+            PokemonDBid = pokemonDBid;
             MoveToForget = 0;
             _learningTimeout.Set(_bot.Rand.Next(1000, 3000));
-
-            _bot.Script.OnLearningMove(moveName, pokemonUid);
+            _bot.Script.OnLearningMove(moveName, _bot.Game.GetPokemonFromDBId(pokemonDBid).Uid);
         }
     }
 }

PROBot/Modules/MovementResynchronizer.cs

@@ -38,7 +38,7 @@ private void Game_BattleEnded()
             Reset();
         }
 
-        private void Game_DialogOpened(string message)
+        private void Game_DialogOpened(string message, string[] options)
         {
             Reset();
         }

PROBot/Modules/PokemonEvolver.cs

@@ -24,7 +24,7 @@ public bool IsEnabled
         private readonly BotClient _bot;
 
         private Timeout _evolutionTimeout = new Timeout();
-        public int _evolvingPokemonUid;
+        public int _evolvingPokemonDBid;
         public int _evolvingItem;
 
         public PokemonEvolver(BotClient bot)
@@ -39,11 +39,11 @@ public bool Update()
             {
                 if (IsEnabled)
                 {
-                    _bot.Game.SendAcceptEvolution(_evolvingPokemonUid, _evolvingItem);
+                    _bot.Game.SendAcceptEvolution(_evolvingPokemonDBid);
                 }
                 else
                 {
-                    _bot.Game.SendCancelEvolution(_evolvingPokemonUid, _evolvingItem);
+                    _bot.Game.SendCancelEvolution(_evolvingPokemonDBid);
                 }
                 return true;
             }
@@ -58,9 +58,9 @@ private void Bot_ClientChanged()
             }
         }
 
-        private void Game_Evolving(int evolvingPokemonUid, int evolvingItem)
+        private void Game_Evolving(int evolvingPokemonDBid, int evolvingItem)
         {
-            _evolvingPokemonUid = evolvingPokemonUid;
+            _evolvingPokemonDBid = evolvingPokemonDBid;
             _evolvingItem = evolvingItem;
             _evolutionTimeout.Set(_bot.Rand.Next(2000, 3000));
         }

PROBot/PROBot.csproj

@@ -34,8 +34,8 @@
       <HintPath>..\packages\MoonSharp.2.0.0.0\lib\net40-client\MoonSharp.Interpreter.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />