Merge pull request #8 from NecronomiconCoding/master

Merging latest
NecronomiconCoding · Jul 30, 2016 · ed66947 · ed66947
2 parents f223bef + 8284126
commit ed66947
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.es.json b/PoGo.NecroBot.CLI/Config/Translations/translation.es.json
@@ -244,6 +244,10 @@
       "Key": "finishedUnpackingFiles",
       "Value": "Terminada la desempaquetación de los archivos..."
     },
+    {
+      "Key": "finishedTransferringConfig",
+      "Value": "Terminado de transferir su configuración a la nueva versión..."
+    },
     {
       "Key": "updateFinished",
       "Value": "Actualización terminada, puede cerrar esta ventana ahora."
@@ -372,9 +376,25 @@
       "Key": "snipeScan",
       "Value": "[Sniper] Escaneando en busca de Pokemons en {0}..."
     },
+    {
+      "Key": "snipeScanEx",
+      "Value": "[Sniper] Sniping a {0} con {1} IV en {2}..."
+    },
     {
       "Key": "noPokemonToSnipe",
       "Value": "[Sniper] No se encontraron Pokemons :("
+    },
+    {
+      "Key": "notEnoughPokeballsToSnipe",
+      "Value": "No hay suficientes Pokeballs para iniciar Sniping! ({0}/{1})"
+    },
+    {
+      "Key": "displayHighestMOVE1Header",
+      "Value": "MOVIMIENTO1"
+    },
+    {
+      "Key": "displayHighestMOVE2Header",
+      "Value": "MOVIMIENTO2"
     }
   ]
 }
diff --git a/PoGo.NecroBot.Logic/Settings.cs b/PoGo.NecroBot.Logic/Settings.cs
@@ -503,7 +503,7 @@ double ISettings.DefaultLatitude
         {
             get
             {
-                return _settings.DefaultLatitude + _rand.NextDouble() * (_settings.MaxSpawnLocationOffset / 111111);
+                return _settings.DefaultLatitude + _rand.NextDouble() * ((double)_settings.MaxSpawnLocationOffset / 111111);
             }
 
             set
@@ -516,7 +516,7 @@ double ISettings.DefaultLongitude
         {
             get
             {
-                return _settings.DefaultLongitude + _rand.NextDouble() * (_settings.MaxSpawnLocationOffset / 111111 / Math.Cos(_settings.DefaultLatitude));
+                return _settings.DefaultLongitude + _rand.NextDouble() * ((double)_settings.MaxSpawnLocationOffset / 111111 / Math.Cos(_settings.DefaultLatitude));
             }
 
             set
-Original file line number
+Diff line change
@@ Expand Up / @@ -503,7 +503,7 @@ double ISettings.DefaultLatitude @@
             {
                 get
                 {
-                    return _settings.DefaultLatitude + _rand.NextDouble() * (_settings.MaxSpawnLocationOffset / 111111);
+                    return _settings.DefaultLatitude + _rand.NextDouble() * ((double)_settings.MaxSpawnLocationOffset / 111111);
                 }
                 set
@@ Expand All / @@ -516,7 +516,7 @@ double ISettings.DefaultLongitude @@
             {
                 get
                 {
-                    return _settings.DefaultLongitude + _rand.NextDouble() * (_settings.MaxSpawnLocationOffset / 111111 / Math.Cos(_settings.DefaultLatitude));
+                    return _settings.DefaultLongitude + _rand.NextDouble() * ((double)_settings.MaxSpawnLocationOffset / 111111 / Math.Cos(_settings.DefaultLatitude));
                 }
                 set
@@ Expand Down @@