diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemBlukBerry.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemBlukBerry.png new file mode 100644 index 0000000..04304f9 Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemBlukBerry.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemGreatBall.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemGreatBall.png new file mode 100644 index 0000000..c68ee4b Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemGreatBall.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemHyperPotion.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemHyperPotion.png new file mode 100644 index 0000000..4674fba Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemHyperPotion.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemIncenseOrdinary.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemIncenseOrdinary.png new file mode 100644 index 0000000..21c556a Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemIncenseOrdinary.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemIncubatorBasic.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemIncubatorBasic.png new file mode 100644 index 0000000..ac36da8 Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemIncubatorBasic.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemIncubatorBasicUnlimited.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemIncubatorBasicUnlimited.png new file mode 100644 index 0000000..8a52f98 Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemIncubatorBasicUnlimited.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemItemStorageUpgrade.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemItemStorageUpgrade.png new file mode 100644 index 0000000..3cef2db Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemItemStorageUpgrade.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemLuckyEgg.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemLuckyEgg.png new file mode 100644 index 0000000..f6062da Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemLuckyEgg.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemMasterBall.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemMasterBall.png new file mode 100644 index 0000000..d209f4b Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemMasterBall.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemMaxPotion.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemMaxPotion.png new file mode 100644 index 0000000..501b4ad Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemMaxPotion.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemMaxRevive.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemMaxRevive.png new file mode 100644 index 0000000..be6a0ea Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemMaxRevive.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemNanabBerry.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemNanabBerry.png new file mode 100644 index 0000000..5a91acb Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemNanabBerry.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemPinapBerry.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemPinapBerry.png new file mode 100644 index 0000000..4a113cb Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemPinapBerry.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemPokeBall.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemPokeBall.png new file mode 100644 index 0000000..2900bb0 Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemPokeBall.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemPokemonStorageUpgrade.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemPokemonStorageUpgrade.png new file mode 100644 index 0000000..ec44038 Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemPokemonStorageUpgrade.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemPotion.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemPotion.png new file mode 100644 index 0000000..1d9734d Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemPotion.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemRazzBerry.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemRazzBerry.png new file mode 100644 index 0000000..6ad5176 Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemRazzBerry.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemRevive.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemRevive.png new file mode 100644 index 0000000..10c5162 Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemRevive.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemSpecialCamera.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemSpecialCamera.png new file mode 100644 index 0000000..a9cb4e3 Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemSpecialCamera.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemSuperPotion.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemSuperPotion.png new file mode 100644 index 0000000..9db7573 Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemSuperPotion.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemTroyDisk.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemTroyDisk.png new file mode 100644 index 0000000..91881ec Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemTroyDisk.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemUltraBall.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemUltraBall.png new file mode 100644 index 0000000..f45a069 Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemUltraBall.png differ diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemWeparBerry.png b/PokemonGo/RocketAPI/Window/Images/Items/ItemWeparBerry.png new file mode 100644 index 0000000..e372aa5 Binary files /dev/null and b/PokemonGo/RocketAPI/Window/Images/Items/ItemWeparBerry.png differ diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_1.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_1.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_1.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_1.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_10.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_10.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_10.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_10.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_100.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_100.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_100.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_100.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_101.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_101.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_101.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_101.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_102.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_102.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_102.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_102.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_103.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_103.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_103.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_103.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_104.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_104.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_104.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_104.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_105.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_105.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_105.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_105.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_106.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_106.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_106.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_106.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_107.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_107.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_107.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_107.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_108.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_108.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_108.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_108.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_109.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_109.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_109.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_109.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_11.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_11.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_11.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_11.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_110.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_110.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_110.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_110.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_111.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_111.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_111.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_111.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_112.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_112.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_112.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_112.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_113.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_113.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_113.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_113.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_114.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_114.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_114.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_114.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_115.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_115.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_115.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_115.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_116.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_116.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_116.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_116.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_117.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_117.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_117.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_117.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_118.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_118.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_118.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_118.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_119.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_119.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_119.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_119.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_12.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_12.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_12.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_12.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_120.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_120.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_120.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_120.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_121.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_121.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_121.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_121.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_122.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_122.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_122.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_122.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_123.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_123.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_123.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_123.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_124.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_124.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_124.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_124.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_125.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_125.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_125.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_125.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_126.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_126.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_126.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_126.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_127.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_127.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_127.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_127.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_128.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_128.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_128.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_128.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_129.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_129.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_129.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_129.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_13.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_13.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_13.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_13.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_130.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_130.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_130.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_130.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_131.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_131.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_131.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_131.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_132.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_132.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_132.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_132.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_133.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_133.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_133.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_133.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_134.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_134.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_134.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_134.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_135.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_135.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_135.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_135.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_136.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_136.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_136.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_136.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_137.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_137.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_137.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_137.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_138.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_138.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_138.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_138.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_139.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_139.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_139.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_139.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_14.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_14.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_14.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_14.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_140.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_140.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_140.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_140.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_141.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_141.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_141.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_141.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_142.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_142.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_142.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_142.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_143.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_143.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_143.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_143.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_144.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_144.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_144.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_144.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_145.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_145.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_145.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_145.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_146.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_146.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_146.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_146.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_147.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_147.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_147.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_147.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_148.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_148.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_148.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_148.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_149.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_149.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_149.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_149.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_15.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_15.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_15.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_15.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_150.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_150.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_150.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_150.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_151.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_151.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_151.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_151.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_16.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_16.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_16.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_16.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_17.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_17.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_17.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_17.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_18.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_18.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_18.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_18.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_19.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_19.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_19.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_19.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_2.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_2.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_2.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_2.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_20.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_20.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_20.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_20.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_21.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_21.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_21.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_21.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_22.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_22.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_22.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_22.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_23.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_23.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_23.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_23.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_24.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_24.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_24.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_24.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_25.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_25.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_25.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_25.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_26.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_26.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_26.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_26.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_27.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_27.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_27.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_27.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_28.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_28.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_28.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_28.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_29.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_29.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_29.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_29.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_3.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_3.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_3.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_3.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_30.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_30.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_30.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_30.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_31.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_31.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_31.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_31.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_32.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_32.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_32.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_32.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_33.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_33.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_33.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_33.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_34.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_34.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_34.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_34.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_35.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_35.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_35.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_35.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_36.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_36.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_36.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_36.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_37.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_37.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_37.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_37.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_38.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_38.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_38.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_38.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_39.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_39.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_39.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_39.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_4.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_4.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_4.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_4.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_40.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_40.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_40.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_40.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_41.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_41.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_41.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_41.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_42.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_42.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_42.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_42.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_43.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_43.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_43.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_43.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_44.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_44.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_44.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_44.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_45.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_45.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_45.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_45.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_46.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_46.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_46.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_46.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_47.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_47.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_47.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_47.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_48.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_48.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_48.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_48.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_49.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_49.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_49.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_49.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_5.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_5.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_5.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_5.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_50.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_50.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_50.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_50.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_51.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_51.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_51.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_51.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_52.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_52.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_52.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_52.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_53.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_53.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_53.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_53.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_54.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_54.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_54.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_54.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_55.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_55.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_55.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_55.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_56.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_56.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_56.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_56.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_57.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_57.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_57.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_57.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_58.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_58.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_58.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_58.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_59.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_59.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_59.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_59.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_6.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_6.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_6.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_6.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_60.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_60.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_60.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_60.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_61.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_61.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_61.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_61.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_62.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_62.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_62.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_62.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_63.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_63.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_63.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_63.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_64.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_64.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_64.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_64.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_65.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_65.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_65.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_65.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_66.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_66.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_66.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_66.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_67.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_67.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_67.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_67.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_68.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_68.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_68.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_68.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_69.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_69.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_69.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_69.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_7.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_7.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_7.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_7.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_70.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_70.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_70.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_70.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_71.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_71.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_71.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_71.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_72.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_72.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_72.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_72.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_73.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_73.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_73.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_73.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_74.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_74.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_74.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_74.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_75.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_75.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_75.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_75.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_76.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_76.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_76.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_76.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_77.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_77.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_77.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_77.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_78.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_78.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_78.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_78.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_79.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_79.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_79.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_79.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_8.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_8.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_8.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_8.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_80.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_80.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_80.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_80.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_81.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_81.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_81.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_81.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_82.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_82.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_82.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_82.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_83.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_83.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_83.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_83.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_84.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_84.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_84.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_84.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_85.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_85.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_85.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_85.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_86.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_86.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_86.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_86.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_87.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_87.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_87.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_87.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_88.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_88.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_88.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_88.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_89.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_89.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_89.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_89.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_9.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_9.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_9.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_9.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_90.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_90.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_90.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_90.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_91.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_91.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_91.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_91.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_92.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_92.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_92.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_92.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_93.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_93.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_93.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_93.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_94.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_94.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_94.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_94.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_95.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_95.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_95.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_95.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_96.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_96.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_96.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_96.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_97.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_97.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_97.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_97.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_98.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_98.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_98.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_98.png diff --git a/PokemonGo/RocketAPI/Window/img/Pokemon_99.png b/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_99.png similarity index 100% rename from PokemonGo/RocketAPI/Window/img/Pokemon_99.png rename to PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_99.png diff --git a/PokemonGo/RocketAPI/Window/ItemBox.Designer.cs b/PokemonGo/RocketAPI/Window/ItemBox.Designer.cs new file mode 100644 index 0000000..10ec543 --- /dev/null +++ b/PokemonGo/RocketAPI/Window/ItemBox.Designer.cs @@ -0,0 +1,78 @@ +namespace PokemonGo.RocketAPI.Window { + partial class ItemBox { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) { + if (disposing && (components != null)) { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() { + this.lbl = new System.Windows.Forms.Label(); + this.pb = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.pb)).BeginInit(); + this.SuspendLayout(); + // + // lbl + // + this.lbl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.lbl.BackColor = System.Drawing.Color.Transparent; + this.lbl.Font = new System.Drawing.Font("Segoe UI", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbl.ForeColor = System.Drawing.SystemColors.GrayText; + this.lbl.Location = new System.Drawing.Point(0, 64); + this.lbl.Margin = new System.Windows.Forms.Padding(0); + this.lbl.Name = "lbl"; + this.lbl.Size = new System.Drawing.Size(64, 24); + this.lbl.TabIndex = 1; + this.lbl.Text = "999"; + this.lbl.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // pb + // + this.pb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.pb.BackColor = System.Drawing.Color.Transparent; + this.pb.Location = new System.Drawing.Point(0, 0); + this.pb.Margin = new System.Windows.Forms.Padding(0); + this.pb.Name = "pb"; + this.pb.Size = new System.Drawing.Size(64, 64); + this.pb.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pb.TabIndex = 0; + this.pb.TabStop = false; + // + // ItemBox + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lbl); + this.Controls.Add(this.pb); + this.Cursor = System.Windows.Forms.Cursors.Default; + this.Name = "ItemBox"; + this.Size = new System.Drawing.Size(64, 88); + ((System.ComponentModel.ISupportInitialize)(this.pb)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox pb; + private System.Windows.Forms.Label lbl; + } +} diff --git a/PokemonGo/RocketAPI/Window/ItemBox.cs b/PokemonGo/RocketAPI/Window/ItemBox.cs new file mode 100644 index 0000000..ae60b2e --- /dev/null +++ b/PokemonGo/RocketAPI/Window/ItemBox.cs @@ -0,0 +1,65 @@ +using System; +using System.Drawing; +using System.Windows.Forms; +using POGOProtos.Inventory.Item; + +namespace PokemonGo.RocketAPI.Window { + public partial class ItemBox : UserControl { + public ItemData item_ { get; } + + public event EventHandler ItemClick; + + public ItemBox(ItemData item) { + InitializeComponent(); + + item_ = item; + + pb.Image = (Image)Properties.Resources.ResourceManager.GetObject(item.ItemId.ToString()); + lbl.Text = item.Count.ToString(); + + foreach (Control control in this.Controls) { + control.MouseEnter += childMouseEnter; + control.MouseLeave += childMouseLeave; + control.MouseClick += childMouseClick; + } + + if (item_.ItemId == ItemId.ItemIncubatorBasic || item_.ItemId == ItemId.ItemIncubatorBasicUnlimited) { + this.Enabled = false; + } + } + + private void childMouseClick(object sender, MouseEventArgs e) { + OnItemClick(item_, EventArgs.Empty); + } + + protected override void OnMouseClick(MouseEventArgs e) { + base.OnMouseClick(e); + OnItemClick(item_, EventArgs.Empty); + } + + private void childMouseLeave(object sender, EventArgs e) { + OnMouseLeave(e); + } + + private void childMouseEnter(object sender, EventArgs e) { + OnMouseEnter(e); + } + + protected override void OnMouseLeave(EventArgs e) { + base.OnMouseLeave(e); + this.BackColor = Color.Transparent; + } + + protected override void OnMouseEnter(EventArgs e) { + base.OnMouseEnter(e); + this.BackColor = Color.LightGreen; + } + + protected virtual void OnItemClick(ItemData item, EventArgs e) { + EventHandler handler = ItemClick; + if (handler != null) { + handler(item, e); + } + } + } +} diff --git a/PokemonGo/RocketAPI/Window/ItemForm.Designer.cs b/PokemonGo/RocketAPI/Window/ItemForm.Designer.cs new file mode 100644 index 0000000..89051e4 --- /dev/null +++ b/PokemonGo/RocketAPI/Window/ItemForm.Designer.cs @@ -0,0 +1,143 @@ +namespace PokemonGo.RocketAPI.Window { + partial class ItemForm { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) { + if (disposing && (components != null)) { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() { + this.numCount = new System.Windows.Forms.NumericUpDown(); + this.panel1 = new System.Windows.Forms.Panel(); + this.btnRecycle = new System.Windows.Forms.Button(); + this.btnCancel = new System.Windows.Forms.Button(); + this.pb = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.numCount)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pb)).BeginInit(); + this.SuspendLayout(); + // + // numCount + // + this.numCount.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.numCount.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.numCount.Font = new System.Drawing.Font("Segoe UI", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.numCount.ForeColor = System.Drawing.SystemColors.ControlDark; + this.numCount.Location = new System.Drawing.Point(11, 113); + this.numCount.Maximum = new decimal(new int[] { + 999, + 0, + 0, + 0}); + this.numCount.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numCount.Name = "numCount"; + this.numCount.Size = new System.Drawing.Size(140, 29); + this.numCount.TabIndex = 3; + this.numCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.numCount.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // panel1 + // + this.panel1.BackColor = System.Drawing.SystemColors.Window; + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.btnRecycle); + this.panel1.Controls.Add(this.btnCancel); + this.panel1.Controls.Add(this.numCount); + this.panel1.Controls.Add(this.pb); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(164, 240); + this.panel1.TabIndex = 4; + // + // btnRecycle + // + this.btnRecycle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.btnRecycle.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnRecycle.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnRecycle.Font = new System.Drawing.Font("Segoe UI", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnRecycle.ForeColor = System.Drawing.SystemColors.ControlDark; + this.btnRecycle.Location = new System.Drawing.Point(11, 151); + this.btnRecycle.Name = "btnRecycle"; + this.btnRecycle.Size = new System.Drawing.Size(140, 35); + this.btnRecycle.TabIndex = 4; + this.btnRecycle.Text = "Recycle"; + this.btnRecycle.UseVisualStyleBackColor = true; + // + // btnCancel + // + this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnCancel.ForeColor = System.Drawing.SystemColors.ControlDark; + this.btnCancel.Location = new System.Drawing.Point(11, 192); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(140, 35); + this.btnCancel.TabIndex = 4; + this.btnCancel.Text = "Cancel"; + this.btnCancel.UseVisualStyleBackColor = true; + // + // pb + // + this.pb.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.pb.Location = new System.Drawing.Point(33, 11); + this.pb.Name = "pb"; + this.pb.Size = new System.Drawing.Size(96, 96); + this.pb.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pb.TabIndex = 0; + this.pb.TabStop = false; + // + // RecycleItemForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(164, 240); + this.Controls.Add(this.panel1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Name = "RecycleItemForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "RecycleItemForm"; + ((System.ComponentModel.ISupportInitialize)(this.numCount)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pb)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox pb; + public System.Windows.Forms.NumericUpDown numCount; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Button btnRecycle; + private System.Windows.Forms.Button btnCancel; + } +} \ No newline at end of file diff --git a/PokemonGo/RocketAPI/Window/ItemForm.cs b/PokemonGo/RocketAPI/Window/ItemForm.cs new file mode 100644 index 0000000..4b3316b --- /dev/null +++ b/PokemonGo/RocketAPI/Window/ItemForm.cs @@ -0,0 +1,27 @@ +using POGOProtos.Inventory.Item; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace PokemonGo.RocketAPI.Window { + public partial class ItemForm : Form { + public ItemForm(ItemData item) { + InitializeComponent(); + + pb.Image = (Image)Properties.Resources.ResourceManager.GetObject(item.ItemId.ToString()); + numCount.Maximum = item.Count; + + if (item.ItemId == ItemId.ItemLuckyEgg || item.ItemId == ItemId.ItemIncenseOrdinary) { + btnRecycle.Text = "Use"; + //btnRecycle.Enabled = false; + numCount.Visible = false; + } + } + } +} diff --git a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs index b006b0c..fcac9ce 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs +++ b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs @@ -36,7 +36,6 @@ this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.startStopBotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.todoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.useLuckyEggToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.forceUnbanToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showAllToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); @@ -60,7 +59,10 @@ this.btnRefresh = new System.Windows.Forms.Button(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.lblInventory = new System.Windows.Forms.Label(); + this.flpItems = new System.Windows.Forms.FlowLayoutPanel(); this.lblPokemonList = new System.Windows.Forms.Label(); + this.pkmnNickname = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.olvPokemonList)).BeginInit(); @@ -85,7 +87,7 @@ this.logTextBox.Location = new System.Drawing.Point(0, 0); this.logTextBox.Name = "logTextBox"; this.logTextBox.ReadOnly = true; - this.logTextBox.Size = new System.Drawing.Size(554, 268); + this.logTextBox.Size = new System.Drawing.Size(554, 292); this.logTextBox.TabIndex = 0; this.logTextBox.Text = ""; this.logTextBox.TextChanged += new System.EventHandler(this.logTextBox_TextChanged); @@ -95,7 +97,7 @@ this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel}); - this.statusStrip1.Location = new System.Drawing.Point(0, 498); + this.statusStrip1.Location = new System.Drawing.Point(0, 541); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Size = new System.Drawing.Size(1254, 22); this.statusStrip1.TabIndex = 1; @@ -104,7 +106,7 @@ // statusLabel // this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(43, 17); + this.statusLabel.Size = new System.Drawing.Size(39, 17); this.statusLabel.Text = "Status"; // // menuStrip1 @@ -113,39 +115,31 @@ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.startStopBotToolStripMenuItem, this.todoToolStripMenuItem, - this.useLuckyEggToolStripMenuItem, this.forceUnbanToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(1254, 25); + this.menuStrip1.Size = new System.Drawing.Size(1254, 24); this.menuStrip1.TabIndex = 2; this.menuStrip1.Text = "menuStrip1"; // // startStopBotToolStripMenuItem // this.startStopBotToolStripMenuItem.Name = "startStopBotToolStripMenuItem"; - this.startStopBotToolStripMenuItem.Size = new System.Drawing.Size(85, 21); + this.startStopBotToolStripMenuItem.Size = new System.Drawing.Size(77, 20); this.startStopBotToolStripMenuItem.Text = "▶ Start Bot"; this.startStopBotToolStripMenuItem.Click += new System.EventHandler(this.startStopBotToolStripMenuItem_Click); // // todoToolStripMenuItem // this.todoToolStripMenuItem.Name = "todoToolStripMenuItem"; - this.todoToolStripMenuItem.Size = new System.Drawing.Size(66, 21); + this.todoToolStripMenuItem.Size = new System.Drawing.Size(61, 20); this.todoToolStripMenuItem.Text = "Settings"; this.todoToolStripMenuItem.Click += new System.EventHandler(this.todoToolStripMenuItem_Click); // - // useLuckyEggToolStripMenuItem - // - this.useLuckyEggToolStripMenuItem.Name = "useLuckyEggToolStripMenuItem"; - this.useLuckyEggToolStripMenuItem.Size = new System.Drawing.Size(105, 21); - this.useLuckyEggToolStripMenuItem.Text = "Use Lucky Egg"; - this.useLuckyEggToolStripMenuItem.Click += new System.EventHandler(this.useLuckyEggToolStripMenuItem_Click); - // // forceUnbanToolStripMenuItem // this.forceUnbanToolStripMenuItem.Name = "forceUnbanToolStripMenuItem"; - this.forceUnbanToolStripMenuItem.Size = new System.Drawing.Size(94, 21); + this.forceUnbanToolStripMenuItem.Size = new System.Drawing.Size(86, 20); this.forceUnbanToolStripMenuItem.Text = "Force Unban"; this.forceUnbanToolStripMenuItem.Click += new System.EventHandler(this.forceUnbanToolStripMenuItem_Click); // @@ -183,7 +177,7 @@ this.gMapControl1.ScaleMode = GMap.NET.WindowsForms.ScaleModes.Integer; this.gMapControl1.SelectedAreaFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(65)))), ((int)(((byte)(105)))), ((int)(((byte)(225))))); this.gMapControl1.ShowTileGridLines = false; - this.gMapControl1.Size = new System.Drawing.Size(548, 195); + this.gMapControl1.Size = new System.Drawing.Size(548, 214); this.gMapControl1.TabIndex = 23; this.gMapControl1.Zoom = 0D; // @@ -198,6 +192,7 @@ this.olvPokemonList.AllColumns.Add(this.pkmnCandy); this.olvPokemonList.AllColumns.Add(this.pkmnCandyToEvolve); this.olvPokemonList.AllColumns.Add(this.pkmnEvolveTimes); + this.olvPokemonList.AllColumns.Add(this.pkmnNickname); this.olvPokemonList.AllColumns.Add(this.pkmnTransferButton); this.olvPokemonList.AllColumns.Add(this.pkmnPowerUpButton); this.olvPokemonList.AllColumns.Add(this.pkmnEvolveButton); @@ -215,6 +210,7 @@ this.pkmnCandy, this.pkmnCandyToEvolve, this.pkmnEvolveTimes, + this.pkmnNickname, this.pkmnTransferButton, this.pkmnPowerUpButton, this.pkmnEvolveButton}); @@ -228,7 +224,7 @@ this.olvPokemonList.Name = "olvPokemonList"; this.olvPokemonList.RowHeight = 32; this.olvPokemonList.ShowGroups = false; - this.olvPokemonList.Size = new System.Drawing.Size(690, 425); + this.olvPokemonList.Size = new System.Drawing.Size(690, 327); this.olvPokemonList.SmallImageList = this.smallPokemonImageList; this.olvPokemonList.TabIndex = 25; this.olvPokemonList.UseCompatibleStateImageBehavior = false; @@ -338,9 +334,9 @@ | System.Windows.Forms.AnchorStyles.Right))); this.btnRefresh.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.btnRefresh.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnRefresh.Location = new System.Drawing.Point(3, 445); + this.btnRefresh.Location = new System.Drawing.Point(3, 487); this.btnRefresh.Name = "btnRefresh"; - this.btnRefresh.Size = new System.Drawing.Size(690, 26); + this.btnRefresh.Size = new System.Drawing.Size(690, 28); this.btnRefresh.TabIndex = 26; this.btnRefresh.Text = "Refresh"; this.btnRefresh.UseVisualStyleBackColor = true; @@ -349,7 +345,7 @@ // splitContainer1 // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(0, 25); + this.splitContainer1.Location = new System.Drawing.Point(0, 24); this.splitContainer1.Name = "splitContainer1"; // // splitContainer1.Panel1 @@ -358,10 +354,12 @@ // // splitContainer1.Panel2 // + this.splitContainer1.Panel2.Controls.Add(this.lblInventory); + this.splitContainer1.Panel2.Controls.Add(this.flpItems); this.splitContainer1.Panel2.Controls.Add(this.lblPokemonList); this.splitContainer1.Panel2.Controls.Add(this.olvPokemonList); this.splitContainer1.Panel2.Controls.Add(this.btnRefresh); - this.splitContainer1.Size = new System.Drawing.Size(1254, 473); + this.splitContainer1.Size = new System.Drawing.Size(1254, 517); this.splitContainer1.SplitterDistance = 554; this.splitContainer1.TabIndex = 27; // @@ -379,27 +377,58 @@ // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.gMapControl1); - this.splitContainer2.Size = new System.Drawing.Size(554, 473); - this.splitContainer2.SplitterDistance = 268; + this.splitContainer2.Size = new System.Drawing.Size(554, 517); + this.splitContainer2.SplitterDistance = 292; this.splitContainer2.TabIndex = 0; // + // lblInventory + // + this.lblInventory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.lblInventory.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblInventory.Location = new System.Drawing.Point(3, 471); + this.lblInventory.Name = "lblInventory"; + this.lblInventory.Size = new System.Drawing.Size(690, 13); + this.lblInventory.TabIndex = 33; + this.lblInventory.Text = "0 / 0 "; + this.lblInventory.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // flpItems + // + this.flpItems.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.flpItems.AutoScroll = true; + this.flpItems.BackColor = System.Drawing.SystemColors.Window; + this.flpItems.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.flpItems.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; + this.flpItems.Location = new System.Drawing.Point(3, 348); + this.flpItems.Name = "flpItems"; + this.flpItems.Size = new System.Drawing.Size(690, 120); + this.flpItems.TabIndex = 32; + // // lblPokemonList // this.lblPokemonList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lblPokemonList.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPokemonList.Location = new System.Drawing.Point(3, 431); + this.lblPokemonList.Location = new System.Drawing.Point(3, 333); this.lblPokemonList.Name = "lblPokemonList"; - this.lblPokemonList.Size = new System.Drawing.Size(690, 11); + this.lblPokemonList.Size = new System.Drawing.Size(690, 12); this.lblPokemonList.TabIndex = 27; this.lblPokemonList.Text = "0 / 0"; this.lblPokemonList.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // pkmnNickname + // + this.pkmnNickname.AspectName = "Nickname"; + this.pkmnNickname.Text = "Nickname"; + this.pkmnNickname.Width = 80; + // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1254, 520); + this.ClientSize = new System.Drawing.Size(1254, 563); this.Controls.Add(this.splitContainer1); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.menuStrip1); @@ -438,7 +467,6 @@ private System.Windows.Forms.ToolStripMenuItem startStopBotToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem showAllToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem showAllToolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem useLuckyEggToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem forceUnbanToolStripMenuItem; private GMap.NET.WindowsForms.GMapControl gMapControl1; private BrightIdeasSoftware.ObjectListView olvPokemonList; @@ -461,5 +489,8 @@ private BrightIdeasSoftware.OLVColumn pkmnCandyToEvolve; private BrightIdeasSoftware.OLVColumn pkmnEvolveTimes; private System.Windows.Forms.ContextMenuStrip cmsPokemonList; + private System.Windows.Forms.FlowLayoutPanel flpItems; + private System.Windows.Forms.Label lblInventory; + private BrightIdeasSoftware.OLVColumn pkmnNickname; } } diff --git a/PokemonGo/RocketAPI/Window/MainForm.cs b/PokemonGo/RocketAPI/Window/MainForm.cs index 527390e..c983a98 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.cs +++ b/PokemonGo/RocketAPI/Window/MainForm.cs @@ -56,6 +56,7 @@ namespace PokemonGo.RocketAPI.Window private Client _client; private Client _client2; private LocationManager _locationManager; + private bool _initialized; private GMarkerGoogle _playerMarker; @@ -98,6 +99,7 @@ namespace PokemonGo.RocketAPI.Window InitializeMap(); InitializePokemonForm(); + CheckVersion(); } public void Restart() @@ -129,7 +131,7 @@ namespace PokemonGo.RocketAPI.Window public static double GetRuntime() { - return (DateTime.Now - TimeStarted).TotalSeconds/3600; + return (DateTime.Now - TimeStarted).TotalSeconds / 3600; } public void CheckVersion() @@ -256,7 +258,7 @@ namespace PokemonGo.RocketAPI.Window } } - private async void Execute() + private async Task Execute() { _client = new Client(ClientSettings, new ApiFailureStrategy()); _locationManager = new LocationManager(_client, ClientSettings.TravelSpeed); @@ -274,14 +276,68 @@ namespace PokemonGo.RocketAPI.Window await _client.Login.DoLogin(); var profile = await _client.Player.GetPlayer(); - var settings = await _client.Download.GetSettings(); - var mapObjects = await _client.Map.GetMapObjects(); + //var settings = await _client.Download.GetSettings(); + //var mapObjects = await _client.Map.GetMapObjects(); var inventory = await _client.Inventory.GetInventory(); var pokemons = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PokemonData) .Where(p => p != null && p?.PokemonId > 0); - updateUserStatusBar(_client); + if (!_initialized) + { + new Thread(new ThreadStart(async () => + { + while (true) + { + if (_botStarted) + { + var stats = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PlayerStats).Where(i => i != null).ToArray(); + short hoursLeft = 0; + short minutesLeft = 0; + var secondsLeft = 0; + double xpSec = 0; + var v = stats.First(); + if (v != null) + { + var XpDiff = GetXpDiff(_client, v.Level); + //Calculating the exp needed to level up + float expNextLvl = v.NextLevelXp - v.Experience; + //Calculating the exp made per second + xpSec = Math.Round(_totalExperience / GetRuntime()) / 60 / 60; + //Calculating the seconds left to level up + if (xpSec != 0) + secondsLeft = Convert.ToInt32(expNextLvl / xpSec); + //formatting data to make an output like DateFormat + while (secondsLeft > 60) + { + secondsLeft -= 60; + if (minutesLeft < 60) + { + minutesLeft++; + } + else + { + minutesLeft = 0; + hoursLeft++; + } + } + + SetStatusText( + string.Format( + profile.PlayerData.Username + + " | Level: {0:0} - ({2:0} / {3:0}) | Runtime {1} | Stardust: {4:0}", v.Level, + _getSessionRuntimeInTimeFormat(), v.Experience - v.PrevLevelXp - XpDiff, + v.NextLevelXp - v.PrevLevelXp - XpDiff, profile.PlayerData.Currencies.ToArray()[1].Amount) + + " | XP/Hour: " + Math.Round(_totalExperience / GetRuntime()) + " | Pokemon/Hour: " + + Math.Round(_totalPokemon / GetRuntime()) + " | NextLevel in: " + hoursLeft + ":" + minutesLeft + + ":" + secondsLeft); + } + } + await Task.Delay(1000); + } + })).Start(); + _initialized = true; + } // Write the players ingame details ColoredConsoleWrite(Color.Yellow, "----------------------------"); @@ -353,13 +409,13 @@ namespace PokemonGo.RocketAPI.Window if (ClientSettings.EvolveAllGivenPokemons) await EvolveAllGivenPokemons(_client, pokemons); if (ClientSettings.Recycler) - RecycleItems(_client); + await RecycleItems(_client); //client.RecycleItems(client); if (ClientSettings.TravelSpeed > 30) ColoredConsoleWrite(Color.Red, "WARNING: You are travelling over 30km/h. Your ip might get flag!"); - await Task.Delay(5000); - PrintLevel(_client); + //await Task.Delay(5000); + await PrintLevel(_client); await ExecuteFarmingPokestopsAndPokemons(_client); @@ -367,13 +423,24 @@ namespace PokemonGo.RocketAPI.Window await Task.Delay(25); // await ForceUnban(client); - if (!_stopping) - { - ColoredConsoleWrite(Color.Red, $"No nearby useful locations found. Please wait 5 seconds."); - await Task.Delay(5000); - Execute(); - } - else + //if (!_stopping) + //{ + // ColoredConsoleWrite(Color.Red, $"No nearby useful locations found. Please wait 5 seconds."); + // await Task.Delay(5000); + // Execute(); + //} + //else + //{ + // ConsoleClear(); + // _pokestopsOverlay.Routes.Clear(); + // _pokestopsOverlay.Markers.Clear(); + // ColoredConsoleWrite(Color.Red, $"Bot successfully stopped."); + // startStopBotToolStripMenuItem.Text = "Start"; + // _stopping = false; + // _botStarted = false; + // _pokeStops = null; + //} + if (_stopping) { ConsoleClear(); _pokestopsOverlay.Routes.Clear(); @@ -388,32 +455,32 @@ namespace PokemonGo.RocketAPI.Window catch (TaskCanceledException) { ColoredConsoleWrite(Color.Red, "Task Canceled Exception - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (UriFormatException) { ColoredConsoleWrite(Color.Red, "System URI Format Exception - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (ArgumentOutOfRangeException) { ColoredConsoleWrite(Color.Red, "ArgumentOutOfRangeException - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (ArgumentNullException) { ColoredConsoleWrite(Color.Red, "Argument Null Refference - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (NullReferenceException) { ColoredConsoleWrite(Color.Red, "Null Refference - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (AccessTokenExpiredException) { ColoredConsoleWrite(Color.Red, "Access Token Expired - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (GoogleException ex) { @@ -426,13 +493,13 @@ namespace PokemonGo.RocketAPI.Window catch (InvalidResponseException) { ColoredConsoleWrite(Color.Red, "Invalid response - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (Exception ex) { ColoredConsoleWrite(Color.Red, ex.ToString()); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } } @@ -499,7 +566,7 @@ namespace PokemonGo.RocketAPI.Window var request = (HttpWebRequest) WebRequest.Create("http://boosting-service.de/pokemon/index.php?pokeName=" + name_english); - var response = (HttpWebResponse) request.GetResponse(); + var response = (HttpWebResponse)request.GetResponse(); pokemonName = new StreamReader(response.GetResponseStream()).ReadToEnd(); } else @@ -575,7 +642,8 @@ namespace PokemonGo.RocketAPI.Window } _farmingPokemons = false; - await Task.Delay(3000); + //await Task.Delay(3000); + await Task.Delay(500); } pokemons = null; } @@ -584,7 +652,7 @@ namespace PokemonGo.RocketAPI.Window { SynchronizationContext.Post(o => { - _playerMarker.Position = (PointLatLng) o; + _playerMarker.Position = (PointLatLng)o; _searchAreaOverlay.Polygons.Clear(); }, new PointLatLng(latitude, longitude)); @@ -699,8 +767,8 @@ namespace PokemonGo.RocketAPI.Window _farmingStops = false; if (!_forceUnbanning && !_stopping) { - RecycleItems(client); - await ExecuteFarmingPokestopsAndPokemons(client); + await RecycleItems(client); + //await ExecuteFarmingPokestopsAndPokemons(client); } } @@ -738,16 +806,23 @@ namespace PokemonGo.RocketAPI.Window { var fortSearch = await client.Fort.SearchFort(pokeStop.Id, pokeStop.Latitude, pokeStop.Longitude); - if (fortSearch.ExperienceAwarded == 0) + if (fortSearch.Result == FortSearchResponse.Types.Result.Success) { - ColoredConsoleWrite(Color.LightGreen, "Attempt: " + i); + if (fortSearch.ExperienceAwarded == 0) + { + ColoredConsoleWrite(Color.LightGreen, "Attempt: " + i); + } + else + { + ColoredConsoleWrite(Color.LightGreen, + "Fuck yes, you are now unbanned! Total attempts: " + i); + done = true; + break; + } } else { - ColoredConsoleWrite(Color.LightGreen, - "Fuck yes, you are now unbanned! Total attempts: " + i); - done = true; - break; + ColoredConsoleWrite(Color.LightGreen, $"Pokestop error on attempt {i}: {fortSearch.Result}"); } } if (done) @@ -773,7 +848,7 @@ namespace PokemonGo.RocketAPI.Window return string.Empty; return enumerable.GroupBy(i => i.ItemId) - .Select(kvp => new {ItemName = kvp.Key.ToString().Substring(4), Amount = kvp.Sum(x => x.ItemCount)}) + .Select(kvp => new { ItemName = kvp.Key.ToString().Substring(4), Amount = kvp.Sum(x => x.ItemCount) }) .Select(y => $"{y.Amount}x {y.ItemName}") .Aggregate((a, b) => $"{a}, {b}"); } @@ -784,7 +859,7 @@ namespace PokemonGo.RocketAPI.Window var unwantedPokemonTypes = new List<PokemonId>(); for (var i = 1; i <= 151; i++) { - unwantedPokemonTypes.Add((PokemonId) i); + unwantedPokemonTypes.Add((PokemonId)i); } var inventory = await client.Inventory.GetInventory(); @@ -809,7 +884,7 @@ namespace PokemonGo.RocketAPI.Window public static float Perfect(PokemonData poke) { - return (poke.IndividualAttack + poke.IndividualDefense + poke.IndividualStamina)/(3.0f*15.0f)*100.0f; + return (poke.IndividualAttack + poke.IndividualDefense + poke.IndividualStamina) / (3.0f * 15.0f) * 100.0f; } private async Task TransferAllGivenPokemons(Client client, IEnumerable<PokemonData> unwantedPokemons, @@ -843,7 +918,7 @@ namespace PokemonGo.RocketAPI.Window (HttpWebRequest) WebRequest.Create("http://boosting-service.de/pokemon/index.php?pokeName=" + name_english); - var response = (HttpWebResponse) request.GetResponse(); + var response = (HttpWebResponse)request.GetResponse(); pokemonName = new StreamReader(response.GetResponseStream()).ReadToEnd(); } else @@ -874,7 +949,7 @@ namespace PokemonGo.RocketAPI.Window inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PokemonData) .Where(p => p != null && p?.PokemonId > 0); - var dupes = allpokemons.OrderBy(x => x.Cp).Select((x, i) => new {index = i, value = x}) + var dupes = allpokemons.OrderBy(x => x.Cp).Select((x, i) => new { index = i, value = x }) .GroupBy(x => x.value.PokemonId) .Where(x => x.Skip(1).Any()); @@ -894,7 +969,7 @@ namespace PokemonGo.RocketAPI.Window (HttpWebRequest) WebRequest.Create("http://boosting-service.de/pokemon/index.php?pokeName=" + name_english); - var response = (HttpWebResponse) request.GetResponse(); + var response = (HttpWebResponse)request.GetResponse(); pokemonName = new StreamReader(response.GetResponseStream()).ReadToEnd(); } else @@ -914,7 +989,7 @@ namespace PokemonGo.RocketAPI.Window inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PokemonData) .Where(p => p != null && p?.PokemonId > 0); - var dupes = allpokemons.OrderBy(x => Perfect(x)).Select((x, i) => new {index = i, value = x}) + var dupes = allpokemons.OrderBy(x => Perfect(x)).Select((x, i) => new { index = i, value = x }) .GroupBy(x => x.value.PokemonId) .Where(x => x.Skip(1).Any()); @@ -934,7 +1009,7 @@ namespace PokemonGo.RocketAPI.Window (HttpWebRequest) WebRequest.Create("http://boosting-service.de/pokemon/index.php?pokeName=" + name_english); - var response = (HttpWebResponse) request.GetResponse(); + var response = (HttpWebResponse)request.GetResponse(); pokemonName = new StreamReader(response.GetResponseStream()).ReadToEnd(); } else @@ -1005,7 +1080,7 @@ namespace PokemonGo.RocketAPI.Window public async Task PrintLevel(Client client) { var inventory = await client.Inventory.GetInventory(); - var stats = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PlayerStats).ToArray(); + var stats = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PlayerStats); foreach (var v in stats) if (v != null) { @@ -1026,8 +1101,9 @@ namespace PokemonGo.RocketAPI.Window if (ClientSettings.LevelOutput == "levelup") await Task.Delay(1000); else - await Task.Delay(ClientSettings.LevelTimeInterval*1000); - PrintLevel(client); + + await Task.Delay(ClientSettings.LevelTimeInterval * 1000); + // PrintLevel(client); } // Pulled from NecronomiconCoding @@ -1036,52 +1112,49 @@ namespace PokemonGo.RocketAPI.Window return (DateTime.Now - InitSessionDateTime).ToString(@"dd\.hh\:mm\:ss"); } - public async Task updateUserStatusBar(Client client) + public async Task updateUserStatusBar(Client client, GetInventoryResponse inventory, GetPlayerResponse profile) { - var inventory = await client.Inventory.GetInventory(); - var stats = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PlayerStats).ToArray(); - var profile = await client.Player.GetPlayer(); + var stats = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PlayerStats).Where(i => i != null).ToArray(); short hoursLeft = 0; short minutesLeft = 0; var secondsLeft = 0; double xpSec = 0; - foreach (var v in stats) - if (v != null) + var v = stats.First(); + if (v != null) + { + var XpDiff = GetXpDiff(client, v.Level); + //Calculating the exp needed to level up + float expNextLvl = v.NextLevelXp - v.Experience; + //Calculating the exp made per second + xpSec = Math.Round(_totalExperience / GetRuntime()) / 60 / 60; + //Calculating the seconds left to level up + if (xpSec != 0) + secondsLeft = Convert.ToInt32(expNextLvl / xpSec); + //formatting data to make an output like DateFormat + while (secondsLeft > 60) { - var XpDiff = GetXpDiff(client, v.Level); - //Calculating the exp needed to level up - float expNextLvl = v.NextLevelXp - v.Experience; - //Calculating the exp made per second - xpSec = Math.Round(_totalExperience/GetRuntime())/60/60; - //Calculating the seconds left to level up - if (xpSec != 0) - secondsLeft = Convert.ToInt32(expNextLvl/xpSec); - //formatting data to make an output like DateFormat - while (secondsLeft > 60) + secondsLeft -= 60; + if (minutesLeft < 60) { - secondsLeft -= 60; - if (minutesLeft < 60) - { - minutesLeft++; - } - else - { - minutesLeft = 0; - hoursLeft++; - } + minutesLeft++; + } + else + { + minutesLeft = 0; + hoursLeft++; } - SetStatusText( - string.Format( - profile.PlayerData.Username + - " | Level: {0:0} - ({2:0} / {3:0}) | Runtime {1} | Stardust: {4:0}", v.Level, - _getSessionRuntimeInTimeFormat(), v.Experience - v.PrevLevelXp - XpDiff, - v.NextLevelXp - v.PrevLevelXp - XpDiff, profile.PlayerData.Currencies.ToArray()[1].Amount) + - " | XP/Hour: " + Math.Round(_totalExperience/GetRuntime()) + " | Pokemon/Hour: " + - Math.Round(_totalPokemon/GetRuntime()) + " | NextLevel in: " + hoursLeft + ":" + minutesLeft + - ":" + secondsLeft); } + SetStatusText( + string.Format( + profile.PlayerData.Username + + " | Level: {0:0} - ({2:0} / {3:0}) | Runtime {1} | Stardust: {4:0}", v.Level, + _getSessionRuntimeInTimeFormat(), v.Experience - v.PrevLevelXp - XpDiff, + v.NextLevelXp - v.PrevLevelXp - XpDiff, profile.PlayerData.Currencies.ToArray()[1].Amount) + + " | XP/Hour: " + Math.Round(_totalExperience / GetRuntime()) + " | Pokemon/Hour: " + + Math.Round(_totalPokemon / GetRuntime()) + " | NextLevel in: " + hoursLeft + ":" + minutesLeft + + ":" + secondsLeft); + } await Task.Delay(1000); - updateUserStatusBar(client); } public static int GetXpDiff(Client client, int Level) @@ -1199,22 +1272,29 @@ namespace PokemonGo.RocketAPI.Window { _botStarted = true; startStopBotToolStripMenuItem.Text = "■Stop Bot"; - Task.Run(() => + Task.Run(async () => { - try - { - //ColoredConsoleWrite(ConsoleColor.White, "Coded by Ferox - edited by NecronomiconCoding"); - CheckVersion(); - Execute(); - } - catch (PtcOfflineException) - { - ColoredConsoleWrite(Color.Red, - "PTC Servers are probably down OR your credentials are wrong. Try google"); - } - catch (Exception ex) + //CheckVersion(); + while (true) { - ColoredConsoleWrite(Color.Red, $"Unhandled exception: {ex}"); + try + { + //ColoredConsoleWrite(ConsoleColor.White, "Coded by Ferox - edited by NecronomiconCoding"); + if (!_botStarted) + { + break; + } + await Execute(); + } + catch (PtcOfflineException) + { + ColoredConsoleWrite(Color.Red, + "PTC Servers are probably down OR your credentials are wrong. Try google"); + } + catch (Exception ex) + { + ColoredConsoleWrite(Color.Red, $"Unhandled exception: {ex}"); + } } }); } @@ -1256,47 +1336,6 @@ namespace PokemonGo.RocketAPI.Window // todo: add player stats later } - private async void useLuckyEggToolStripMenuItem_Click(object sender, EventArgs e) - { - if (_client != null) - { - if ( - MessageBox.Show($"Are you sure you want to use a lucky egg?", "Confirmation", - MessageBoxButtons.YesNo) == DialogResult.Yes) - { - try - { - var myItems = await GetItems(_client); - var LuckyEggs = myItems.Where(i => i.ItemId == ItemId.ItemLuckyEgg); - var LuckyEgg = LuckyEggs.FirstOrDefault(); - if (LuckyEgg != null) - { - var useItemXpBoostRequest = await _client.Inventory.UseItemXpBoost(); - ColoredConsoleWrite(Color.Green, $"Using a Lucky Egg, we have {LuckyEgg.Count} left."); - ColoredConsoleWrite(Color.Yellow, $"Lucky Egg Valid until: {DateTime.Now.AddMinutes(30)}"); - - var stripItem = sender as ToolStripMenuItem; - stripItem.Enabled = false; - await Task.Delay(30000); - stripItem.Enabled = true; - } - else - { - ColoredConsoleWrite(Color.Red, $"You don't have any Lucky Egg to use."); - } - } - catch (Exception ex) - { - ColoredConsoleWrite(Color.Red, $"Unhandled exception in using lucky egg: {ex}"); - } - } - } - else - { - ColoredConsoleWrite(Color.Red, "Please start the bot before trying to use a lucky egg."); - } - } - private async void forceUnbanToolStripMenuItem_Click(object sender, EventArgs e) { if (_client != null && _pokeStops != null) @@ -1343,20 +1382,20 @@ namespace PokemonGo.RocketAPI.Window { olvPokemonList.ButtonClick += PokemonListButton_Click; - pkmnName.ImageGetter = delegate(object rowObject) + pkmnName.ImageGetter = delegate (object rowObject) { var pokemon = rowObject as PokemonObject; var key = pokemon.PokemonId.ToString(); if (!olvPokemonList.SmallImageList.Images.ContainsKey(key)) { - var img = GetPokemonImage((int) pokemon.PokemonId); + var img = GetPokemonImage((int)pokemon.PokemonId); olvPokemonList.SmallImageList.Images.Add(key, img); } return key; }; - olvPokemonList.FormatRow += delegate(object sender, FormatRowEventArgs e) + olvPokemonList.FormatRow += delegate (object sender, FormatRowEventArgs e) { var pok = e.Model as PokemonObject; if ( @@ -1375,7 +1414,7 @@ namespace PokemonGo.RocketAPI.Window } }; - cmsPokemonList.Opening += delegate(object sender, CancelEventArgs e) + cmsPokemonList.Opening += delegate (object sender, CancelEventArgs e) { e.Cancel = false; cmsPokemonList.Items.Clear(); @@ -1438,19 +1477,18 @@ namespace PokemonGo.RocketAPI.Window item.Text = "Evolve Clean Up (Highest CP)"; item.Click += delegate { CleanUpEvolvePokemon(pokemonObject, "CP"); }; cmsPokemonList.Items.Add(item); - /* + cmsPokemonList.Items.Add(separator); item = new ToolStripMenuItem(); item.Text = "Rename"; item.Click += delegate (object obj, EventArgs args) { - using (var form = new NicknamePokemonForm(pokemonObject)) { if (form.ShowDialog() == DialogResult.OK) { NicknamePokemon(pokemonObject, form.txtNickname.Text); } } - };*/ + }; cmsPokemonList.Items.Add(item); } }; @@ -1458,20 +1496,19 @@ namespace PokemonGo.RocketAPI.Window private Image GetPokemonImage(int pokemonId) { - return (Image) Properties.Resources.ResourceManager.GetObject("Pokemon_" + pokemonId); + return (Image)Properties.Resources.ResourceManager.GetObject("Pokemon_" + pokemonId); } private void SetState(bool state) { btnRefresh.Enabled = state; olvPokemonList.Enabled = state; - //flpItems.Enabled = state; + flpItems.Enabled = state; } private async Task ReloadPokemonList() { - btnRefresh.Enabled = false; - olvPokemonList.Enabled = false; + SetState(false); try { @@ -1500,7 +1537,7 @@ namespace PokemonGo.RocketAPI.Window { var pokemonObject = new PokemonObject(pokemon); var family = - families.Where(i => (int) i.FamilyId <= (int) pokemon.PokemonId) + families.Where(i => (int)i.FamilyId <= (int)pokemon.PokemonId) .First(); pokemonObject.Candy = family.Candy_; pokemonObjects.Add(pokemonObject); @@ -1520,6 +1557,25 @@ namespace PokemonGo.RocketAPI.Window .Count(); lblPokemonList.Text = pokemoncount + eggcount + " / " + profile.PlayerData.MaxPokemonStorage + " (" + pokemoncount + " pokemon, " + eggcount + " eggs)"; + + var items = + inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.Item) + .Where(i => i != null && i.Count > 0); + var itemscount = + inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.Item) + .Where(i => i != null) + .Sum(i => i.Count) + 1; + + flpItems.Controls.Clear(); + foreach (ItemData item in items) { + ItemBox box = new ItemBox(item); + box.Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Bottom; + box.ItemClick += ItemBox_ItemClick; ; + flpItems.Controls.Add(box); + } + + lblInventory.Text = itemscount + " / " + profile.PlayerData.MaxItemStorage; + } catch (GoogleException ex) { @@ -1539,8 +1595,47 @@ namespace PokemonGo.RocketAPI.Window _client2 = null; } - btnRefresh.Enabled = true; - olvPokemonList.Enabled = true; + SetState(true); + } + + private async void ItemBox_ItemClick(object sender, EventArgs e) { + ItemData item = (ItemData)sender; + + using (var form = new ItemForm(item)) { + var result = form.ShowDialog(); + if (result == DialogResult.OK) { + SetState(false); + if (item.ItemId == ItemId.ItemLuckyEgg) { + if (!_botStarted) { + ColoredConsoleWrite(Color.Red, $"Bot must be running first!"); + SetState(true); + return; + } + + var response = await _client.Inventory.UseItemXpBoost(); + if (response.Result == UseItemXpBoostResponse.Types.Result.Success) { + ColoredConsoleWrite(Color.Green, $"Using a Lucky Egg"); + ColoredConsoleWrite(Color.Yellow, $"Lucky Egg Valid until: {DateTime.Now.AddMinutes(30)}"); + } else if (response.Result == UseItemXpBoostResponse.Types.Result.ErrorXpBoostAlreadyActive) { + ColoredConsoleWrite(Color.Orange, $"A Lucky Egg is already active!"); + } else if (response.Result == UseItemXpBoostResponse.Types.Result.ErrorLocationUnset) { + ColoredConsoleWrite(Color.Red, $"Bot must be running first!"); + } else { + ColoredConsoleWrite(Color.Red, $"Failed using a Lucky Egg!"); + } + } else if (item.ItemId == ItemId.ItemIncenseOrdinary) { + + } else { + var response = await _client2.Inventory.RecycleItem(item.ItemId, Decimal.ToInt32(form.numCount.Value)); + if (response.Result == RecycleInventoryItemResponse.Types.Result.Success) { + ColoredConsoleWrite(Color.DarkCyan, $"Recycled {Decimal.ToInt32(form.numCount.Value)}x {item.ItemId.ToString().Substring(4)}"); + } else { + ColoredConsoleWrite(Color.Red, $"Unable to recycle {Decimal.ToInt32(form.numCount.Value)}x {item.ItemId.ToString().Substring(4)}"); + } + } + ReloadPokemonList(); + } + } } private void PokemonListButton_Click(object sender, CellClickEventArgs e) @@ -1551,15 +1646,15 @@ namespace PokemonGo.RocketAPI.Window var cName = olvPokemonList.AllColumns[e.ColumnIndex].AspectToStringFormat; if (cName.Equals("Transfer")) { - TransferPokemon(new List<PokemonData> {pokemon.PokemonData}); + TransferPokemon(new List<PokemonData> { pokemon.PokemonData }); } else if (cName.Equals("Power Up")) { - PowerUpPokemon(new List<PokemonData> {pokemon.PokemonData}); + PowerUpPokemon(new List<PokemonData> { pokemon.PokemonData }); } else if (cName.Equals("Evolve")) { - EvolvePokemon(new List<PokemonData> {pokemon.PokemonData}); + EvolvePokemon(new List<PokemonData> { pokemon.PokemonData }); } } catch (Exception ex) @@ -1715,7 +1810,7 @@ namespace PokemonGo.RocketAPI.Window public async Task<IEnumerable<ItemData>> GetItemsToRecycle(ISettings _settings, Client client) { - var settings = (Settings) _settings; + var settings = (Settings)_settings; var myItems = await GetItems(client); return myItems @@ -1740,8 +1835,6 @@ namespace PokemonGo.RocketAPI.Window ColoredConsoleWrite(Color.DarkCyan, $"Recycled {item.Count}x {item.ItemId.ToString().Substring(4)}"); await Task.Delay(500); } - await Task.Delay(ClientSettings.RecycleItemsInterval*1000); - RecycleItems(client); } public async Task UseRazzBerry(Client client, ulong encounterId, string spawnPointGuid) @@ -1775,20 +1868,20 @@ namespace PokemonGo.RocketAPI.Window var ballCollection = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.Item) .Where(p => p != null) .GroupBy(i => i.ItemId) - .Select(kvp => new {ItemId = kvp.Key, Amount = kvp.Sum(x => x.Count)}) + .Select(kvp => new { ItemId = kvp.Key, Amount = kvp.Sum(x => x.Count) }) .Where(y => y.ItemId == ItemId.ItemPokeBall || y.ItemId == ItemId.ItemGreatBall || y.ItemId == ItemId.ItemUltraBall || y.ItemId == ItemId.ItemMasterBall); var pokeBallsCount = ballCollection.Where(p => p.ItemId == ItemId.ItemPokeBall). - DefaultIfEmpty(new {ItemId = ItemId.ItemPokeBall, Amount = 0}).FirstOrDefault().Amount; + DefaultIfEmpty(new { ItemId = ItemId.ItemPokeBall, Amount = 0 }).FirstOrDefault().Amount; var greatBallsCount = ballCollection.Where(p => p.ItemId == ItemId.ItemGreatBall). - DefaultIfEmpty(new {ItemId = ItemId.ItemGreatBall, Amount = 0}).FirstOrDefault().Amount; + DefaultIfEmpty(new { ItemId = ItemId.ItemGreatBall, Amount = 0 }).FirstOrDefault().Amount; var ultraBallsCount = ballCollection.Where(p => p.ItemId == ItemId.ItemUltraBall). - DefaultIfEmpty(new {ItemId = ItemId.ItemUltraBall, Amount = 0}).FirstOrDefault().Amount; + DefaultIfEmpty(new { ItemId = ItemId.ItemUltraBall, Amount = 0 }).FirstOrDefault().Amount; var masterBallsCount = ballCollection.Where(p => p.ItemId == ItemId.ItemMasterBall). - DefaultIfEmpty(new {ItemId = ItemId.ItemMasterBall, Amount = 0}).FirstOrDefault().Amount; + DefaultIfEmpty(new { ItemId = ItemId.ItemMasterBall, Amount = 0 }).FirstOrDefault().Amount; // Use better balls for high CP pokemon if (masterBallsCount > 0 && pokemonCP >= 1000) @@ -1834,6 +1927,17 @@ namespace PokemonGo.RocketAPI.Window return ItemId.ItemPokeBall; } + public async void NicknamePokemon(PokemonObject pokemon, string nickname) { + SetState(false); + var response = await _client2.Inventory.NicknamePokemon(pokemon.Id, nickname); + if (response.Result == NicknamePokemonResponse.Types.Result.Success) { + ColoredConsoleWrite(Color.Green, $"Successfully renamed {pokemon.PokemonId.ToString()} to \"{nickname}|\""); + } else { + ColoredConsoleWrite(Color.Red, $"Failed renaming {pokemon.PokemonId.ToString()} to \"{nickname}|\""); + } + ReloadPokemonList(); + } + private async void button1_Click(object sender, EventArgs e) { await ReloadPokemonList(); diff --git a/PokemonGo/RocketAPI/Window/NicknamePokemonForm.Designer.cs b/PokemonGo/RocketAPI/Window/NicknamePokemonForm.Designer.cs new file mode 100644 index 0000000..1c50675 --- /dev/null +++ b/PokemonGo/RocketAPI/Window/NicknamePokemonForm.Designer.cs @@ -0,0 +1,106 @@ +namespace PokemonGo.RocketAPI.Window { + partial class NicknamePokemonForm { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) { + if (disposing && (components != null)) { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() { + this.pnl = new System.Windows.Forms.Panel(); + this.txtNickname = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.btnNickname = new System.Windows.Forms.Button(); + this.pnl.SuspendLayout(); + this.SuspendLayout(); + // + // pnl + // + this.pnl.BackColor = System.Drawing.SystemColors.Window; + this.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pnl.Controls.Add(this.txtNickname); + this.pnl.Controls.Add(this.label1); + this.pnl.Controls.Add(this.btnNickname); + this.pnl.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnl.Location = new System.Drawing.Point(0, 0); + this.pnl.Name = "pnl"; + this.pnl.Size = new System.Drawing.Size(401, 144); + this.pnl.TabIndex = 0; + // + // txtNickname + // + this.txtNickname.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtNickname.Font = new System.Drawing.Font("Segoe UI", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtNickname.Location = new System.Drawing.Point(16, 44); + this.txtNickname.Name = "txtNickname"; + this.txtNickname.Size = new System.Drawing.Size(372, 35); + this.txtNickname.TabIndex = 0; + this.txtNickname.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label1.Font = new System.Drawing.Font("Segoe UI", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.ForeColor = System.Drawing.SystemColors.ControlDark; + this.label1.Location = new System.Drawing.Point(11, 8); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(377, 33); + this.label1.TabIndex = 6; + this.label1.Text = "Nickname Pokemon"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // btnNickname + // + this.btnNickname.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnNickname.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnNickname.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnNickname.Font = new System.Drawing.Font("Segoe UI", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnNickname.ForeColor = System.Drawing.SystemColors.ControlDark; + this.btnNickname.Location = new System.Drawing.Point(133, 95); + this.btnNickname.Name = "btnNickname"; + this.btnNickname.Size = new System.Drawing.Size(140, 35); + this.btnNickname.TabIndex = 1; + this.btnNickname.Text = "Rename"; + this.btnNickname.UseVisualStyleBackColor = true; + // + // NicknamePokemonForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(401, 144); + this.Controls.Add(this.pnl); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Name = "NicknamePokemonForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "NicknamePokemonForm"; + this.pnl.ResumeLayout(false); + this.pnl.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel pnl; + private System.Windows.Forms.Button btnNickname; + public System.Windows.Forms.TextBox txtNickname; + private System.Windows.Forms.Label label1; + } +} \ No newline at end of file diff --git a/PokemonGo/RocketAPI/Window/NicknamePokemonForm.cs b/PokemonGo/RocketAPI/Window/NicknamePokemonForm.cs new file mode 100644 index 0000000..fe484f9 --- /dev/null +++ b/PokemonGo/RocketAPI/Window/NicknamePokemonForm.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace PokemonGo.RocketAPI.Window { + public partial class NicknamePokemonForm : Form { + public NicknamePokemonForm(PokemonObject pokemon) { + InitializeComponent(); + txtNickname.Text = pokemon.Nickname; + txtNickname.KeyDown += TxtNickname_KeyDown; + } + + private void TxtNickname_KeyDown(object sender, KeyEventArgs e) { + if (e.KeyCode == Keys.Enter) { + this.DialogResult = DialogResult.OK; + this.Close(); + } + } + } +} diff --git a/PokemonGo/RocketAPI/Window/PokemonGo.RocketBot.csproj b/PokemonGo/RocketAPI/Window/PokemonGo.RocketBot.csproj index 40131f1..aa7d8e1 100644 --- a/PokemonGo/RocketAPI/Window/PokemonGo.RocketBot.csproj +++ b/PokemonGo/RocketAPI/Window/PokemonGo.RocketBot.csproj @@ -81,6 +81,18 @@ <ItemGroup> <Compile Include="ApiFailureStrategy.cs" /> <Compile Include="Extensions.cs" /> + <Compile Include="ItemBox.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="ItemBox.Designer.cs"> + <DependentUpon>ItemBox.cs</DependentUpon> + </Compile> + <Compile Include="ItemForm.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="ItemForm.Designer.cs"> + <DependentUpon>ItemForm.cs</DependentUpon> + </Compile> <Compile Include="LocationManager.cs" /> <Compile Include="MainForm.cs"> <SubType>Form</SubType> @@ -88,6 +100,12 @@ <Compile Include="MainForm.Designer.cs"> <DependentUpon>MainForm.cs</DependentUpon> </Compile> + <Compile Include="NicknamePokemonForm.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="NicknamePokemonForm.Designer.cs"> + <DependentUpon>NicknamePokemonForm.cs</DependentUpon> + </Compile> <Compile Include="PokemonObject.cs" /> <Compile Include="RouteOptimizer.cs" /> <Compile Include="Program.cs" /> @@ -134,459 +152,6 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_1.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_2.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_3.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_4.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_5.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_6.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_7.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_8.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_9.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_10.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_11.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_12.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_13.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_14.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_15.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_16.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_17.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_18.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_19.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_20.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_21.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_22.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_23.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_24.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_25.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_26.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_27.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_28.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_29.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_30.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_31.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_32.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_33.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_34.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_35.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_36.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_37.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_38.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_39.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_40.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_41.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_42.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_43.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_44.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_45.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_46.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_47.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_48.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_49.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_50.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_51.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_52.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_53.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_54.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_55.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_56.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_57.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_58.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_59.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_60.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_61.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_62.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_63.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_64.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_65.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_66.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_67.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_68.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_69.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_70.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_71.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_72.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_73.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_74.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_75.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_76.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_77.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_78.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_79.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_80.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_81.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_82.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_83.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_84.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_85.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_86.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_87.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_88.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_89.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_90.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_91.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_92.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_93.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_94.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_95.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_96.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_97.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_98.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_99.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_100.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_101.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_102.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_103.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_104.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_105.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_106.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_107.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_108.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_109.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_110.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_111.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_112.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_113.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_114.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_115.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_116.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_117.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_118.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_119.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_120.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_121.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_122.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_123.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_124.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_125.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_126.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_127.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_128.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_129.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_130.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_131.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_132.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_133.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_134.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_135.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_136.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_137.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_138.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_139.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_140.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_141.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_142.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_143.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_144.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_145.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_146.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_147.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_148.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_149.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_150.png" /> - </ItemGroup> - <ItemGroup> - <None Include="img\Pokemon_151.png" /> - </ItemGroup> <ItemGroup> <ProjectReference Include="..\PokemonGo.RocketAPI.csproj"> <Project>{05d2da44-1b8e-4cf7-94ed-4d52451cd095}</Project> @@ -594,6 +159,180 @@ </ProjectReference> </ItemGroup> <ItemGroup> + <None Include="Images\Pokemon\Pokemon_1.png" /> + <None Include="Images\Pokemon\Pokemon_2.png" /> + <None Include="Images\Pokemon\Pokemon_3.png" /> + <None Include="Images\Pokemon\Pokemon_4.png" /> + <None Include="Images\Pokemon\Pokemon_5.png" /> + <None Include="Images\Pokemon\Pokemon_6.png" /> + <None Include="Images\Pokemon\Pokemon_7.png" /> + <None Include="Images\Pokemon\Pokemon_8.png" /> + <None Include="Images\Pokemon\Pokemon_9.png" /> + <None Include="Images\Pokemon\Pokemon_10.png" /> + <None Include="Images\Pokemon\Pokemon_11.png" /> + <None Include="Images\Pokemon\Pokemon_12.png" /> + <None Include="Images\Pokemon\Pokemon_13.png" /> + <None Include="Images\Pokemon\Pokemon_14.png" /> + <None Include="Images\Pokemon\Pokemon_15.png" /> + <None Include="Images\Pokemon\Pokemon_16.png" /> + <None Include="Images\Pokemon\Pokemon_17.png" /> + <None Include="Images\Pokemon\Pokemon_18.png" /> + <None Include="Images\Pokemon\Pokemon_19.png" /> + <None Include="Images\Pokemon\Pokemon_20.png" /> + <None Include="Images\Pokemon\Pokemon_21.png" /> + <None Include="Images\Pokemon\Pokemon_22.png" /> + <None Include="Images\Pokemon\Pokemon_23.png" /> + <None Include="Images\Pokemon\Pokemon_24.png" /> + <None Include="Images\Pokemon\Pokemon_25.png" /> + <None Include="Images\Pokemon\Pokemon_26.png" /> + <None Include="Images\Pokemon\Pokemon_27.png" /> + <None Include="Images\Pokemon\Pokemon_28.png" /> + <None Include="Images\Pokemon\Pokemon_29.png" /> + <None Include="Images\Pokemon\Pokemon_30.png" /> + <None Include="Images\Pokemon\Pokemon_31.png" /> + <None Include="Images\Pokemon\Pokemon_32.png" /> + <None Include="Images\Pokemon\Pokemon_33.png" /> + <None Include="Images\Pokemon\Pokemon_34.png" /> + <None Include="Images\Pokemon\Pokemon_35.png" /> + <None Include="Images\Pokemon\Pokemon_36.png" /> + <None Include="Images\Pokemon\Pokemon_37.png" /> + <None Include="Images\Pokemon\Pokemon_38.png" /> + <None Include="Images\Pokemon\Pokemon_39.png" /> + <None Include="Images\Pokemon\Pokemon_40.png" /> + <None Include="Images\Pokemon\Pokemon_41.png" /> + <None Include="Images\Pokemon\Pokemon_42.png" /> + <None Include="Images\Pokemon\Pokemon_43.png" /> + <None Include="Images\Pokemon\Pokemon_44.png" /> + <None Include="Images\Pokemon\Pokemon_45.png" /> + <None Include="Images\Pokemon\Pokemon_46.png" /> + <None Include="Images\Pokemon\Pokemon_47.png" /> + <None Include="Images\Pokemon\Pokemon_48.png" /> + <None Include="Images\Pokemon\Pokemon_49.png" /> + <None Include="Images\Pokemon\Pokemon_50.png" /> + <None Include="Images\Pokemon\Pokemon_51.png" /> + <None Include="Images\Pokemon\Pokemon_52.png" /> + <None Include="Images\Pokemon\Pokemon_53.png" /> + <None Include="Images\Pokemon\Pokemon_54.png" /> + <None Include="Images\Pokemon\Pokemon_55.png" /> + <None Include="Images\Pokemon\Pokemon_56.png" /> + <None Include="Images\Pokemon\Pokemon_57.png" /> + <None Include="Images\Pokemon\Pokemon_58.png" /> + <None Include="Images\Pokemon\Pokemon_59.png" /> + <None Include="Images\Pokemon\Pokemon_60.png" /> + <None Include="Images\Pokemon\Pokemon_61.png" /> + <None Include="Images\Pokemon\Pokemon_62.png" /> + <None Include="Images\Pokemon\Pokemon_63.png" /> + <None Include="Images\Pokemon\Pokemon_64.png" /> + <None Include="Images\Pokemon\Pokemon_65.png" /> + <None Include="Images\Pokemon\Pokemon_66.png" /> + <None Include="Images\Pokemon\Pokemon_67.png" /> + <None Include="Images\Pokemon\Pokemon_68.png" /> + <None Include="Images\Pokemon\Pokemon_69.png" /> + <None Include="Images\Pokemon\Pokemon_70.png" /> + <None Include="Images\Pokemon\Pokemon_71.png" /> + <None Include="Images\Pokemon\Pokemon_72.png" /> + <None Include="Images\Pokemon\Pokemon_73.png" /> + <None Include="Images\Pokemon\Pokemon_74.png" /> + <None Include="Images\Pokemon\Pokemon_75.png" /> + <None Include="Images\Pokemon\Pokemon_76.png" /> + <None Include="Images\Pokemon\Pokemon_77.png" /> + <None Include="Images\Pokemon\Pokemon_78.png" /> + <None Include="Images\Pokemon\Pokemon_79.png" /> + <None Include="Images\Pokemon\Pokemon_80.png" /> + <None Include="Images\Pokemon\Pokemon_81.png" /> + <None Include="Images\Pokemon\Pokemon_82.png" /> + <None Include="Images\Pokemon\Pokemon_83.png" /> + <None Include="Images\Pokemon\Pokemon_84.png" /> + <None Include="Images\Pokemon\Pokemon_85.png" /> + <None Include="Images\Pokemon\Pokemon_86.png" /> + <None Include="Images\Pokemon\Pokemon_87.png" /> + <None Include="Images\Pokemon\Pokemon_88.png" /> + <None Include="Images\Pokemon\Pokemon_89.png" /> + <None Include="Images\Pokemon\Pokemon_90.png" /> + <None Include="Images\Pokemon\Pokemon_91.png" /> + <None Include="Images\Pokemon\Pokemon_92.png" /> + <None Include="Images\Pokemon\Pokemon_93.png" /> + <None Include="Images\Pokemon\Pokemon_94.png" /> + <None Include="Images\Pokemon\Pokemon_95.png" /> + <None Include="Images\Pokemon\Pokemon_96.png" /> + <None Include="Images\Pokemon\Pokemon_97.png" /> + <None Include="Images\Pokemon\Pokemon_98.png" /> + <None Include="Images\Pokemon\Pokemon_99.png" /> + <None Include="Images\Pokemon\Pokemon_100.png" /> + <None Include="Images\Pokemon\Pokemon_101.png" /> + <None Include="Images\Pokemon\Pokemon_102.png" /> + <None Include="Images\Pokemon\Pokemon_103.png" /> + <None Include="Images\Pokemon\Pokemon_104.png" /> + <None Include="Images\Pokemon\Pokemon_105.png" /> + <None Include="Images\Pokemon\Pokemon_106.png" /> + <None Include="Images\Pokemon\Pokemon_107.png" /> + <None Include="Images\Pokemon\Pokemon_108.png" /> + <None Include="Images\Pokemon\Pokemon_109.png" /> + <None Include="Images\Pokemon\Pokemon_110.png" /> + <None Include="Images\Pokemon\Pokemon_111.png" /> + <None Include="Images\Pokemon\Pokemon_112.png" /> + <None Include="Images\Pokemon\Pokemon_113.png" /> + <None Include="Images\Pokemon\Pokemon_114.png" /> + <None Include="Images\Pokemon\Pokemon_115.png" /> + <None Include="Images\Pokemon\Pokemon_116.png" /> + <None Include="Images\Pokemon\Pokemon_117.png" /> + <None Include="Images\Pokemon\Pokemon_118.png" /> + <None Include="Images\Pokemon\Pokemon_119.png" /> + <None Include="Images\Pokemon\Pokemon_120.png" /> + <None Include="Images\Pokemon\Pokemon_121.png" /> + <None Include="Images\Pokemon\Pokemon_122.png" /> + <None Include="Images\Pokemon\Pokemon_123.png" /> + <None Include="Images\Pokemon\Pokemon_124.png" /> + <None Include="Images\Pokemon\Pokemon_125.png" /> + <None Include="Images\Pokemon\Pokemon_126.png" /> + <None Include="Images\Pokemon\Pokemon_127.png" /> + <None Include="Images\Pokemon\Pokemon_128.png" /> + <None Include="Images\Pokemon\Pokemon_129.png" /> + <None Include="Images\Pokemon\Pokemon_130.png" /> + <None Include="Images\Pokemon\Pokemon_131.png" /> + <None Include="Images\Pokemon\Pokemon_132.png" /> + <None Include="Images\Pokemon\Pokemon_133.png" /> + <None Include="Images\Pokemon\Pokemon_134.png" /> + <None Include="Images\Pokemon\Pokemon_135.png" /> + <None Include="Images\Pokemon\Pokemon_136.png" /> + <None Include="Images\Pokemon\Pokemon_137.png" /> + <None Include="Images\Pokemon\Pokemon_138.png" /> + <None Include="Images\Pokemon\Pokemon_139.png" /> + <None Include="Images\Pokemon\Pokemon_140.png" /> + <None Include="Images\Pokemon\Pokemon_141.png" /> + <None Include="Images\Pokemon\Pokemon_142.png" /> + <None Include="Images\Pokemon\Pokemon_143.png" /> + <None Include="Images\Pokemon\Pokemon_144.png" /> + <None Include="Images\Pokemon\Pokemon_145.png" /> + <None Include="Images\Pokemon\Pokemon_146.png" /> + <None Include="Images\Pokemon\Pokemon_147.png" /> + <None Include="Images\Pokemon\Pokemon_148.png" /> + <None Include="Images\Pokemon\Pokemon_149.png" /> + <None Include="Images\Pokemon\Pokemon_150.png" /> + <None Include="Images\Pokemon\Pokemon_151.png" /> + <None Include="Images\Items\ItemBlukBerry.png" /> + <None Include="Images\Items\ItemGreatBall.png" /> + <None Include="Images\Items\ItemHyperPotion.png" /> + <None Include="Images\Items\ItemIncenseOrdinary.png" /> + <None Include="Images\Items\ItemIncubatorBasic.png" /> + <None Include="Images\Items\ItemIncubatorBasicUnlimited.png" /> + <None Include="Images\Items\ItemItemStorageUpgrade.png" /> + <None Include="Images\Items\ItemLuckyEgg.png" /> + <None Include="Images\Items\ItemMasterBall.png" /> + <None Include="Images\Items\ItemMaxPotion.png" /> + <None Include="Images\Items\ItemMaxRevive.png" /> + <None Include="Images\Items\ItemNanabBerry.png" /> + <None Include="Images\Items\ItemPinapBerry.png" /> + <None Include="Images\Items\ItemPokeBall.png" /> + <None Include="Images\Items\ItemPokemonStorageUpgrade.png" /> + <None Include="Images\Items\ItemPotion.png" /> + <None Include="Images\Items\ItemRazzBerry.png" /> + <None Include="Images\Items\ItemRevive.png" /> + <None Include="Images\Items\ItemSpecialCamera.png" /> + <None Include="Images\Items\ItemSuperPotion.png" /> + <None Include="Images\Items\ItemTroyDisk.png" /> + <None Include="Images\Items\ItemUltraBall.png" /> + <None Include="Images\Items\ItemWeparBerry.png" /> <Content Include="Resources\encrypt.dll"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> diff --git a/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs b/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs index 904f8a4..00d3ee6 100644 --- a/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs +++ b/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] [assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/PokemonGo/RocketAPI/Window/Properties/Resources.Designer.cs b/PokemonGo/RocketAPI/Window/Properties/Resources.Designer.cs index 3c1cf2a..04ec932 100644 --- a/PokemonGo/RocketAPI/Window/Properties/Resources.Designer.cs +++ b/PokemonGo/RocketAPI/Window/Properties/Resources.Designer.cs @@ -60,6 +60,236 @@ namespace PokemonGo.RocketAPI.Window.Properties { } } + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemBlukBerry { + get { + object obj = ResourceManager.GetObject("ItemBlukBerry", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemGreatBall { + get { + object obj = ResourceManager.GetObject("ItemGreatBall", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemHyperPotion { + get { + object obj = ResourceManager.GetObject("ItemHyperPotion", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemIncenseOrdinary { + get { + object obj = ResourceManager.GetObject("ItemIncenseOrdinary", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemIncubatorBasic { + get { + object obj = ResourceManager.GetObject("ItemIncubatorBasic", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemIncubatorBasicUnlimited { + get { + object obj = ResourceManager.GetObject("ItemIncubatorBasicUnlimited", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemItemStorageUpgrade { + get { + object obj = ResourceManager.GetObject("ItemItemStorageUpgrade", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemLuckyEgg { + get { + object obj = ResourceManager.GetObject("ItemLuckyEgg", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemMasterBall { + get { + object obj = ResourceManager.GetObject("ItemMasterBall", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemMaxPotion { + get { + object obj = ResourceManager.GetObject("ItemMaxPotion", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemMaxRevive { + get { + object obj = ResourceManager.GetObject("ItemMaxRevive", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemNanabBerry { + get { + object obj = ResourceManager.GetObject("ItemNanabBerry", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemPinapBerry { + get { + object obj = ResourceManager.GetObject("ItemPinapBerry", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemPokeBall { + get { + object obj = ResourceManager.GetObject("ItemPokeBall", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemPokemonStorageUpgrade { + get { + object obj = ResourceManager.GetObject("ItemPokemonStorageUpgrade", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemPotion { + get { + object obj = ResourceManager.GetObject("ItemPotion", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemRazzBerry { + get { + object obj = ResourceManager.GetObject("ItemRazzBerry", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemRevive { + get { + object obj = ResourceManager.GetObject("ItemRevive", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemSpecialCamera { + get { + object obj = ResourceManager.GetObject("ItemSpecialCamera", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemSuperPotion { + get { + object obj = ResourceManager.GetObject("ItemSuperPotion", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemTroyDisk { + get { + object obj = ResourceManager.GetObject("ItemTroyDisk", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemUltraBall { + get { + object obj = ResourceManager.GetObject("ItemUltraBall", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ItemWeparBerry { + get { + object obj = ResourceManager.GetObject("ItemWeparBerry", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> diff --git a/PokemonGo/RocketAPI/Window/Properties/Resources.resx b/PokemonGo/RocketAPI/Window/Properties/Resources.resx index 1232c22..36376db 100644 --- a/PokemonGo/RocketAPI/Window/Properties/Resources.resx +++ b/PokemonGo/RocketAPI/Window/Properties/Resources.resx @@ -118,457 +118,526 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="ItemBlukBerry" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemBlukBerry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemGreatBall" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemGreatBall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemHyperPotion" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemHyperPotion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemIncenseOrdinary" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemIncenseOrdinary.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemIncubatorBasic" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemIncubatorBasic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemIncubatorBasicUnlimited" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemIncubatorBasicUnlimited.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemItemStorageUpgrade" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemItemStorageUpgrade.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemLuckyEgg" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemLuckyEgg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemMasterBall" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemMasterBall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemMaxPotion" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemMaxPotion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemMaxRevive" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemMaxRevive.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemNanabBerry" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemNanabBerry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemPinapBerry" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemPinapBerry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemPokeBall" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemPokeBall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemPokemonStorageUpgrade" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemPokemonStorageUpgrade.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemPotion" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemPotion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemRazzBerry" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemRazzBerry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemRevive" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemRevive.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemSpecialCamera" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemSpecialCamera.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemSuperPotion" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemSuperPotion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemTroyDisk" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemTroyDisk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemUltraBall" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemUltraBall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="ItemWeparBerry" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Images\Items\ItemWeparBerry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="Pokemon_1" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_10" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_100" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_100.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_100.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_101" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_101.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_101.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_102" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_102.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_102.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_103" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_103.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_103.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_104" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_104.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_104.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_105" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_105.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_105.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_106" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_106.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_106.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_107" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_107.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_107.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_108" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_108.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_108.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_109" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_109.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_109.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_11" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_110" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_110.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_110.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_111" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_111.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_111.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_112" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_112.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_112.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_113" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_113.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_113.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_114" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_114.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_114.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_115" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_115.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_115.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_116" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_116.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_116.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_117" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_117.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_117.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_118" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_118.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_118.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_119" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_119.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_119.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_12" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_120" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_120.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_120.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_121" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_121.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_121.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_122" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_122.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_122.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_123" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_123.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_123.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_124" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_124.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_124.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_125" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_125.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_125.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_126" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_126.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_126.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_127" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_127.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_127.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_128" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_129" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_129.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_129.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_13" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_130" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_130.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_130.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_131" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_131.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_131.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_132" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_132.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_132.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_133" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_133.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_133.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_134" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_134.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_134.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_135" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_135.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_135.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_136" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_136.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_136.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_137" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_137.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_137.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_138" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_138.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_138.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_139" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_139.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_139.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_14" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_140" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_140.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_140.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_141" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_141.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_141.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_142" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_142.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_142.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_143" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_143.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_143.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_144" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_144.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_144.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_145" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_145.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_145.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_146" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_146.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_146.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_147" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_147.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_147.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_148" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_148.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_148.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_149" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_149.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_149.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_15" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_150" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_150.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_150.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_151" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_151.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_151.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_17" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_18" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_19" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_19.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_19.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_2" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_20" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_21" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_22" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_22.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_22.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_23" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_23.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_23.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_24" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_25" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_26" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_26.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_26.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_27" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_27.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_27.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_28" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_28.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_28.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_29" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_29.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_29.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_3" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_30" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_31" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_31.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_31.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_33" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_33.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_33.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_34" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_34.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_34.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_35" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_35.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_35.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_36" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_36.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_36.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_37" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_37.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_37.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_38" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_38.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_38.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_39" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_39.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_39.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_4" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_40" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_41" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_41.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_41.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_42" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_42.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_42.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_43" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_43.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_43.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_44" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_44.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_44.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_45" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_45.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_45.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_46" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_46.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_46.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_47" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_47.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_47.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_48" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_49" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_49.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_49.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_5" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_50" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_51" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_51.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_51.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_52" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_52.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_52.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_53" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_53.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_53.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_54" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_54.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_54.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_55" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_55.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_55.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_56" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_56.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_56.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_57" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_57.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_57.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_58" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_58.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_58.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_59" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_59.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_59.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_6" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_60" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_60.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_60.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_61" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_61.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_61.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_62" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_62.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_62.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_63" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_63.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_63.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_64" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_65" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_65.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_65.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_66" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_66.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_66.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_67" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_67.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_67.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_68" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_68.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_68.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_69" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_69.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_69.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_7" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_70" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_70.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_70.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_71" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_71.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_71.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_72" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_73" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_73.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_73.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_74" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_74.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_74.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_75" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_75.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_75.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_76" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_76.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_76.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_77" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_77.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_77.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_78" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_78.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_78.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_79" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_79.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_79.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_8" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_80" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_80.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_80.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_81" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_81.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_81.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_82" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_82.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_82.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_83" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_83.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_83.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_84" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_84.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_84.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_85" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_85.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_85.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_86" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_86.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_86.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_87" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_87.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_87.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_88" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_88.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_88.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_89" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_89.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_89.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_9" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_90" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_90.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_90.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_91" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_91.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_91.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_92" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_92.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_92.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_93" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_93.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_93.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_94" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_94.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_94.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_95" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_95.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_95.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_96" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_97" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_97.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_97.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_98" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_98.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_98.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Pokemon_99" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\img\Pokemon_99.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Images\Pokemon\Pokemon_99.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root> \ No newline at end of file diff --git a/PokemonGo/RocketAPI/Window/Settings.cs b/PokemonGo/RocketAPI/Window/Settings.cs index db7cd76..2d40e62 100644 --- a/PokemonGo/RocketAPI/Window/Settings.cs +++ b/PokemonGo/RocketAPI/Window/Settings.cs @@ -94,7 +94,7 @@ namespace PokemonGo.RocketAPI.Window new KeyValuePair<ItemId, int>(ItemId.ItemMaxPotion, MaxItemMaxPotion) }; - public int RecycleItemsInterval => GetSetting() != string.Empty ? Convert.ToInt16(GetSetting()) : 60; + public int RecycleItemsInterval => GetSetting() != string.Empty ? Convert.ToInt16(GetSetting()) : 0; public string Language => GetSetting() != string.Empty ? GetSetting() : "english";
