Merge pull request #1713 from Furtif/rocketbot_updates

Update POGOProtos to v2.10.1 and fixes appveyor warnigs
Necrobot-Private · May 18, 2017 · 783cc54 · 783cc54
2 parents 9708517 + 8a3467f
commit 783cc54
Show file tree

Hide file tree

Showing 12 changed files with 214 additions and 238 deletions.
diff --git a/NecroBot-Private for Pokemon GO.sln b/NecroBot-Private for Pokemon GO.sln
diff --git a/POGOProtos b/POGOProtos
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.fr.json b/PoGo.NecroBot.CLI/Config/Translations/translation.fr.json
@@ -126,11 +126,11 @@
     },
     {
       "Key": "eventPokemonCaptureSuccess",
-      "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | dist {8}m | {10} {9} restante(s) | {11}XP | {12} | lat: {13} long: {14} | Attaque1: {15} Attaque2: {16}"
+      "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | dist {8}m | avec une {9} ({10} restante(s)). | {11} EXP | {12} | lat: {13} long: {14} | Attaque1: {15} Attaque2: {16} | Rareté: {17} | Raison de capture: {18} | Shiny: {19} | Form: {20} | Costume: {21} |  Sex: {22}"
     },
     {
       "Key": "eventPokemonCaptureFailed",
-      "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | avec une {9} ({10} restante) | lat: {11} long: {12} | Attaque1: {13} Attaque2: {14}"
+      "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | avec une {9} ({10} restante(s)) | lat: {11} long: {12} | Attaque1: {13} Attaque2: {14}  | Rareté :{15}"
     },
     {
       "Key": "eventNoPokeballs",

diff --git a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -98,39 +98,6 @@
     <DebugType>None</DebugType>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release WPF GUI|AnyCPU'">
-    <OutputPath>bin\Release WPF GUI\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>None</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release WPF GUI|x86'">
-    <OutputPath>bin\x86\Release WPF GUI\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>None</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release WPF GUI|x64'">
-    <OutputPath>bin\x64\Release WPF GUI\</OutputPath>
-    <Optimize>true</Optimize>
-    <DebugType>None</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="costura32\sqlite3.dll" />
     <EmbeddedResource Include="costura64\sqlite3.dll" />

diff --git a/RocketBot2/Config/Translations/translation.fr.json b/RocketBot2/Config/Translations/translation.fr.json
@@ -126,11 +126,11 @@
     },
     {
       "Key": "eventPokemonCaptureSuccess",
-      "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | dist {8}m | {10} {9} restante(s) | {11}XP | {12} | lat: {13} long: {14} | Attaque1: {15} Attaque2: {16}"
+      "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | dist {8}m | avec une {9} ({10} restante(s)). | {11} EXP | {12} | lat: {13} long: {14} | Attaque1: {15} Attaque2: {16} | Rareté: {17} | Raison de capture: {18} | Shiny: {19} | Form: {20} | Costume: {21} |  Sex: {22}"
     },
     {
       "Key": "eventPokemonCaptureFailed",
-      "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | avec une {9} ({10} restante) | lat: {11} long: {12} | Attaque1: {13} Attaque2: {14}"
+      "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | avec une {9} ({10} restante(s)) | lat: {11} long: {12} | Attaque1: {13} Attaque2: {14}  | Rareté :{15}"
     },
     {
       "Key": "eventNoPokeballs",

diff --git a/RocketBot2/Config/Translations/translation.zh-TW.json b/RocketBot2/Config/Translations/translation.zh-TW.json
@@ -2612,6 +2612,46 @@
       "Key": "Avalanche",
       "Value": "雪崩"
     },
+    {
+      "Key": "BulletSeedFast",
+      "Value": "種子機關槍"
+    },
+    {
+      "Key": "FocusBlast",
+      "Value": "真氣彈"
+    },
+    {
+      "Key": "SkyAttack",
+      "Value": "神鳥猛擊"
+    },
+    {
+      "Key": "IronTailFast",
+      "Value": "鐵尾"
+    },
+    {
+      "Key": "ExtrasensoryFast",
+      "Value": "神通力"
+    },
+    {
+      "Key": "VoltSwitchFast",
+      "Value": "伏特替換"
+    },
+    {
+      "Key": "Overheat",
+      "Value": "過熱"
+    },
+    {
+      "Key": "RockBlast",
+      "Value": "岩石爆擊"
+    },
+    {
+      "Key": "FireSpinFast",
+      "Value": "火焰旋渦"
+    },
+    {
+      "Key": "SnarlFast",
+      "Value": "大聲咆哮"
+    },
     {
       "Key": "rockSmashFast",
       "Value": "岩石粉碎"

diff --git a/RocketBot2/Forms/MainForm.cs b/RocketBot2/Forms/MainForm.cs
@@ -427,23 +427,37 @@ private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
             //TODO: Kills the application
             try
             {
-                _playerOverlay.Dispose();
-                GC.SuppressFinalize(_playerOverlay);
-                _playerRouteOverlay.Dispose();
-                GC.SuppressFinalize(_playerRouteOverlay);
-                _pokemonsOverlay.Dispose();
-                GC.SuppressFinalize(_pokemonsOverlay);
-                _pokestopsOverlay.Dispose();
-                GC.SuppressFinalize(_pokestopsOverlay);
-                _searchAreaOverlay.Dispose();
-                GC.SuppressFinalize(_searchAreaOverlay);
-                GMapControl1.Dispose();
-                GC.SuppressFinalize(GMapControl1);
+                List<Control> listControls = new List<Control>();
+                foreach (Control control in Instance.Controls)
+                {
+                    listControls.Add(control);
+                }
+                foreach (Control control in listControls)
+                {
+                    Instance.Controls.Remove(control);
+                    control.Dispose();
+                    GC.SuppressFinalize(control);
+                }
+                // kills
+                Thread.CurrentThread.Abort(this);
             }
             catch
             {
-                Thread.CurrentThread.Abort(this);
+                Thread.ResetAbort();
+            }
+
+            try
+            {
+                foreach (var process in Process.GetProcessesByName(Assembly.GetExecutingAssembly().GetName().Name))
+                {
+                    process.Kill();
+                }
+            }
+            catch
+            {
+                //not implanted
             }
+            //*/
         }
 
         private void PokeEaseToolStripMenuItem_Click(object sender, EventArgs e)

diff --git a/RocketBot2/Forms/MainForm.designer.cs b/RocketBot2/Forms/MainForm.designer.cs
+2 −2		Properties/AssemblyInfo.cs
+2 −2		README.md
+15 −15		Settings/Master/CameraSettings.g.cs