Merge pull request #883 from DeadElle/master

Compile fixes, libraries update/consolidation, filled out pokemon lists.
NecronomiconCoding · Jul 27, 2016 · 84e7e45 · 84e7e45
2 parents 74999d9 + 43c624a
commit 84e7e45
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 27 deletions.
diff --git a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj
@@ -42,16 +42,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Google.Protobuf, Version=3.0.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.0.0-beta3\lib\dotnet\Google.Protobuf.dll</HintPath>
+      <HintPath>..\packages\Google.Protobuf.3.0.0-beta4\lib\net45\Google.Protobuf.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="POGOProtos">
       <HintPath>..\packages\POGOProtos.1.3.0\lib\net45\POGOProtos.dll</HintPath>
@@ -100,12 +100,10 @@
     <Compile Include="WebSocketInterface.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="App.config" />
+    <None Include="packages.config" />
     <None Include="Config\log4net.config" />
     <None Include="Config\log4net.unix.config" />
-    <None Include="packages.config" />
     <None Include="cert.pfx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/PoGo.NecroBot.CLI/Properties/AssemblyInfo.cs b/PoGo.NecroBot.CLI/Properties/AssemblyInfo.cs
@@ -9,12 +9,12 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("PokemonGoRocketAPI.Console")]
+[assembly: AssemblyTitle("NecroBot Client for Pokémon GO")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PokemonGoRocketAPI.Console")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyProduct("PoGo.NecroBot.CLI")]
+[assembly: AssemblyCopyright("Copyright © 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/PoGo.NecroBot.CLI/Settings.cs b/PoGo.NecroBot.CLI/Settings.cs
@@ -215,29 +215,73 @@ public void Save(string fullPath)
 
         public List<PokemonId> PokemonsToIgnore = new List<PokemonId>
                 {
-                    PokemonId.Zubat,
+                    PokemonId.Caterpie,
+                    PokemonId.Weedle,
                     PokemonId.Pidgey,
-                    PokemonId.Rattata
+                    PokemonId.Rattata,
+                    PokemonId.Spearow,
+                    PokemonId.Zubat,
+                    PokemonId.Doduo
                 };
 
         public List<PokemonId> PokemonsNotToTransfer = new List<PokemonId>
                 {
-                    PokemonId.Dragonite,
+                    PokemonId.Venusaur,
                     PokemonId.Charizard,
-                    PokemonId.Zapdos,
+                    PokemonId.Blastoise,
+                    PokemonId.Nidoqueen,
+                    PokemonId.Nidoking,
+                    PokemonId.Clefable,
+                    PokemonId.Vileplume,
+                    PokemonId.Golduck,
+                    PokemonId.Arcanine,
+                    PokemonId.Poliwrath,
+                    PokemonId.Machamp,
+                    PokemonId.Victreebel,
+                    PokemonId.Golem,
+                    PokemonId.Slowbro,
+                    PokemonId.Farfetchd,
+                    PokemonId.Muk,
+                    PokemonId.Exeggutor,
+                    PokemonId.Lickitung,
+                    PokemonId.Chansey,
+                    PokemonId.Kangaskhan,
+                    PokemonId.MrMime,
+                    PokemonId.Gyarados,
+                    PokemonId.Lapras,
+                    PokemonId.Ditto,
+                    PokemonId.Vaporeon,
+                    PokemonId.Jolteon,
+                    PokemonId.Flareon,
+                    PokemonId.Porygon,
                     PokemonId.Snorlax,
-                    PokemonId.Alakazam,
-                    PokemonId.Mew,
-                    PokemonId.Mewtwo
+                    PokemonId.Articuno,
+                    PokemonId.Zapdos,
+                    PokemonId.Moltres,
+                    PokemonId.Dragonite,
+                    PokemonId.Mewtwo,
+                    PokemonId.Mew
                 };
 
         public List<PokemonId> PokemonsToEvolve = new List<PokemonId>
                 {
-                    PokemonId.Zubat,
-                    PokemonId.Pidgey,
-                    PokemonId.Rattata,
+                    //12 candies
                     PokemonId.Caterpie,
-                    PokemonId.Weedle
+                    PokemonId.Weedle,
+                    PokemonId.Pidgey,
+                    //25 candies
+                    //PokemonId.Rattata,
+                    //PokemonId.NidoranFemale,
+                    //PokemonId.NidoranMale,
+                    //PokemonId.Oddish,
+                    //PokemonId.Poliwag,
+                    //PokemonId.Abra,
+                    //PokemonId.Machop,
+                    //PokemonId.Bellsprout,
+                    //PokemonId.Geodude,
+                    //PokemonId.Gastly,
+                    //PokemonId.Eevee,
+                    //PokemonId.Dratini
                 };
 
         public Dictionary<PokemonId, TransferFilter> PokemonsTransferFilter = new Dictionary<PokemonId, TransferFilter>

diff --git a/PoGo.NecroBot.CLI/packages.config b/PoGo.NecroBot.CLI/packages.config
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Google.Protobuf" version="3.0.0-beta3" targetFramework="net45" />
+  <package id="Google.Protobuf" version="3.0.0-beta4" targetFramework="net45" />
   <package id="log4net" version="2.0.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="POGOProtos" version="1.3.0" targetFramework="net45" />
   <package id="SuperSocket" version="1.6.6.1" targetFramework="net45" />
   <package id="SuperSocket.Engine" version="1.6.6.1" targetFramework="net45" />

diff --git a/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj b/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj
@@ -112,9 +112,7 @@
     <Compile Include="Utils\StringUtils.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/PoGo.NecroBot.Logic/Properties/AssemblyInfo.cs b/PoGo.NecroBot.Logic/Properties/AssemblyInfo.cs
@@ -9,12 +9,12 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("PokemonGo.RocketAPI.Logic")]
+[assembly: AssemblyTitle("NecroBot Logic for Pokémon GO")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PokemonGo.RocketAPI.Logic")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyProduct("PoGo.NecroBot.Logic")]
+[assembly: AssemblyCopyright("Copyright © 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]