diff --git a/PokemonGo.RocketBot.Window/App.config b/PokemonGo.RocketBot.Window/App.config index d5acdf5..d1e0a4c 100644 --- a/PokemonGo.RocketBot.Window/App.config +++ b/PokemonGo.RocketBot.Window/App.config @@ -1,9 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> + <configuration> <configSections> - <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <section name="PokemonGo.RocketBot.Window.UserSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> - <section name="PokemonGo.RocketBot.Window.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> + <sectionGroup name="userSettings" + type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <section name="PokemonGo.RocketBot.Window.UserSettings" + type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" + allowExeDefinition="MachineToLocalUser" requirePermission="false" /> + <section name="PokemonGo.RocketBot.Window.Settings" + type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" + allowExeDefinition="MachineToLocalUser" requirePermission="false" /> </sectionGroup> </configSections> <startup> @@ -26,6 +32,7 @@ </assemblyBinding> </runtime> <connectionStrings> - <add name="Pogo" connectionString="DatasetId = YOUR_DATASET_ID; CertificateFilePath = C:\Path\To\Your\Certificate\File-privatekey.p12; ServiceAccountId = your-service-account-email@developer.gserviceaccount.com; CertificatePassword = notasecret" /> + <add name="Pogo" + connectionString="DatasetId = YOUR_DATASET_ID; CertificateFilePath = C:\Path\To\Your\Certificate\File-privatekey.p12; ServiceAccountId = your-service-account-email@developer.gserviceaccount.com; CertificatePassword = notasecret" /> </connectionStrings> -</configuration> +</configuration> \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.ca.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.ca.json index 6953d5f..72bd074 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.ca.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.ca.json @@ -19,18 +19,20 @@ { "Key": "wrongAuthType", "Value": "AuthType desconegut dins de config.json" - }, + }, { "Key": "loginInvalid", "Value": "Les credencials d'usuari són invàlides i el login ha fallat." }, { "Key": "farmPokestopsOutsideRadius", - "Value": "Ets fora del radi definit! Caminant cap a la posició inicial (a {0}m) en 5 segons. És correcte el teu arxiu Coords.ini?" + "Value": + "Ets fora del radi definit! Caminant cap a la posició inicial (a {0}m) en 5 segons. És correcte el teu arxiu Coords.ini?" }, { "Key": "farmPokestopsNoUsableFound", - "Value": "No s'han trobat pokeparades disponibles dins la teva àrea. Has configurat una distància màxima massa petita?" + "Value": + "No s'han trobat pokeparades disponibles dins la teva àrea. Has configurat una distància màxima massa petita?" }, { "Key": "eventFortUsed", @@ -47,8 +49,8 @@ { "Key": "eventProfileLogin", "Value": "Jugant com a {0}" - }, - { + }, + { "Key": "eventUsedIncense", "Value": "S'ha fet servir encens, en queden: {0}" }, @@ -74,23 +76,26 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Nvll: {3} PC: ({4}/{5}) IV: {6}% | Probabilitat: {7}% | Dist {8}m | amb una {9} (en queden {10}). | {11} punts d'EXP obtinguts | lat: {12} long: {13}" + "Value": + "({0}) | ({1}) {2} Nvll: {3} PC: ({4}/{5}) IV: {6}% | Probabilitat: {7}% | Dist {8}m | amb una {9} (en queden {10}). | {11} punts d'EXP obtinguts | lat: {12} long: {13}" }, - { + { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Nvll: {3} PC: ({4}/{5}) IV: {6}% | Probabilitat: {7}% | Dist {8}m | amb una {9} (en queden {10}). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Nvll: {3} PC: ({4}/{5}) IV: {6}% | Probabilitat: {7}% | Dist {8}m | amb una {9} (en queden {10}). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", "Value": "Sense Pokéballs! - Hem perdut un {0} amb {1} PC :(" }, - { + { "Key": "waitingForMorePokemonToEvolve", "Value": "Esperant a evolucionar {0} Pokemon un cope se n'hagin capturat {1} més! ({2}/{3} per {4}% inventari)" }, { "Key": "useLuckyEggsMinPokemonAmountTooHigh", - "Value": "Mai es farà servir cap Ou de la Sort quan UseLuckyEggsMinPokemonAmount estigui definit com a {0}, en comptes, fes servir <= {1}" + "Value": + "Mai es farà servir cap Ou de la Sort quan UseLuckyEggsMinPokemonAmount estigui definit com a {0}, en comptes, fes servir <= {1}" }, { "Key": "catchMorePokemonToUseLuckyEgg", @@ -104,8 +109,6 @@ "Key": "itemRazzBerry", "Value": "Baia" }, - - { "Key": "catchStatusAttempt", "Value": "{0} Intent #{1}" @@ -152,7 +155,8 @@ }, { "Key": "welcomeWarning", - "Value": "Asegura't que la Latitud i la Longitud són correctes. Surt del programa si no és així! Lat: {0} Lng: {1}" + "Value": + "Asegura't que la Latitud i la Longitud són correctes. Surt del programa si no és així! Lat: {0} Lng: {1}" }, { "Key": "incubatorPuttingEgg", @@ -190,7 +194,7 @@ "Key": "logEntrySniper", "Value": "SNIPER" }, - { + { "Key": "logEntryRecycling", "Value": "RECICLANT" }, @@ -228,7 +232,8 @@ }, { "Key": "ptcOffline", - "Value": "Els servidors de PTC probablement han caigut o les teves dades d'accés són incorrectes. Prova amb Google." + "Value": + "Els servidors de PTC probablement han caigut o les teves dades d'accés són incorrectes. Prova amb Google." }, { "Key": "tryingAgainIn", @@ -332,7 +337,8 @@ }, { "Key": "invFullTransferManually", - "Value": "L'inventari de pokemon està ple. Si us plau, transfereix els pokemons manualment o activa l'opció TransferDuplicatePokemon dins l'arxiu de Configuració posant-la com a (True)..." + "Value": + "L'inventari de pokemon està ple. Si us plau, transfereix els pokemons manualment o activa l'opció TransferDuplicatePokemon dins l'arxiu de Configuració posant-la com a (True)..." }, { "Key": "invFullPokestopLooting", @@ -358,7 +364,6 @@ "Key": "pokemonFavorite", "Value": "{0}% perfect {1} (CP {2}) *favorited*." }, - { "Key": "pokemonIgnoreFilter", "Value": "[Filtre de Pokemons Ignorats] - Ignorant {0} tal i com s'ha definit en la configuració actual." @@ -405,7 +410,8 @@ }, { "Key": "statsTemplateString", - "Value": "{0} - Actiu {1} - Nivell: {2} | EXP/H: {3:n0} | P/H: {4:n0} | P.Estel·lar: {5:n0} | Transferit: {6:n0} | Reciclat: {7:n0}" + "Value": + "{0} - Actiu {1} - Nivell: {2} | EXP/H: {3:n0} | P/H: {4:n0} | P.Estel·lar: {5:n0} | Transferit: {6:n0} | Reciclat: {7:n0}" }, { "Key": "statsXpTemplateString", @@ -417,11 +423,13 @@ }, { "Key": "googleTwoFactorAuth", - "Value": "Com tens habilitada l'autenticació en 2 passos de Google, hauràs d'inserir una contrasenya específica de l'APP dins de l'arxiu auth.json" + "Value": + "Com tens habilitada l'autenticació en 2 passos de Google, hauràs d'inserir una contrasenya específica de l'APP dins de l'arxiu auth.json" }, { "Key": "googleTwoFactorAuthExplanation", - "Value": "Obrint Google App-Passwords. Si us plau, crea una nova contrasenya en l'APP (utilitzar en un altre dispositiu)" + "Value": + "Obrint Google App-Passwords. Si us plau, crea una nova contrasenya en l'APP (utilitzar en un altre dispositiu)" }, { "Key": "googleError", @@ -463,13 +471,14 @@ "Key": "displayHighestMOVE2Header", "Value": "MOVIMENT2" }, - { + { "Key": "displayHighestCandy", "Value": "Caramels" }, { "Key": "ipBannedError", - "Value": "Connexió refusada. És possible que la teva IP hagi estat posada a la llista negra per part de Niantic. Sortint..." + "Value": + "Connexió refusada. És possible que la teva IP hagi estat posada a la llista negra per part de Niantic. Sortint..." }, { "Key": "noEggsAvailable", @@ -521,37 +530,36 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } - ], "PokemonStrings": [ { diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.cs.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.cs.json index f17fcfa..2a467a0 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.cs.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.cs.json @@ -1,4 +1,4 @@ -*{ +*{ "TranslationStrings": [ { "Key": "pokeball", @@ -67,11 +67,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -364,7 +366,8 @@ }, { "Key": "StatsTemplateString", - "Value": "{0} - Doba spuštění {1} - Úroveň: {2} | Zk/H: {3:n0} | P/H: {4:n0} | Hvězdný prach: {5:n0} | Přeneseno: {6:n0} | Vyhozeno: {7:n0}" + "Value": + "{0} - Doba spuštění {1} - Úroveň: {2} | Zk/H: {3:n0} | P/H: {4:n0} | Hvězdný prach: {5:n0} | Přeneseno: {6:n0} | Vyhozeno: {7:n0}" }, { "Key": "StatsXpTemplateString", @@ -376,7 +379,8 @@ }, { "Key": "GoogleTwoFactorAuth", - "Value": "U vašeho Google účtu máte nastaveno dvoufázové ověření (2FA), musíte vložit speciální heslo do auth.json" + "Value": + "U vašeho Google účtu máte nastaveno dvoufázové ověření (2FA), musíte vložit speciální heslo do auth.json" }, { "Key": "GoogleTwoFactorAuthExplanation", @@ -480,19 +484,19 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], "PokemonStrings": [ @@ -1101,4 +1105,4 @@ "Value": "Mew" } ] -} + } diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.da.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.da.json index dab279d..0f3fd09 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.da.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.da.json @@ -103,11 +103,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -388,19 +390,19 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], "PokemonStrings": [ diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.de.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.de.json index 4fdfcb3..de8dda3 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.de.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.de.json @@ -67,11 +67,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m entfernt | mit {9} ({10} verbleibend). | {11} EP erhalten | {12} | B: {13} L: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m entfernt | mit {9} ({10} verbleibend). | {11} EP erhalten | {12} | B: {13} L: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m entfernt | mit {9} ({10} verbleibend). | B: {11} L: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m entfernt | mit {9} ({10} verbleibend). | B: {11} L: {12}" }, { "Key": "eventNoPokeballs", @@ -364,11 +366,13 @@ }, { "Key": "StatsTemplateString", - "Value": "{0} - Laufzeit {1} - Lvl: {2} | EP/H: {3:n0} | P/H: {4:n0} | Sternenstaub: {5:n0} | Verschickt: {6:n0} | Weggeworfen: {7:n0}" + "Value": + "{0} - Laufzeit {1} - Lvl: {2} | EP/H: {3:n0} | P/H: {4:n0} | Sternenstaub: {5:n0} | Verschickt: {6:n0} | Weggeworfen: {7:n0}" }, { "Key": "ProfileStatsTemplateString", - "Value": "----- LVL {0} | {1} ----- \n Erfahrungspunkte: {2}/{3} \n Pokemons gefangen: {4} \n Pokemons verschickt: {5} \n Pokestops besucht: {6} \n Eier geschlüpft: {7} \n Pokemons entwickelt: {8} \n Pokedex Einträge: {9} \n KM gelaufen: {10} \n Pokemons: {11}/{12}" + "Value": + "----- LVL {0} | {1} ----- \n Erfahrungspunkte: {2}/{3} \n Pokemons gefangen: {4} \n Pokemons verschickt: {5} \n Pokestops besucht: {6} \n Eier geschlüpft: {7} \n Pokemons entwickelt: {8} \n Pokedex Einträge: {9} \n KM gelaufen: {10} \n Pokemons: {11}/{12}" }, { "Key": "ShowPokeTemplate", @@ -376,7 +380,8 @@ }, { "Key": "HelpTemplate", - "Value": "Kommandos: \n \n /top <cp/iv> <amount> - Zeigt die besten Pokemons an. \n /all <cp/iv> - Zeigt dir alle Pokemons an. \n /profile - Zeigt dein Profil. \n /loc - Zeigt deine Position an. \n /items - Zeigt dir deine Items \n /status - Zeigt den Status vom Bot. \n /pokedex - Zeigt dein Pokedex. " + "Value": + "Kommandos: \n \n /top <cp/iv> <amount> - Zeigt die besten Pokemons an. \n /all <cp/iv> - Zeigt dir alle Pokemons an. \n /profile - Zeigt dein Profil. \n /loc - Zeigt deine Position an. \n /items - Zeigt dir deine Items \n /status - Zeigt den Status vom Bot. \n /pokedex - Zeigt dein Pokedex. " }, { "Key": "StatsXpTemplateString", @@ -388,7 +393,8 @@ }, { "Key": "GoogleTwoFactorAuth", - "Value": "Wenn Google-Zwei-Faktor-Authentifizierung aktiviert ist, muss ein App Spezifisches Passwort in die auth.json eingefügt werden." + "Value": + "Wenn Google-Zwei-Faktor-Authentifizierung aktiviert ist, muss ein App Spezifisches Passwort in die auth.json eingefügt werden." }, { "Key": "GoogleTwoFactorAuthExplanation", @@ -488,23 +494,24 @@ }, { "Key": "waitingForMorePokemonToEvolve", - "Value": "Warte mit Entwicklungen von {0} Pokémon bis {1} weitere gefangen wurden! ({2}/{3} bis {4}% Inventar Auslastung)" + "Value": + "Warte mit Entwicklungen von {0} Pokémon bis {1} weitere gefangen wurden! ({2}/{3} bis {4}% Inventar Auslastung)" }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex gefangen --- \n" + "Value": "--- Pokedex gefangen --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Gefangen: {2} | Gesehen: {3} \n" + "Value": "#{0} Name: {1} | Gefangen: {2} | Gesehen: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex gebraucht --- \n" + "Value": "--- Pokedex gebraucht --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], "PokemonStrings": [ diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.es.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.es.json index 527fbc8..d00306d 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.es.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.es.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -26,11 +26,13 @@ }, { "Key": "farmPokestopsOutsideRadius", - "Value": "¡Estás fuera del radio definido! Andando a la posición inicial (a {0}m) en 5 segundos. ¿Es correcto tu archivo LastPos.ini?" + "Value": + "¡Estás fuera del radio definido! Andando a la posición inicial (a {0}m) en 5 segundos. ¿Es correcto tu archivo LastPos.ini?" }, { "Key": "farmPokestopsNoUsableFound", - "Value": "No se encontraron Poképaradas disponibles en tu área. ¿Has configurado una distancia máxima demasiado pequeña?" + "Value": + "No se encontraron Poképaradas disponibles en tu área. ¿Has configurado una distancia máxima demasiado pequeña?" }, { "Key": "eventFortUsed", @@ -74,11 +76,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} | Nivel: {3} PC: ({4}/{5}) IV: {6}% | Prob: {7}% | {8}m dist | con {9} (quedan {10}). | {11} EXP ganada | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} | Nivel: {3} PC: ({4}/{5}) IV: {6}% | Prob: {7}% | {8}m dist | con {9} (quedan {10}). | {11} EXP ganada | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} | Nivel: {3} PC: ({4}/{5}) IV: {6}% | Prob: {7}% | {8}m dist | con {9} (quedan {10}). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} | Nivel: {3} PC: ({4}/{5}) IV: {6}% | Prob: {7}% | {8}m dist | con {9} (quedan {10}). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -90,7 +94,8 @@ }, { "Key": "useLuckyEggsMinPokemonAmountTooHigh", - "Value": "Los huevos de la suerte nunca serán utilizados con UseLuckyEggsMinPokemonAmount en {0}, usa <= {1} en su lugar" + "Value": + "Los huevos de la suerte nunca serán utilizados con UseLuckyEggsMinPokemonAmount en {0}, usa <= {1} en su lugar" }, { "Key": "catchMorePokemonToUseLuckyEgg", @@ -150,7 +155,8 @@ }, { "Key": "welcomeWarning", - "Value": "Asegúrese de que la Latitud y Longitud son las correctas. ¡Salga del Programa si no es así! Lat: {0} Long: {1}" + "Value": + "Asegúrese de que la Latitud y Longitud son las correctas. ¡Salga del Programa si no es así! Lat: {0} Long: {1}" }, { "Key": "incubatorPuttingEgg", @@ -230,7 +236,8 @@ }, { "Key": "ptcOffline", - "Value": "Es probable que los servidores de PTC estén caídos o que tus datos de acceso sean incorrectos. Prueba con Google." + "Value": + "Es probable que los servidores de PTC estén caídos o que tus datos de acceso sean incorrectos. Prueba con Google." }, { "Key": "accessTokenExpired", @@ -338,7 +345,8 @@ }, { "Key": "maxItemsCombinedOverMaxItemStorage", - "Value": "[Configuración Inválida] El Máximo de items combinados (bolas+pociones+revivir={0}) está por encima del almacenamiento máximo ({1})" + "Value": + "[Configuración Inválida] El Máximo de items combinados (bolas+pociones+revivir={0}) está por encima del almacenamiento máximo ({1})" }, { "Key": "recyclingQuietly", @@ -350,7 +358,8 @@ }, { "Key": "invFullTransferManually", - "Value": "El inventario de Pokémon está lleno. Transfiera los Pokémon manualmente o active (true) TransferDuplicatePokemon en config.json..." + "Value": + "El inventario de Pokémon está lleno. Transfiera los Pokémon manualmente o active (true) TransferDuplicatePokemon en config.json..." }, { "Key": "invFullPokestopLooting", @@ -422,7 +431,8 @@ }, { "Key": "statsTemplateString", - "Value": "{0} - Activo {1} - Nivel: {2} | EXP/H: {3:n0} | P/H: {4:n0} | P.Estelar: {5:n0} | Transferido: {6:n0} | Reciclado: {7:n0}" + "Value": + "{0} - Activo {1} - Nivel: {2} | EXP/H: {3:n0} | P/H: {4:n0} | P.Estelar: {5:n0} | Transferido: {6:n0} | Reciclado: {7:n0}" }, { "Key": "statsXpTemplateString", @@ -434,11 +444,13 @@ }, { "Key": "googleTwoFactorAuth", - "Value": "Como tiene habilitada la autenticación de dos factores de Google, tendrá que insertar una contraseña de la APP específica en el auth.json" + "Value": + "Como tiene habilitada la autenticación de dos factores de Google, tendrá que insertar una contraseña de la APP específica en el auth.json" }, { "Key": "googleTwoFactorAuthExplanation", - "Value": "Abriendo Google App-Passwords. Por favor, cree una nueva contraseña en la APP (utilizar en otro dispositivo)" + "Value": + "Abriendo Google App-Passwords. Por favor, cree una nueva contraseña en la APP (utilizar en otro dispositivo)" }, { "Key": "googleError", @@ -634,19 +646,19 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], "PokemonStrings": [ diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.et.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.et.json index 9ae5d83..1cdf3c2 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.et.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.et.json @@ -99,11 +99,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -337,22 +339,22 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Bulbasaur" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.fr.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.fr.json index 60d5db8..2a5a301 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.fr.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.fr.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -26,11 +26,13 @@ }, { "Key": "farmPokestopsOutsideRadius", - "Value": "Vous dépassez votre rayon d'action! Début de la marche ({0}m de distance) dans 5 secondes. Vérifiez votre fichier LastPos.ini" + "Value": + "Vous dépassez votre rayon d'action! Début de la marche ({0}m de distance) dans 5 secondes. Vérifiez votre fichier LastPos.ini" }, { "Key": "farmPokestopsNoUsableFound", - "Value": "Impossible de trouver un PokeStop. Modifiez la valeur de MaxTravelDistanceInMeters dans le fichier config.json" + "Value": + "Impossible de trouver un PokeStop. Modifiez la valeur de MaxTravelDistanceInMeters dans le fichier config.json" }, { "Key": "eventFortUsed", @@ -74,11 +76,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | dist {8}m | {10} {9} restante(s) | {11}XP | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | dist {8}m | {10} {9} restante(s) | {11}XP | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | avec une {9} ({10} restante) | lat: {11} long: {12} " + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | avec une {9} ({10} restante) | lat: {11} long: {12} " }, { "Key": "eventNoPokeballs", @@ -90,7 +94,8 @@ }, { "Key": "useLuckyEggsMinPokemonAmountTooHigh", - "Value": "Un Œuf Chance ne peut être utilisé qu'avec UseLuckyEggsMinPokemonAmount = {0}, utilisez plutôt une valeur <= à {1}" + "Value": + "Un Œuf Chance ne peut être utilisé qu'avec UseLuckyEggsMinPokemonAmount = {0}, utilisez plutôt une valeur <= à {1}" }, { "Key": "catchMorePokemonToUseLuckyEgg", @@ -230,7 +235,8 @@ }, { "Key": "ptcOffline", - "Value": "Les serveurs PTC semblent hors-ligne ou vos identifiants PTC sont incorrects. Merci d'essayer via Google." + "Value": + "Les serveurs PTC semblent hors-ligne ou vos identifiants PTC sont incorrects. Merci d'essayer via Google." }, { "Key": "accessTokenExpired", @@ -270,7 +276,8 @@ }, { "Key": "coordinatesAreInvalid", - "Value": "Les coordonnées définies dans le fichier \"LastPos.ini\" sont invalides, utilisation des coordonnées par défaut." + "Value": + "Les coordonnées définies dans le fichier \"LastPos.ini\" sont invalides, utilisation des coordonnées par défaut." }, { "Key": "gotUpToDateVersion", @@ -338,7 +345,8 @@ }, { "Key": "maxItemsCombinedOverMaxItemStorage", - "Value": "[Configuration Invalide] Vos objets consommables (Pokéballs+Potions+Rappels={0}) dépassent le seuil de votre inventaire ({1})" + "Value": + "[Configuration Invalide] Vos objets consommables (Pokéballs+Potions+Rappels={0}) dépassent le seuil de votre inventaire ({1})" }, { "Key": "recyclingQuietly", @@ -350,7 +358,8 @@ }, { "Key": "invFullTransferManually", - "Value": "L'inventaire de Pokémon est plein. Merci de transférer manuellement ou de changer la valeur de \"TransferDuplicatePokemon\" en \"true\"..." + "Value": + "L'inventaire de Pokémon est plein. Merci de transférer manuellement ou de changer la valeur de \"TransferDuplicatePokemon\" en \"true\"..." }, { "Key": "invFullPokestopLooting", @@ -422,7 +431,8 @@ }, { "Key": "statsTemplateString", - "Value": "{0} - {1} - Lvl: {2} | EXP/H: {3:0} | P/H: {4:0} | Poussières: {5:0} | Transférés: {6:0} | Recyclés: {7:0}" + "Value": + "{0} - {1} - Lvl: {2} | EXP/H: {3:0} | P/H: {4:0} | Poussières: {5:0} | Transférés: {6:0} | Recyclés: {7:0}" }, { "Key": "statsXpTemplateString", @@ -434,11 +444,13 @@ }, { "Key": "googleTwoFactorAuth", - "Value": "La validation en deux étapes de votre compte Google est activée, vous devez insérer un mot de passe spécifique à l'application dans auth.json" + "Value": + "La validation en deux étapes de votre compte Google est activée, vous devez insérer un mot de passe spécifique à l'application dans auth.json" }, { "Key": "googleTwoFactorAuthExplanation", - "Value": "Ouverture de la page Mots de passe d'application Google. Merci de générer un nouveau mot de passe spécifique à l'application. (utilisez 'Autre' comme périphérique)" + "Value": + "Ouverture de la page Mots de passe d'application Google. Merci de générer un nouveau mot de passe spécifique à l'application. (utilisez 'Autre' comme périphérique)" }, { "Key": "googleError", @@ -634,19 +646,19 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], "PokemonStrings": [ @@ -732,15 +744,15 @@ }, { "Key": "spearow", - "Value": "Piafabec" + "Value": "Piafabec" }, { "Key": "fearow", - "Value": "Rapasdepic" + "Value": "Rapasdepic" }, { "Key": "ekans", - "Value": "Abo" + "Value": "Abo" }, { "Key": "arbok", @@ -858,7 +870,7 @@ "Key": "meowth", "Value": "Miaouss" }, - { + { "Key": "persian", "Value": "Persian" }, diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.gr.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.gr.json index 5734ba0..71c1b7e 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.gr.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.gr.json @@ -68,11 +68,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -394,22 +396,22 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Bulbasaur" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.hu.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.hu.json index 0a77084..b660e55 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.hu.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.hu.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -22,7 +22,8 @@ }, { "Key": "farmPokestopsOutsideRadius", - "Value": "Kívül vagy a megadott maximális távolságon! Séta az induláshoz ({0}méterre) 5 másodperc múlva. A Coords.ini fájlod rendben van?" + "Value": + "Kívül vagy a megadott maximális távolságon! Séta az induláshoz ({0}méterre) 5 másodperc múlva. A Coords.ini fájlod rendben van?" }, { "Key": "farmPokestopsNoUsableFound", @@ -66,11 +67,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Esély: {7}% | {8}m távolságra | with a {9} ({10} maradt). | {11} kapott EXP | {12} | szél.: {13} hossz.: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Esély: {7}% | {8}m távolságra | with a {9} ({10} maradt). | {11} kapott EXP | {12} | szél.: {13} hossz.: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Esély: {7}% | {8}m távolságra | with a {9} ({10} maradt). | szél.: {11} hossz.: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Esély: {7}% | {8}m távolságra | with a {9} ({10} maradt). | szél.: {11} hossz.: {12}" }, { "Key": "eventNoPokeballs", @@ -122,7 +125,8 @@ }, { "Key": "welcomeWarning", - "Value": "Győződj meg róla hogy a szélesség és a hosszúság helyes-e. Zárd be a programot ha nem! Szélesség: {0} Hosszúság: {1}" + "Value": + "Győződj meg róla hogy a szélesség és a hosszúság helyes-e. Zárd be a programot ha nem! Szélesség: {0} Hosszúság: {1}" }, { "Key": "incubatorPuttingEgg", @@ -322,7 +326,8 @@ }, { "Key": "invFullTransferManually", - "Value": "A pokémon tárhely megtelt! TOvábbíts pokémonokat manuálisan a professzornak vagy állítsd a TransferDuplicatePokemon értékét true-ra a beállításokban..." + "Value": + "A pokémon tárhely megtelt! TOvábbíts pokémonokat manuálisan a professzornak vagy állítsd a TransferDuplicatePokemon értékét true-ra a beállításokban..." }, { "Key": "invFullPokestopLooting", @@ -390,7 +395,8 @@ }, { "Key": "statsTemplateString", - "Value": "{0} - Futás idő {1} - Lvl: {2} | EXP/H: {3:n0} | P/H: {4:n0} | Csillagpor: {5:n0} | Továbbítva: {6:n0} | Kidobva: {7:n0} Fordította: SkayRedux" + "Value": + "{0} - Futás idő {1} - Lvl: {2} | EXP/H: {3:n0} | P/H: {4:n0} | Csillagpor: {5:n0} | Továbbítva: {6:n0} | Kidobva: {7:n0} Fordította: SkayRedux" }, { "Key": "statsXpTemplateString", @@ -402,11 +408,13 @@ }, { "Key": "googleTwoFactorAuth", - "Value": "Hogyha van Google 2 tényezős hitelesítésed engedélyezve, be kell illesztened egy alkalmazás által meghatározott kódot az auth.json fájlba" + "Value": + "Hogyha van Google 2 tényezős hitelesítésed engedélyezve, be kell illesztened egy alkalmazás által meghatározott kódot az auth.json fájlba" }, { "Key": "googleTwoFactorAuthExplanation", - "Value": "Google alkalmazás jelszavak megnyitása. Adj meg új alkalmazás jelszót (használd az újat felhasználóként)" + "Value": + "Google alkalmazás jelszavak megnyitása. Adj meg új alkalmazás jelszót (használd az újat felhasználóként)" }, { "Key": "googleError", @@ -450,19 +458,19 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Regisztrált pokémonok a Pokédexben --- \n" + "Value": "--- Regisztrált pokémonok a Pokédexben --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Név: {1} | Elfogva: {2} | Látott: {3} \n" + "Value": "#{0} Név: {1} | Elfogva: {2} | Látott: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Regisztrálatlan pokémonok --- \n" + "Value": "--- Regisztrálatlan pokémonok --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Név: {1} \n" + "Value": "#{0} Név: {1} \n" } ], "PokemonStrings": [ diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.id.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.id.json index 3ab9706..5c2f235 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.id.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.id.json @@ -20,13 +20,14 @@ "Key": "wrongAuthType", "Value": "Jenis AuthType pada config.json tidak dikenal" }, - { + { "Key": "loginInvalid", "Value": "Username dan password tidak cocok, login gagal!" }, { "Key": "farmPokestopsOutsideRadius", - "Value": "Kamu diluar dari radius yang telah kamu tentukan! Kembali ke posisi awal (sekitar {0} meter) dalam 5 detik. Apakah berkas LastPos.ini kamu benar?" + "Value": + "Kamu diluar dari radius yang telah kamu tentukan! Kembali ke posisi awal (sekitar {0} meter) dalam 5 detik. Apakah berkas LastPos.ini kamu benar?" }, { "Key": "farmPokestopsNoUsableFound", @@ -48,7 +49,7 @@ "Key": "eventProfileLogin", "Value": "Bermain sebagai {0}" }, - { + { "Key": "eventUsedIncense", "Value": "Memakai Incense, tersisa: {0}" }, @@ -74,11 +75,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Kemungkinan: {7}% | Jarak: {8} meter | menggunakan {9} ( Sisa {10}). | mendapatkan: {11} EXP | {12} | lintang: {13} bujur: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Kemungkinan: {7}% | Jarak: {8} meter | menggunakan {9} ( Sisa {10}). | mendapatkan: {11} EXP | {12} | lintang: {13} bujur: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | kemungkinan: {7}% | Jarak: {8} meter | menggunakan {9} ( Sisa {10}). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | kemungkinan: {7}% | Jarak: {8} meter | menggunakan {9} ( Sisa {10}). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -90,7 +93,8 @@ }, { "Key": "useLuckyEggsMinPokemonAmountTooHigh", - "Value": "Lucky Egg tidak akan terpakai dengan pengaturan UseLuckyEggsMinPokemonAmount diatur ke {0}, gunakan <= {1}" + "Value": + "Lucky Egg tidak akan terpakai dengan pengaturan UseLuckyEggsMinPokemonAmount diatur ke {0}, gunakan <= {1}" }, { "Key": "catchMorePokemonToUseLuckyEgg", @@ -150,7 +154,8 @@ }, { "Key": "welcomeWarning", - "Value": "Pastikan koordinat kamu telah benar. Tutup program dan konfigurasi ulang jika belum! X (lintang): {0} Y (bujur): {1}" + "Value": + "Pastikan koordinat kamu telah benar. Tutup program dan konfigurasi ulang jika belum! X (lintang): {0} Y (bujur): {1}" }, { "Key": "incubatorPuttingEgg", @@ -334,11 +339,12 @@ }, { "Key": "maxItemsCombinedOverMaxItemStorage", - "Value": "[Konfigurasi Salah] Total barang maksimum kamu (ball+potion+revive={0}) melebihi kapasitas tas kamu ({1})" + "Value": + "[Konfigurasi Salah] Total barang maksimum kamu (ball+potion+revive={0}) melebihi kapasitas tas kamu ({1})" }, { "Key": "recyclingQuietly", - "Value": "Mendaur ulang senyap..." + "Value": "Mendaur ulang senyap..." }, { "Key": "invFullTransferring", @@ -346,7 +352,8 @@ }, { "Key": "invFullTransferManually", - "Value": "Inventaris pokemon penuh. Transfer pokemon secara manual atau ubah TransferDuplicatePokemon menjadi true diberkas config.json" + "Value": + "Inventaris pokemon penuh. Transfer pokemon secara manual atau ubah TransferDuplicatePokemon menjadi true diberkas config.json" }, { "Key": "invFullPokestopLooting", @@ -418,11 +425,13 @@ }, { "Key": "statsTemplateString", - "Value": "{0} - Waktu aktif {1} - Lvl: {2} | EXP/H: {3:n0} | P/H: {4:n0} | Stardust: {5:n0} | Ditransfer: {6:n0} | Didaur ulang: {7:n0}" + "Value": + "{0} - Waktu aktif {1} - Lvl: {2} | EXP/H: {3:n0} | P/H: {4:n0} | Stardust: {5:n0} | Ditransfer: {6:n0} | Didaur ulang: {7:n0}" }, { "Key": "profileStatsTemplateString", - "Value": "----- LVL {0} | {1} ----- \n EXP: {2}/{3} \n Pokemon yang ditangkap: {4} \n Pokemon yang ditransfer: {5} \n Pokestop yang dikunjungi: {6} \n Telur yang ditetaskan: {6} \n Pokemon yang dievolusikan: {7} \n Catatan Pokedex: {8} \n Sudah berjalan: {9} KM \n Pokemon: {11}/{12}" + "Value": + "----- LVL {0} | {1} ----- \n EXP: {2}/{3} \n Pokemon yang ditangkap: {4} \n Pokemon yang ditransfer: {5} \n Pokestop yang dikunjungi: {6} \n Telur yang ditetaskan: {6} \n Pokemon yang dievolusikan: {7} \n Catatan Pokedex: {8} \n Sudah berjalan: {9} KM \n Pokemon: {11}/{12}" }, { "Key": "showPokeTemplate", @@ -430,7 +439,8 @@ }, { "Key": "helpTemplate", - "Value": "Perintah: \n \n /top <cp/iv> <jumlah> - Menampilkan Pokemon tertinggimu.. \n /all <cp/iv> - Menampilkan semua Pokemon-mu. \n /profile - Menampilkan profilmu. \n /loc - Menampilkan lokasimu. \n /items - Menampilkan barangmu. \n /status - Menampilkan status bot-mu. \n /pokedex - Menampilkan Pokedex-mu" + "Value": + "Perintah: \n \n /top <cp/iv> <jumlah> - Menampilkan Pokemon tertinggimu.. \n /all <cp/iv> - Menampilkan semua Pokemon-mu. \n /profile - Menampilkan profilmu. \n /loc - Menampilkan lokasimu. \n /items - Menampilkan barangmu. \n /status - Menampilkan status bot-mu. \n /pokedex - Menampilkan Pokedex-mu" }, { "Key": "statsXpTemplateString", @@ -442,11 +452,13 @@ }, { "Key": "googleTwoFactorAuth", - "Value": "Karena kamu menggunakan keamanan ganda Google, kamu perlu memasukkan kata kunci khusus aplikasi di auth.json" + "Value": + "Karena kamu menggunakan keamanan ganda Google, kamu perlu memasukkan kata kunci khusus aplikasi di auth.json" }, { "Key": "googleTwoFactorAuthExplanation", - "Value": "Membuka Google App-Passwords. Mohon buat kata kunci aplikasi baru (gunakan \"lainnya\" sebagai jenis perangkat)" + "Value": + "Membuka Google App-Passwords. Mohon buat kata kunci aplikasi baru (gunakan \"lainnya\" sebagai jenis perangkat)" }, { "Key": "googleError", @@ -540,128 +552,129 @@ "Key": "pkmNotEnoughRessources", "Value": "Peningkatan level Pokemon gagal karena tidak cukup bahan" }, - { + { "Key": "snipeServerOffline", "Value": "Server bidikan offline. Melewati..." }, - { + { "Key": "firstStartPrompt", "Value": "Ini adalah pertama kalinya kamu menjalankan aplikasi, apakah kamu ingin memulai pengaturan? {0}/{1}" }, - { + { "Key": "firstStartLanguagePrompt", "Value": "Apakah kamu ingin mengganti bahasa bawaan? {0}/{1}" }, - { + { "Key": "firstStartLanguageCodePrompt", "Value": "Mohon masukkan kode bahasa baru" }, - { + { "Key": "firstStartLanguageConfirm", "Value": "Kode bahasa yang diterapkan: {0}" }, - { + { "Key": "PromptError", "Value": "[MASUKAN ERROR] Terdapat error pada masukan, mohon masukkan '{0}' atau '{1}'" }, - { + { "Key": "firstStartAutoGenSettings", - "Value": "Berkas \"config.json\" dan \"auth.json\" secara otomatis dibuat dan harus dilengkapi sebelum melanjutkan INFO: ubah berkas tersebut dalam folder CONFIG" + "Value": + "Berkas \"config.json\" dan \"auth.json\" secara otomatis dibuat dan harus dilengkapi sebelum melanjutkan INFO: ubah berkas tersebut dalam folder CONFIG" }, - { + { "Key": "firstStartSetupAccount", "Value": "### Mengatur AKUN PENGGUNA baru ###" }, - { + { "Key": "firstStartSetupTypePrompt", "Value": "Mohon pilih tipe akun: {0}/{1}" }, - { + { "Key": "firstStartSetupTypeConfirm", "Value": "Tipe akun yang dipilih: {0}" }, - { + { "Key": "firstStartSetupTypePromptError", "Value": "[ERROR] jenis akun yang salah dimasukkan, mohon pilih '{0}' atau '{1}'" }, - { + { "Key": "firstStartSetupUsernamePrompt", "Value": "Mohon masukkan nama pengguna atau email" }, - { + { "Key": "firstStartSetupUsernameConfirm", "Value": "Nama pengguna yang diterima: {0}" }, - { + { "Key": "firstStartSetupPasswordPrompt", "Value": "Mohon masukkan password" }, - { + { "Key": "firstStartSetupPasswordConfirm", "Value": "Password yang diterima: {0}" }, - { + { "Key": "firstStartAccountCompleted", "Value": "### Akun Pengguna Selesai ###" }, - { + { "Key": "firstStartDefaultLocationPrompt", "Value": "Apakah kamu ingin mengatur lokasi bawaan yang baru? {0}/{1}" }, - { + { "Key": "firstStartDefaultLocationSet", "Value": "Lokasi bawaan diterapkan" }, - { + { "Key": "firstStartDefaultLocation", "Value": "### Mengatur Lokasi Bawaan ###" }, - { + { "Key": "firstStartSetupDefaultLocationError", "Value": "[ERROR] Tolong hanya masukkan ANGKA, contohnya: {0}" }, - { + { "Key": "firstStartSetupDefaultLatPrompt", "Value": "Mohon masukkan lintang (klik kanan untuk menempelkan)" }, - { + { "Key": "firstStartSetupDefaultLatConfirm", "Value": "Lintang yang diterima: {0}" }, - { + { "Key": "firstStartSetupDefaultLongPrompt", "Value": "Mohon masukkan bujur (klik kanan untuk menempelkan)" }, - { + { "Key": "firstStartSetupDefaultLongConfirm", "Value": "Bujur yang diterima: {0}" }, - { + { "Key": "softBanBypassed", "Value": "Berhasil dilewati!" }, - { + { "Key": "firstStartSetupCompleted", "Value": "### PENGATURAN KONFIGURASI SELESAI ###" }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Tertangkap di Pokedex --- \n" + "Value": "--- Tertangkap di Pokedex --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Nama: {1} | Tertangkap: {2} | Ditemukan: {3} \n" + "Value": "#{0} Nama: {1} | Tertangkap: {2} | Ditemukan: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Dibutuhkan di Pokedex --- \n" + "Value": "--- Dibutuhkan di Pokedex --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Nama: {1} \n" + "Value": "#{0} Nama: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Bulbasaur" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.it.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.it.json index ecb7a3a..65817c8 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.it.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.it.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -75,11 +75,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} PL: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | con una {9} ({10} rimanenti). | {11} PE guadagnati | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} PL: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | con una {9} ({10} rimanenti). | {11} PE guadagnati | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} PL: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | con una {9} ({10} rimanenti). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} PL: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | con una {9} ({10} rimanenti). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -101,7 +103,6 @@ "Key": "eventUseBerry", "Value": "Usata {0} | {1} rimanenti" }, - { "Key": "itemRazzBerry", "Value": "Baccalampon" @@ -328,7 +329,8 @@ }, { "Key": "maxItemsCombinedOverMaxItemStorage", - "Value": "[Configurazione Non Valida] La somma degli oggetti (Pokeball+Pozioni+Revitalizzanti={0}) e' maggiore della capacita' massima dell'inventario ({1})" + "Value": + "[Configurazione Non Valida] La somma degli oggetti (Pokeball+Pozioni+Revitalizzanti={0}) e' maggiore della capacita' massima dell'inventario ({1})" }, { "Key": "recyclingQuietly", @@ -524,29 +526,29 @@ { "Key": "pkmNotEnoughRessources", "Value": "Potenziamento Pokemon Fallito: Risorse Insufficienti" - }, + }, { "Key": "snipeServerOffline", "Value": "Il server di Sniping è offline. Saltando..." }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Bulbasaur" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.lt.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.lt.json index 021f3be..616897d 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.lt.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.lt.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -22,7 +22,8 @@ }, { "Key": "farmPokestopsOutsideRadius", - "Value": "Jūs esate už savo nustatyto spindulio! Einama į pradžią (už {0}m) po 5 sekundžių. Ar jūsų LastPos.ini failas teisingas?" + "Value": + "Jūs esate už savo nustatyto spindulio! Einama į pradžią (už {0}m) po 5 sekundžių. Ar jūsų LastPos.ini failas teisingas?" }, { "Key": "farmPokestopsNoUsableFound", @@ -66,11 +67,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -130,7 +133,8 @@ }, { "Key": "welcomeWarning", - "Value": "Įsitikinkite kad platuma ir plokštuma teisingos. Išjunkite programą jeigu ne! Platuma: {0} Plokštuma: {1}" + "Value": + "Įsitikinkite kad platuma ir plokštuma teisingos. Išjunkite programą jeigu ne! Platuma: {0} Plokštuma: {1}" }, { "Key": "incubatorPuttingEgg", @@ -306,7 +310,8 @@ }, { "Key": "maxItemsCombinedOverMaxItemStorage", - "Value": "[Konfigūracija neteisinga] Jūsų maksimalūs daiktai (rutuliai+gėrimai+prikėlimai={0}) viršija jūsų saugyklą ({1})" + "Value": + "[Konfigūracija neteisinga] Jūsų maksimalūs daiktai (rutuliai+gėrimai+prikėlimai={0}) viršija jūsų saugyklą ({1})" }, { "Key": "recyclingQuietly", @@ -318,7 +323,8 @@ }, { "Key": "invFullTransferManually", - "Value": "Pokemonų inventorius pilnas! Prašome atiduoti Pokemonus rankiniu būdu arba nustatyti TransferDuplicatePokemon į true nustatymuose..." + "Value": + "Pokemonų inventorius pilnas! Prašome atiduoti Pokemonus rankiniu būdu arba nustatyti TransferDuplicatePokemon į true nustatymuose..." }, { "Key": "invFullPokestopLooting", @@ -390,7 +396,8 @@ }, { "Key": "statsTemplateString", - "Value": "{0} - trukmė {1} - Lvl: {2} | EXP/H: {3:n0} | P/H: {4:n0} | Dulkės: {5:n0} | Atiduota: {6:n0} | Išmesta: {7:n0}" + "Value": + "{0} - trukmė {1} - Lvl: {2} | EXP/H: {3:n0} | P/H: {4:n0} | Dulkės: {5:n0} | Atiduota: {6:n0} | Išmesta: {7:n0}" }, { "Key": "statsXpTemplateString", @@ -402,11 +409,13 @@ }, { "Key": "googleTwoFactorAuth", - "Value": "Kadangi jūs įjungę Google Two Factor Auth, jums reikės nurodyti aplikacijai specifinį slaptažodį faile auth.json" + "Value": + "Kadangi jūs įjungę Google Two Factor Auth, jums reikės nurodyti aplikacijai specifinį slaptažodį faile auth.json" }, { "Key": "googleTwoFactorAuthExplanation", - "Value": "Atidaroma Google aplikacijų slaptažodžiai. Sukurkite naują aplikacijos slaptažodį (naudokite Other kaip Device)" + "Value": + "Atidaroma Google aplikacijų slaptažodžiai. Sukurkite naują aplikacijos slaptažodį (naudokite Other kaip Device)" }, { "Key": "googleError", @@ -486,22 +495,22 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Bulbasaur" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.nl.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.nl.json index 50d03dc..b98fa86 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.nl.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.nl.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -67,11 +67,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Kans: {7}% | {8}m ver | met een {9} ({10} over). | {11} EXP verdiend | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Kans: {7}% | {8}m ver | met een {9} ({10} over). | {11} EXP verdiend | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Kans: {7}% | {8}m ver | met een {9} ({10} over). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Kans: {7}% | {8}m ver | met een {9} ({10} over). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -131,22 +133,22 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Bulbasaur" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.no.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.no.json index c023068..edb7c30 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.no.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.no.json @@ -63,11 +63,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Sjanse: {7}% | {8}m dist | med en {9} ({10} igjen). | {11} EXP tjent | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Sjanse: {7}% | {8}m dist | med en {9} ({10} igjen). | {11} EXP tjent | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Sjanse: {7}% | {8}m dist | med en {9} ({10} igjen). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Sjanse: {7}% | {8}m dist | med en {9} ({10} igjen). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -127,22 +129,22 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Bulbasaur" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.pl.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.pl.json index 76644c2..10c6886 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.pl.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.pl.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -26,7 +26,8 @@ }, { "Key": "farmPokestopsOutsideRadius", - "Value": "Znajdujesz się poza zdefiniowanym zasięgiem. Zostaniesz przeniesiony na start odległy o ({0}m) za 5 sekund. Sprawdź, czy plik 'LastPos.ini' jest poprawny" + "Value": + "Znajdujesz się poza zdefiniowanym zasięgiem. Zostaniesz przeniesiony na start odległy o ({0}m) za 5 sekund. Sprawdź, czy plik 'LastPos.ini' jest poprawny" }, { "Key": "farmPokestopsNoUsableFound", @@ -38,7 +39,8 @@ }, { "Key": "eventFortFailed", - "Value": "Nazwa: {0} INFO: Zbieranie przedmiotów nie powiodła się, prawdopodobnie masz SoftBana. Odbanowanie za: {1}/{2}" + "Value": + "Nazwa: {0} INFO: Zbieranie przedmiotów nie powiodła się, prawdopodobnie masz SoftBana. Odbanowanie za: {1}/{2}" }, { "Key": "eventFortTargeted", @@ -74,11 +76,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} [Lvl: {3} | CP: ({4}/{5}) | IV: {6}%] Szansa: {7}% | Odległy o: {8}m | Użyto: {9} (Pozostało {10}) | EXP: {11} | {12} | Szerokość: {13} Długość: {14}" + "Value": + "({0}) | ({1}) {2} [Lvl: {3} | CP: ({4}/{5}) | IV: {6}%] Szansa: {7}% | Odległy o: {8}m | Użyto: {9} (Pozostało {10}) | EXP: {11} | {12} | Szerokość: {13} Długość: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} [Lvl: {3} | CP: ({4}/{5}) | IV: {6}%] Szansa: {7}% | Odległy o: {8}m | Użyto: {9} (Pozostało {10}) | Szerokość: {11} Długość: {12}" + "Value": + "({0}) | ({1}) {2} [Lvl: {3} | CP: ({4}/{5}) | IV: {6}%] Szansa: {7}% | Odległy o: {8}m | Użyto: {9} (Pozostało {10}) | Szerokość: {11} Długość: {12}" }, { "Key": "eventNoPokeballs", @@ -150,7 +154,8 @@ }, { "Key": "welcomeWarning", - "Value": "Upewnij się, że szerokość i długość geograficzna są poprawnie. Jeżeli nie to zamknij program [Szerokość: {0} Długość: {1}]" + "Value": + "Upewnij się, że szerokość i długość geograficzna są poprawnie. Jeżeli nie to zamknij program [Szerokość: {0} Długość: {1}]" }, { "Key": "incubatorPuttingEgg", @@ -234,7 +239,8 @@ }, { "Key": "ptcOffline", - "Value": "Serwery PTC najprawdopodobniej nie działają albo Twoje dane logowania są błędne. Spróbuj użyć konta Google" + "Value": + "Serwery PTC najprawdopodobniej nie działają albo Twoje dane logowania są błędne. Spróbuj użyć konta Google" }, { "Key": "accessTokenExpired", @@ -342,7 +348,8 @@ }, { "Key": "maxItemsCombinedOverMaxItemStorage", - "Value": "Ustawiona przez Ciebie dopuszczalna ilość itemów w ekwipunku (PokeBalle+Potiony+Revivy={0}) przekracza maksymalną jego pojemność, która wynosi: ({1})" + "Value": + "Ustawiona przez Ciebie dopuszczalna ilość itemów w ekwipunku (PokeBalle+Potiony+Revivy={0}) przekracza maksymalną jego pojemność, która wynosi: ({1})" }, { "Key": "recyclingQuietly", @@ -354,7 +361,8 @@ }, { "Key": "invFullTransferManually", - "Value": "Posiadasz maksymalną ilość pokemonów, prześlij pokemony ręcznie albo zmień w ustawieniach wartość TransferDuplicatePokemon na true..." + "Value": + "Posiadasz maksymalną ilość pokemonów, prześlij pokemony ręcznie albo zmień w ustawieniach wartość TransferDuplicatePokemon na true..." }, { "Key": "invFullPokestopLooting", @@ -426,11 +434,13 @@ }, { "Key": "statsTemplateString", - "Value": "{0} - Czas działania {1} - Poziom: {2} | XP na godzinę: {3:n0} | Pokemony na godzinę: {4:n0} | Stardust: {5:n0} | Przesłano: {6:n0} | Usunięto: {7:n0}" + "Value": + "{0} - Czas działania {1} - Poziom: {2} | XP na godzinę: {3:n0} | Pokemony na godzinę: {4:n0} | Stardust: {5:n0} | Przesłano: {6:n0} | Usunięto: {7:n0}" }, { "Key": "profileStatsTemplateString", - "Value": "----- LVL: {0} | {1} ----- \n Doświadczenie: {2}/{3} \n Złapanych Pokemonów: {4} \n Umieszczonych Pokemonów: {5} \n Odwiedzonych Pokestopów: {6} \n Wyklutych Jajek: {6} \n Wyewoluowanych Pokemonów: {7} \n Pokemonów w Pokedex: {8} \n Przebytych KM: {9}" + "Value": + "----- LVL: {0} | {1} ----- \n Doświadczenie: {2}/{3} \n Złapanych Pokemonów: {4} \n Umieszczonych Pokemonów: {5} \n Odwiedzonych Pokestopów: {6} \n Wyklutych Jajek: {6} \n Wyewoluowanych Pokemonów: {7} \n Pokemonów w Pokedex: {8} \n Przebytych KM: {9}" }, { "Key": "showPokeTemplate", @@ -438,7 +448,8 @@ }, { "Key": "helpTemplate", - "Value": "Komendy: \n \n /top <wartość> - Wyświetla top Twoich Pokemonów. \n /all - Wyświetla wszystkie posiadane Pokemony. \n /profile - Wyświetla Twój profil. \n /loc - Pokazuje Twoją lokalizację. \n /items - Wyświetla Twoje itemy" + "Value": + "Komendy: \n \n /top <wartość> - Wyświetla top Twoich Pokemonów. \n /all - Wyświetla wszystkie posiadane Pokemony. \n /profile - Wyświetla Twój profil. \n /loc - Pokazuje Twoją lokalizację. \n /items - Wyświetla Twoje itemy" }, { "Key": "statsXpTemplateString", @@ -450,7 +461,8 @@ }, { "Key": "googleTwoFactorAuth", - "Value": "Na Twoim koncie Google aktywna jest weryfikacja dwuetapowa, będziesz musiał wprowadzić nowe hasło w 'auth.json'" + "Value": + "Na Twoim koncie Google aktywna jest weryfikacja dwuetapowa, będziesz musiał wprowadzić nowe hasło w 'auth.json'" }, { "Key": "googleTwoFactorAuthExplanation", @@ -486,7 +498,7 @@ }, { "Key": "notEnoughPokeballsToSnipe", - "Value": "Zbyt mało Pokeballi ({0}/{1})" + "Value": "Zbyt mało Pokeballi ({0}/{1})" }, { "Key": "displayHighestMove1Header", @@ -654,19 +666,19 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], "PokemonStrings": [ diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.pt-br.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.pt-br.json index 5327c82..66c5d7f 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.pt-br.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.pt-br.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -26,7 +26,8 @@ }, { "Key": "farmPokestopsOutsideRadius", - "Value": "Você está fora do seu raio definido! Caminhando para o início ({0}m de distância) em 5 segundos. Suas coordenadas em LastPos.ini estão corretas?" + "Value": + "Você está fora do seu raio definido! Caminhando para o início ({0}m de distância) em 5 segundos. Suas coordenadas em LastPos.ini estão corretas?" }, { "Key": "farmPokestopsNoUsableFound", @@ -74,11 +75,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m distancia | com uma {9} (restando {10}). | {11} EXP adquirida | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m distancia | com uma {9} (restando {10}). | {11} EXP adquirida | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | com uma {9} (restando {10}). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | com uma {9} (restando {10}). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -90,7 +93,8 @@ }, { "Key": "useLuckyEggsMinPokemonAmountTooHigh", - "Value": "Ovos da sorte nunca serão utilizados com a propriedade UseLuckyEggsMinPokemonAmount definida como {0}, em vez disso use um valor <= {1}" + "Value": + "Ovos da sorte nunca serão utilizados com a propriedade UseLuckyEggsMinPokemonAmount definida como {0}, em vez disso use um valor <= {1}" }, { "Key": "catchMorePokemonToUseLuckyEgg", @@ -326,7 +330,8 @@ }, { "Key": "maxItemsCombinedOverMaxItemStorage", - "Value": "[Configuração Inválida] Seu limite de itens combinados (pokebolas+poções+revives={0}) está acima da capacidade máxima de seu inventário ({1})" + "Value": + "[Configuração Inválida] Seu limite de itens combinados (pokebolas+poções+revives={0}) está acima da capacidade máxima de seu inventário ({1})" }, { "Key": "recyclingQuietly", @@ -338,7 +343,8 @@ }, { "Key": "invFullTransferManually", - "Value": "O inventário de Pokémons está cheio. Por favor transfira seus pokémons manualmente ou altere a propriedade TransferDuplicatePokemon para true nas configurações..." + "Value": + "O inventário de Pokémons está cheio. Por favor transfira seus pokémons manualmente ou altere a propriedade TransferDuplicatePokemon para true nas configurações..." }, { "Key": "invFullPokestopLooting", @@ -410,7 +416,8 @@ }, { "Key": "statsTemplateString", - "Value": "{0} - Sessão {1} - Lvl: {2} | EXP/H: {3:n0} | P/H: {4:n0} | Stardust: {5:n0} | Transferidos: {6:n0} | Reciclados: {7:n0}" + "Value": + "{0} - Sessão {1} - Lvl: {2} | EXP/H: {3:n0} | P/H: {4:n0} | Stardust: {5:n0} | Transferidos: {6:n0} | Reciclados: {7:n0}" }, { "Key": "statsXpTemplateString", @@ -422,7 +429,8 @@ }, { "Key": "googleTwoFactorAuth", - "Value": "Como você possui o Google Two Factor Auth ativado, você precisará informar o App Specific Password no arquivo auth.json" + "Value": + "Como você possui o Google Two Factor Auth ativado, você precisará informar o App Specific Password no arquivo auth.json" }, { "Key": "googleTwoFactorAuthExplanation", @@ -438,11 +446,13 @@ }, { "Key": "missingCredentialsGoogle", - "Value": "Você precisa informar o GoogleUsername e GooglePassword no arquivo auth.json! Nota : Após o Update 0.7.5 é nessesario colocar as informações em auth.json e authgoogle.json dependendo de como veio o bot, verifique se o seu bot possui os dois arquivos e em caso contrário preencha-os!" + "Value": + "Você precisa informar o GoogleUsername e GooglePassword no arquivo auth.json! Nota : Após o Update 0.7.5 é nessesario colocar as informações em auth.json e authgoogle.json dependendo de como veio o bot, verifique se o seu bot possui os dois arquivos e em caso contrário preencha-os!" }, { "Key": "missingCredentialsPtc", - "Value": "Você precisa informar o PtcUsername e PtcPassword no arquivo auth.json! Nota : Após o Update 0.7.5 é nessesario colocar as informações em auth.json e authptc.json dependendo de como veio o bot, verifique se o seu bot possui os dois arquivos e em caso contrário preencha-os!" + "Value": + "Você precisa informar o PtcUsername e PtcPassword no arquivo auth.json! Nota : Após o Update 0.7.5 é nessesario colocar as informações em auth.json e authptc.json dependendo de como veio o bot, verifique se o seu bot possui os dois arquivos e em caso contrário preencha-os!" }, { "Key": "snipeScan", @@ -622,22 +632,22 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Bulbasauro" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.pt-pt.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.pt-pt.json index 97cf127..e4f8615 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.pt-pt.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.pt-pt.json @@ -67,11 +67,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -390,22 +392,22 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Bulbasaur" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.ro.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.ro.json index 3f01ff2..7c64159 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.ro.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.ro.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -74,11 +74,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Nivel: {3} CP: ({4}/{5}) IV: {6}% | Șansă: {7}% | {8}m distanță | cu un {9} ({10} rămase) | {11} EXP câștigată | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Nivel: {3} CP: ({4}/{5}) IV: {6}% | Șansă: {7}% | {8}m distanță | cu un {9} ({10} rămase) | {11} EXP câștigată | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Nivel: {3} CP: ({4}/{5}) IV: {6}% | Șansă: {7}% | {8}m distanță | cu un {9} ({10} rămase) | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Nivel: {3} CP: ({4}/{5}) IV: {6}% | Șansă: {7}% | {8}m distanță | cu un {9} ({10} rămase) | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -90,7 +92,8 @@ }, { "Key": "useLuckyEggsMinPokemonAmountTooHigh", - "Value": "Ouăle norocoase nu vor fi folosite niciodată cu UseLuckyEggsMinPokemonAmount setat pe {0}, folosește în schimb <= {1}" + "Value": + "Ouăle norocoase nu vor fi folosite niciodată cu UseLuckyEggsMinPokemonAmount setat pe {0}, folosește în schimb <= {1}" }, { "Key": "catchMorePokemonToUseLuckyEgg", @@ -150,7 +153,8 @@ }, { "Key": "welcomeWarning", - "Value": "Asigură-te că latitudinea și longitudinea sunt corecte. Ieși din program în caz contrar! Lat: {0} Lng: {1}" + "Value": + "Asigură-te că latitudinea și longitudinea sunt corecte. Ieși din program în caz contrar! Lat: {0} Lng: {1}" }, { "Key": "incubatorPuttingEgg", @@ -234,7 +238,8 @@ }, { "Key": "ptcOffline", - "Value": "Serverele PTC sunt probabil căzute sau datele de conectare sunt greșite. Încearcă cu autentificarea Google." + "Value": + "Serverele PTC sunt probabil căzute sau datele de conectare sunt greșite. Încearcă cu autentificarea Google." }, { "Key": "accessTokenExpired", @@ -342,7 +347,8 @@ }, { "Key": "maxItemsCombinedOverMaxItemStorage", - "Value": "[Configurație invalidă] Numărul maxim de obiecte combinate (bile+poțiuni+reînvieri={0}) este peste limita maximă de stocare a obiectelor ({1})" + "Value": + "[Configurație invalidă] Numărul maxim de obiecte combinate (bile+poțiuni+reînvieri={0}) este peste limita maximă de stocare a obiectelor ({1})" }, { "Key": "recyclingQuietly", @@ -354,7 +360,8 @@ }, { "Key": "invFullTransferManually", - "Value": "Inventarul de pokemoni este plin. Te rugăm să tranferi pokemoni manual sau schimbă valoarea \"TransferDuplicatePokemon\" pe \"true\" din setări..." + "Value": + "Inventarul de pokemoni este plin. Te rugăm să tranferi pokemoni manual sau schimbă valoarea \"TransferDuplicatePokemon\" pe \"true\" din setări..." }, { "Key": "invFullPokestopLooting", @@ -426,11 +433,13 @@ }, { "Key": "statsTemplateString", - "Value": "{0} - Durată de funcționare {1} - Nivel: {2} | EXP/H: {3:0} | P/H: {4:0} | Praf de stele: {5:0} | Transferați: {6:0} | Reciclați: {7:0}" + "Value": + "{0} - Durată de funcționare {1} - Nivel: {2} | EXP/H: {3:0} | P/H: {4:0} | Praf de stele: {5:0} | Transferați: {6:0} | Reciclați: {7:0}" }, { "Key": "profileStatsTemplateString", - "Value": "----- NIVEL {0} | {1} ----- \n Experiență: {2}/{3} \n Pokemoni prinși: {4} \n Pokemoni transferați pentru bomboane: {5} \n Pokestopuri vizitate: {6} \n Ouă eclozate: {7} \n Pokemoni evoluați: {8} \n Intrări în pokedex: {9} \n KM străbătuți: {10} \n Pokemoni: {11}/{12}" + "Value": + "----- NIVEL {0} | {1} ----- \n Experiență: {2}/{3} \n Pokemoni prinși: {4} \n Pokemoni transferați pentru bomboane: {5} \n Pokestopuri vizitate: {6} \n Ouă eclozate: {7} \n Pokemoni evoluați: {8} \n Intrări în pokedex: {9} \n KM străbătuți: {10} \n Pokemoni: {11}/{12}" }, { "Key": "showPokeTemplate", @@ -438,7 +447,8 @@ }, { "Key": "helpTemplate", - "Value": "Comenzi: \n \n /top <cp/iv> <cantitate> - Afișează pokemonii tăi de top. \n /all <cp/iv> - Afișează toți pokemonii tăi. \n /profile - Afișează profilul tău. \n /loc - Afișează locația ta. \n /items - Afișează obiectele tale. \n /status - Afișează statusul botului." + "Value": + "Comenzi: \n \n /top <cp/iv> <cantitate> - Afișează pokemonii tăi de top. \n /all <cp/iv> - Afișează toți pokemonii tăi. \n /profile - Afișează profilul tău. \n /loc - Afișează locația ta. \n /items - Afișează obiectele tale. \n /status - Afișează statusul botului." }, { "Key": "statsXpTemplateString", @@ -450,11 +460,13 @@ }, { "Key": "googleTwoFactorAuth", - "Value": "Din moment ce autentificarea Google cu doi factori este activată, va trebui să introduci o parolă specifică aplicației în auth.json" + "Value": + "Din moment ce autentificarea Google cu doi factori este activată, va trebui să introduci o parolă specifică aplicației în auth.json" }, { "Key": "googleTwoFactorAuthExplanation", - "Value": "Se deschid pagina de parole pentru aplicații Google. Te rugăm să creezi o parolă nouă pentru aplicație (alege Alta (Other) în Device)" + "Value": + "Se deschid pagina de parole pentru aplicații Google. Te rugăm să creezi o parolă nouă pentru aplicație (alege Alta (Other) în Device)" }, { "Key": "googleError", @@ -502,7 +514,8 @@ }, { "Key": "ipBannedError", - "Value": "Conexiune refuzată. IP-ul tău s-ar putea să fi fost trecut pe lista neagră de Niantic. Se iese din aplicație.." + "Value": + "Conexiune refuzată. IP-ul tău s-ar putea să fi fost trecut pe lista neagră de Niantic. Se iese din aplicație.." }, { "Key": "noEggsAvailable", diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.ru_RU.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.ru_RU.json index 1888d30..f9b69f0 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.ru_RU.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.ru_RU.json @@ -224,7 +224,7 @@ "Key": "logEntryUpdate", "Value": "ОБНОВЛЕНИЕ" }, - { + { "Key": "logEntryNew", "Value": "НОВЫЙ" }, @@ -237,7 +237,7 @@ "Value": "PTC сервера возможно не работают ИЛИ неверно указаны данные учетной записи. Попробуйте использовать логин от Google аккаунта" }, - { + { "Key": "accessTokenExpired", "Value": "Токен PTC истек. Перезаходим..." }, @@ -343,7 +343,8 @@ }, { "Key": "maxItemsCombinedOverMaxItemStorage", - "Value": "[Ошибка Конфигурации] Общее количество выбранных предметов (шары+зелья+возр.={0}) превышает максимальное значение рюкзака ({1})" + "Value": + "[Ошибка Конфигурации] Общее количество выбранных предметов (шары+зелья+возр.={0}) превышает максимальное значение рюкзака ({1})" }, { "Key": "recyclingQuietly", @@ -642,22 +643,22 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Бульбазавр" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.sv.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.sv.json index 5a6c495..ea2c43f 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.sv.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.sv.json @@ -68,11 +68,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chans: {7}% | {8}m dist | med en {9} ({10} kvar). | {11} EXP intjänat | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chans: {7}% | {8}m dist | med en {9} ({10} kvar). | {11} EXP intjänat | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chans: {7}% | {8}m dist | med en {9} ({10} kvar). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chans: {7}% | {8}m dist | med en {9} ({10} kvar). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -392,22 +394,22 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Bulbasaur" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.th.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.th.json index 540614f..fc772f4 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.th.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.th.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -28,7 +28,8 @@ }, { "Key": "farmPokestopsOutsideRadius", - "Value": "คุณอยู่นอกเหนือระยะทำการ กำลังเดินกลับจุดเริ่มต้น ({0} เมตร) ใน 5 วินาที จุดพิกัดใน LastPos.ini ถูกต้องหรือเปล่า?" + "Value": + "คุณอยู่นอกเหนือระยะทำการ กำลังเดินกลับจุดเริ่มต้น ({0} เมตร) ใน 5 วินาที จุดพิกัดใน LastPos.ini ถูกต้องหรือเปล่า?" }, { @@ -86,11 +87,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} เลเวล: {3} CP: ({4}/{5}) IV: {6}% | โอกาส: {7}% | ระยะ {8}m | จับด้วย a {9} (เหลือ {10} ชิ้น). | ได้รับค่าประสบการณ์ {11} หน่วย | {12} | ละติจูด: {13} ลองติจูด: {14}" + "Value": + "({0}) | ({1}) {2} เลเวล: {3} CP: ({4}/{5}) IV: {6}% | โอกาส: {7}% | ระยะ {8}m | จับด้วย a {9} (เหลือ {10} ชิ้น). | ได้รับค่าประสบการณ์ {11} หน่วย | {12} | ละติจูด: {13} ลองติจูด: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | โอกาส: {7}% | ระยะ {8}m | จับด้วย a {9} (เหลือ {10} ชิ้น). | ละติจูด: {11} ลองติจูด: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | โอกาส: {7}% | ระยะ {8}m | จับด้วย a {9} (เหลือ {10} ชิ้น). | ละติจูด: {11} ลองติจูด: {12}" }, { "Key": "eventNoPokeballs", @@ -110,22 +113,22 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Bulbasaur" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.tr.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.tr.json index 6eee3b4..6807518 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.tr.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.tr.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -26,7 +26,8 @@ }, { "Key": "farmPokestopsOutsideRadius", - "Value": "Mevcut konum, tanımlanan yarıçapın dışında kalıyor! 5 saniye sonra {0}m'lik mesafeye yürümeye başlanacak. \"LastPos.ini\" dosyasındaki mevcut konum doğru mu?" + "Value": + "Mevcut konum, tanımlanan yarıçapın dışında kalıyor! 5 saniye sonra {0}m'lik mesafeye yürümeye başlanacak. \"LastPos.ini\" dosyasındaki mevcut konum doğru mu?" }, { "Key": "farmPokestopsNoUsableFound", @@ -74,11 +75,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Yakalama Şansı: {7}% | Mesafe: {8}m | {9} kullanıldı ({10} tane kaldı) | {11}XP kazanıldı | {12} | Enlem: {13} Boylam: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Yakalama Şansı: {7}% | Mesafe: {8}m | {9} kullanıldı ({10} tane kaldı) | {11}XP kazanıldı | {12} | Enlem: {13} Boylam: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Yakalama Şansı: {7}% | Mesafe: {8}m | {9} kullanıldı ({10} tane kaldı) | Enlem: {11} Boylam: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Yakalama Şansı: {7}% | Mesafe: {8}m | {9} kullanıldı ({10} tane kaldı) | Enlem: {11} Boylam: {12}" }, { "Key": "eventNoPokeballs", @@ -86,11 +89,13 @@ }, { "Key": "waitingForMorePokemonToEvolve", - "Value": "{0} Pokémon geliştirilmeyi(evolve) bekliyor! {1} Pokémon daha yakalandığında Pokémon taşıma limitinin {4}%'i dolacak. ({2}/{3})" + "Value": + "{0} Pokémon geliştirilmeyi(evolve) bekliyor! {1} Pokémon daha yakalandığında Pokémon taşıma limitinin {4}%'i dolacak. ({2}/{3})" }, { "Key": "useLuckyEggsMinPokemonAmountTooHigh", - "Value": "\"UseLuckyEggsMinPokemonAmount\" değeri {0} olarak ayarlanmış ve çok yüksek. {1}'den küçük bir değer girilmesi lazım." + "Value": + "\"UseLuckyEggsMinPokemonAmount\" değeri {0} olarak ayarlanmış ve çok yüksek. {1}'den küçük bir değer girilmesi lazım." }, { "Key": "catchMorePokemonToUseLuckyEgg", @@ -150,7 +155,8 @@ }, { "Key": "welcomeWarning", - "Value": "Varsayılan enlem(DefaultLatitude) ve boylam(DefaultLongitude) değerlerinin doğrulundan emin olun. Aksi halde programı kapatın! Enlem: {0} Boylam: {1}" + "Value": + "Varsayılan enlem(DefaultLatitude) ve boylam(DefaultLongitude) değerlerinin doğrulundan emin olun. Aksi halde programı kapatın! Enlem: {0} Boylam: {1}" }, { "Key": "incubatorPuttingEgg", @@ -162,7 +168,8 @@ }, { "Key": "incubatorEggHatched", - "Value": "Kuluçka makinesindeki(Incubator) Yumurta(Egg) çatladı: Çıkan Pokémon: {0} | Lvl: {1} CP: ({2}/{3}) IV: {4}%" + "Value": + "Kuluçka makinesindeki(Incubator) Yumurta(Egg) çatladı: Çıkan Pokémon: {0} | Lvl: {1} CP: ({2}/{3}) IV: {4}%" }, { "Key": "logEntryError", @@ -270,7 +277,8 @@ }, { "Key": "notRealisticTravel", - "Value": "{0} konumunda gerçekçi gezinme geçerli değil. \"LastPos.ini\" dosyasındaki son kaydedilen koordinatlar kullanılıyor." + "Value": + "{0} konumunda gerçekçi gezinme geçerli değil. \"LastPos.ini\" dosyasındaki son kaydedilen koordinatlar kullanılıyor." }, { "Key": "coordinatesAreInvalid", @@ -342,7 +350,8 @@ }, { "Key": "maxItemsCombinedOverMaxItemStorage", - "Value": "[Geçersiz Ayar] Tüm eşyaların toplamı (Pokétopları+Potionlar+Revivelar={0}) taşınabilecek eşya limitinden ({1}) daha fazla olamaz." + "Value": + "[Geçersiz Ayar] Tüm eşyaların toplamı (Pokétopları+Potionlar+Revivelar={0}) taşınabilecek eşya limitinden ({1}) daha fazla olamaz." }, { "Key": "recyclingQuietly", @@ -354,7 +363,8 @@ }, { "Key": "invFullTransferManually", - "Value": "Taşınabilecek Pokémon limiti doldu! Pokémonları elle aktararak yer açın ya da ayarlardan \"TransferDuplicatePokemon\" değerini \"true\" yapın." + "Value": + "Taşınabilecek Pokémon limiti doldu! Pokémonları elle aktararak yer açın ya da ayarlardan \"TransferDuplicatePokemon\" değerini \"true\" yapın." }, { "Key": "invFullPokestopLooting", @@ -426,11 +436,13 @@ }, { "Key": "statsTemplateString", - "Value": "{0} - Süre {1} - Seviye: {2} | XP/SA: {3:n0} | P/SA: {4:n0} | Stardust: {5:n0} | Aktarılan Pokémon: {6:n0} | Atılan Eşya: {7:n0}" + "Value": + "{0} - Süre {1} - Seviye: {2} | XP/SA: {3:n0} | P/SA: {4:n0} | Stardust: {5:n0} | Aktarılan Pokémon: {6:n0} | Atılan Eşya: {7:n0}" }, { "Key": "profileStatsTemplateString", - "Value": "----- SEVİYE {0} | {1} ----- \n Tecrübe(XP): {2}/{3} \n Yakalanan Pokémon: {4} \n Görülen Pokémon: {5} \n Ziyaret Edilen Pokéstop: {6} \n Çatlatılan Yumurta(Egg): {7} \n Geliştirilen(Evolve) Pokémon: {8} \n Pokédex Kayıtları: {9} \n Yürünen Mesafe: {10}km \n Pokémonlar: {11}/{12}" + "Value": + "----- SEVİYE {0} | {1} ----- \n Tecrübe(XP): {2}/{3} \n Yakalanan Pokémon: {4} \n Görülen Pokémon: {5} \n Ziyaret Edilen Pokéstop: {6} \n Çatlatılan Yumurta(Egg): {7} \n Geliştirilen(Evolve) Pokémon: {8} \n Pokédex Kayıtları: {9} \n Yürünen Mesafe: {10}km \n Pokémonlar: {11}/{12}" }, { "Key": "showPokeTemplate", @@ -438,7 +450,8 @@ }, { "Key": "helpTemplate", - "Value": "Komutlar: \n \n /top <cp/iv> <sayı> - En iyi Pokémonları gösterir. \n /all <cp/iv> - Bütün Pokémonları gösterir. \n /profile - Profili gösterir. \n /loc - Konumu gösterir. \n /items - Eşyaları gösterir. \n /status - Bot durumunu gösterir." + "Value": + "Komutlar: \n \n /top <cp/iv> <sayı> - En iyi Pokémonları gösterir. \n /all <cp/iv> - Bütün Pokémonları gösterir. \n /profile - Profili gösterir. \n /loc - Konumu gösterir. \n /items - Eşyaları gösterir. \n /status - Bot durumunu gösterir." }, { "Key": "statsXpTemplateString", @@ -450,11 +463,13 @@ }, { "Key": "googleTwoFactorAuth", - "Value": "\"Google İki Aşamalı Doğrulama\" etkinleştirilmiş olduğundan dolayı \"auth.json\" dosyasına uygulamaya özel şifrenin eklenmesi gerekiyor." + "Value": + "\"Google İki Aşamalı Doğrulama\" etkinleştirilmiş olduğundan dolayı \"auth.json\" dosyasına uygulamaya özel şifrenin eklenmesi gerekiyor." }, { "Key": "googleTwoFactorAuthExplanation", - "Value": "\"Google Uygulama Şifreleri\" sayfası açılıyor. Lütfen yeni bir uygulama şifresi oluşturun. (Aygıt olarak \"Diğer\" seçeneğini seçin.)" + "Value": + "\"Google Uygulama Şifreleri\" sayfası açılıyor. Lütfen yeni bir uygulama şifresi oluşturun. (Aygıt olarak \"Diğer\" seçeneğini seçin.)" }, { "Key": "googleError", @@ -574,7 +589,8 @@ }, { "Key": "firstStartAutoGenSettings", - "Value": "\"auth.json\" ve \"config.json\" dosyaları otomatik olarak oluşturuldu. Programı çalıştırmadan önce elle doldurmanız gerekiyor." + "Value": + "\"auth.json\" ve \"config.json\" dosyaları otomatik olarak oluşturuldu. Programı çalıştırmadan önce elle doldurmanız gerekiyor." }, { "Key": "firstStartSetupAccount", @@ -644,7 +660,7 @@ "Key": "firstStartSetupDefaultLongConfirm", "Value": "Boylam(longitude) onaylandı: {0}" }, - { + { "Key": "firstStartSetupCompleted", "Value": "### KURULUM TAMAMLANDI ###" }, diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.uk_UA.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.uk_UA.json index 115c8cc..bf4cd8a 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.uk_UA.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.uk_UA.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -68,11 +68,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | {11} EXP earned | {12} | lat: {13} long: {14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left). | lat: {11} long: {12}" }, { "Key": "eventNoPokeballs", @@ -397,22 +399,22 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], - "PokemonStrings": [ + "PokemonStrings": [ { "Key": "bulbasaur", "Value": "Bulbasaur" diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.vi.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.vi.json index 7267808..c2908c7 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.vi.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.vi.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -26,7 +26,8 @@ }, { "Key": "farmPokestopsOutsideRadius", - "Value": "Bạn đang ở ngoài phạm vi xác định! Đi tới điểm xuất phát (xa {0}m) trong 5 giây. File LastPos.ini có đúng không?" + "Value": + "Bạn đang ở ngoài phạm vi xác định! Đi tới điểm xuất phát (xa {0}m) trong 5 giây. File LastPos.ini có đúng không?" }, { "Key": "farmPokestopsNoUsableFound", @@ -74,11 +75,13 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Cơ hội bắt được: {7}% | Cách xa {8}m | Bắt bằng {9} (Còn lại {10}) | Nhận được {11} EXP | {12} | Toạ độ: {13},{14}" + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Cơ hội bắt được: {7}% | Cách xa {8}m | Bắt bằng {9} (Còn lại {10}) | Nhận được {11} EXP | {12} | Toạ độ: {13},{14}" }, { "Key": "eventPokemonCaptureFailed", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Cơ hội bắt được: {7}% | Cách xa {8}m | Bắt bằng {9} (Còn lại {10}) | Toạ độ: {11},{12} ." + "Value": + "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Cơ hội bắt được: {7}% | Cách xa {8}m | Bắt bằng {9} (Còn lại {10}) | Toạ độ: {11},{12} ." }, { "Key": "eventNoPokeballs", @@ -338,7 +341,8 @@ }, { "Key": "maxItemsCombinedOverMaxItemStorage", - "Value": "[Cấu Hình Không Hợp Lệ] Tổng số vật phẩm tối đa của bạn (balls+potions+revives={0}) đã vượt qua số lượng vật phẩm tốt đa trong túi ({1})" + "Value": + "[Cấu Hình Không Hợp Lệ] Tổng số vật phẩm tối đa của bạn (balls+potions+revives={0}) đã vượt qua số lượng vật phẩm tốt đa trong túi ({1})" }, { "Key": "recyclingQuietly", @@ -350,7 +354,8 @@ }, { "Key": "invFullTransferManually", - "Value": "Túi Pokemon đã đầy! Hãy chuyển Pokemon bằng tay hoặc đặt TransferDuplicatePokemon là true trong config.json..." + "Value": + "Túi Pokemon đã đầy! Hãy chuyển Pokemon bằng tay hoặc đặt TransferDuplicatePokemon là true trong config.json..." }, { "Key": "invFullPokestopLooting", @@ -422,11 +427,13 @@ }, { "Key": "statsTemplateString", - "Value": "{0} - Đã Chạy: {1} - Lvl: {2} | EXP/H: {3:n0} | P/H: {4:n0} | Stardust: {5:n0} | ĐãChuyểnHoá: {6:n0} | ĐãXoá: {7:n0}" + "Value": + "{0} - Đã Chạy: {1} - Lvl: {2} | EXP/H: {3:n0} | P/H: {4:n0} | Stardust: {5:n0} | ĐãChuyểnHoá: {6:n0} | ĐãXoá: {7:n0}" }, - { + { "Key": "profileStatsTemplateString", - "Value": "----- LVL {0} | {1} ----- \n Kinh Nghiệm: {2}/{3} \n Pokemon Đã Bắt: {4} \n Pokemon Đã Chuyển Thành Candy: {5} \n Pokestop Đã Đến: {6} \n Trứng Đã Nở: {6} \n Pokemons envolved: {7} \n Số Mục Trong Pokedex: {8} \n Đã Đi: {9} KM" + "Value": + "----- LVL {0} | {1} ----- \n Kinh Nghiệm: {2}/{3} \n Pokemon Đã Bắt: {4} \n Pokemon Đã Chuyển Thành Candy: {5} \n Pokestop Đã Đến: {6} \n Trứng Đã Nở: {6} \n Pokemons envolved: {7} \n Số Mục Trong Pokedex: {8} \n Đã Đi: {9} KM" }, { "Key": "showPokeTemplate", @@ -434,7 +441,8 @@ }, { "Key": "helpTemplate", - "Value": "Các Lệnh: \n \n /top <Số lượng> - Hiển thị những Pokemon trong TOP <số lượng>. \n /all - Hiển thị tất cả Pokemon. \n /profile - Hiển thị thông tin. \n /loc - Hiển thị vị trí hiện tại. \n /items - Hiển thị những vật phẩm trong túi." + "Value": + "Các Lệnh: \n \n /top <Số lượng> - Hiển thị những Pokemon trong TOP <số lượng>. \n /all - Hiển thị tất cả Pokemon. \n /profile - Hiển thị thông tin. \n /loc - Hiển thị vị trí hiện tại. \n /items - Hiển thị những vật phẩm trong túi." }, { "Key": "statsXpTemplateString", @@ -646,19 +654,19 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], "PokemonStrings": [ diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.zh_CN.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.zh_CN.json index 640ed8c..1e9ece9 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.zh_CN.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.zh_CN.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -74,7 +74,8 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "[{0}]|({1}){2} 等级:{3} CP:({4}/{5}) 完美度:{6}%|捕获几率:{7}%|距离{8}米|使用{9}捕捉(剩余{10}个)|经验+{11}|{12}|坐标:{13},{14}\t\t\t\t\t" + "Value": + "[{0}]|({1}){2} 等级:{3} CP:({4}/{5}) 完美度:{6}%|捕获几率:{7}%|距离{8}米|使用{9}捕捉(剩余{10}个)|经验+{11}|{12}|坐标:{13},{14}\t\t\t\t\t" }, { "Key": "eventPokemonCaptureFailed", @@ -430,7 +431,8 @@ }, { "Key": "profileStatsTemplateString", - "Value": "----- 等级: {0} | {1} ----- \t\t\n 经验: {2}/{3} \t\t\n 捕获了{4}个精灵\t\t\n 已部署了{5}个精灵 \t\t\n 访问了{6}个补给站 \t\t\n 已孵化{6}个蛋 \t\t\n 已进化{7}个精灵\t\t\n 图鉴解锁{8}种\t\t\n 已行走{9}公里\t\t" + "Value": + "----- 等级: {0} | {1} ----- \t\t\n 经验: {2}/{3} \t\t\n 捕获了{4}个精灵\t\t\n 已部署了{5}个精灵 \t\t\n 访问了{6}个补给站 \t\t\n 已孵化{6}个蛋 \t\t\n 已进化{7}个精灵\t\t\n 图鉴解锁{8}种\t\t\n 已行走{9}公里\t\t" }, { "Key": "showPokeTemplate", @@ -438,7 +440,8 @@ }, { "Key": "helpTemplate", - "Value": "命令: \n \n /top <数量> - 显示你最高级的精灵列表. \t\t\n /all - 显示你所有精灵列表. \t\t\n /profile - 显示你个人详细信息. \t\t\n /loc - 显示你的位置. \t\t\n /items - 显示你的物品.\t\t" + "Value": + "命令: \n \n /top <数量> - 显示你最高级的精灵列表. \t\t\n /all - 显示你所有精灵列表. \t\t\n /profile - 显示你个人详细信息. \t\t\n /loc - 显示你的位置. \t\t\n /items - 显示你的物品.\t\t" }, { "Key": "statsXpTemplateString", @@ -654,19 +657,19 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], "PokemonStrings": [ diff --git a/PokemonGo.RocketBot.Window/Config/Translations/translation.zh_TW.json b/PokemonGo.RocketBot.Window/Config/Translations/translation.zh_TW.json index a44e767..f0c7d59 100644 --- a/PokemonGo.RocketBot.Window/Config/Translations/translation.zh_TW.json +++ b/PokemonGo.RocketBot.Window/Config/Translations/translation.zh_TW.json @@ -1,4 +1,4 @@ -{ +{ "TranslationStrings": [ { "Key": "pokeball", @@ -74,7 +74,8 @@ }, { "Key": "eventPokemonCaptureSuccess", - "Value": "({0}) | ({1}) {2} 等級：{3} CP：({4}/{5}) IV：{6}% | 捕獲機率：{7}% | 距離{8}公尺 | 使用{9}捕捉 (剩餘{10}個) | 經驗值+{11} | {12} | 座標：{13},{14}" + "Value": + "({0}) | ({1}) {2} 等級：{3} CP：({4}/{5}) IV：{6}% | 捕獲機率：{7}% | 距離{8}公尺 | 使用{9}捕捉 (剩餘{10}個) | 經驗值+{11} | {12} | 座標：{13},{14}" }, { "Key": "eventPokemonCaptureFailed", @@ -634,19 +635,19 @@ }, { "Key": "PokedexCatchedTelegram", - "Value": "--- Pokedex catched --- \n" + "Value": "--- Pokedex catched --- \n" }, { "Key": "PokedexPokemonCatchedTelegram", - "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" + "Value": "#{0} Name: {1} | Catched: {2} | Encountered: {3} \n" }, { "Key": "PokedexNeededTelegram", - "Value": "--- Pokedex needed --- \n" + "Value": "--- Pokedex needed --- \n" }, { "Key": "PokedexPokemonNeededTelegram", - "Value": "#{0} Name: {1} \n" + "Value": "#{0} Name: {1} \n" } ], "PokemonStrings": [ @@ -1256,7 +1257,7 @@ } ], "PokemonMovesetStrings": [ - { + { "Key": "moveUnset", "Value": "MoveUnset" }, diff --git a/PokemonGo.RocketBot.Window/Config/log4net.config b/PokemonGo.RocketBot.Window/Config/log4net.config index c1ebe95..520e46c 100644 --- a/PokemonGo.RocketBot.Window/Config/log4net.config +++ b/PokemonGo.RocketBot.Window/Config/log4net.config @@ -1,73 +1,74 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0" encoding="utf-8"?> + <log4net> - <appender name="errorAppender" type="log4net.Appender.RollingFileAppender"> - <filter type="log4net.Filter.LevelMatchFilter"> - <levelToMatch value="ERROR" /> - </filter> - <filter type="log4net.Filter.DenyAllFilter" /> - <file value="Logs\err.log" /> - <encoding value="utf-8"/> - <preserveLogFileNameExtension value="true" /> - <appendToFile value="true" /> - <rollingStyle value="Date" /> - <datePattern value="yyyyMMdd" /> - <layout type="log4net.Layout.PatternLayout"> - <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /> - </layout> - </appender> - <appender name="infoAppender" type="log4net.Appender.RollingFileAppender"> - <filter type="log4net.Filter.LevelMatchFilter"> - <levelToMatch value="INFO" /> - </filter> - <filter type="log4net.Filter.DenyAllFilter" /> - <file value="Logs\info.log" /> - <encoding value="utf-8"/> - <preserveLogFileNameExtension value="true" /> - <appendToFile value="true" /> - <rollingStyle value="Date" /> - <datePattern value="yyyyMMdd" /> - <layout type="log4net.Layout.PatternLayout"> - <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /> - </layout> - </appender> - <appender name="debugAppender" type="log4net.Appender.RollingFileAppender"> - <filter type="log4net.Filter.LevelMatchFilter"> - <levelToMatch value="DEBUG" /> - </filter> - <filter type="log4net.Filter.DenyAllFilter" /> - <file value="Logs\debug.log" /> - <encoding value="utf-8"/> - <preserveLogFileNameExtension value="true" /> - <appendToFile value="true" /> - <rollingStyle value="Date" /> - <datePattern value="yyyyMMdd" /> - <layout type="log4net.Layout.PatternLayout"> - <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /> - </layout> - </appender> - <appender name="perfAppender" type="log4net.Appender.RollingFileAppender"> - <filter type="log4net.Filter.LevelMatchFilter"> - <levelToMatch value="INFO" /> - </filter> - <filter type="log4net.Filter.DenyAllFilter" /> - <file value="Logs\perf.log" /> - <encoding value="utf-8"/> - <preserveLogFileNameExtension value="true" /> - <appendToFile value="true" /> - <rollingStyle value="Date" /> - <datePattern value="yyyyMMdd" /> - <layout type="log4net.Layout.PatternLayout"> - <conversionPattern value="%date %logger - %message%newline" /> - </layout> - </appender> - <root> - <level value="ALL" /> - <appender-ref ref="errorAppender" /> - <appender-ref ref="infoAppender" /> - <appender-ref ref="debugAppender" /> - </root> - <logger name="Performance" additivity="false"> - <level value="ALL" /> - <appender-ref ref="perfAppender" /> - </logger> + <appender name="errorAppender" type="log4net.Appender.RollingFileAppender"> + <filter type="log4net.Filter.LevelMatchFilter"> + <levelToMatch value="ERROR" /> + </filter> + <filter type="log4net.Filter.DenyAllFilter" /> + <file value="Logs\err.log" /> + <encoding value="utf-8" /> + <preserveLogFileNameExtension value="true" /> + <appendToFile value="true" /> + <rollingStyle value="Date" /> + <datePattern value="yyyyMMdd" /> + <layout type="log4net.Layout.PatternLayout"> + <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /> + </layout> + </appender> + <appender name="infoAppender" type="log4net.Appender.RollingFileAppender"> + <filter type="log4net.Filter.LevelMatchFilter"> + <levelToMatch value="INFO" /> + </filter> + <filter type="log4net.Filter.DenyAllFilter" /> + <file value="Logs\info.log" /> + <encoding value="utf-8" /> + <preserveLogFileNameExtension value="true" /> + <appendToFile value="true" /> + <rollingStyle value="Date" /> + <datePattern value="yyyyMMdd" /> + <layout type="log4net.Layout.PatternLayout"> + <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /> + </layout> + </appender> + <appender name="debugAppender" type="log4net.Appender.RollingFileAppender"> + <filter type="log4net.Filter.LevelMatchFilter"> + <levelToMatch value="DEBUG" /> + </filter> + <filter type="log4net.Filter.DenyAllFilter" /> + <file value="Logs\debug.log" /> + <encoding value="utf-8" /> + <preserveLogFileNameExtension value="true" /> + <appendToFile value="true" /> + <rollingStyle value="Date" /> + <datePattern value="yyyyMMdd" /> + <layout type="log4net.Layout.PatternLayout"> + <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /> + </layout> + </appender> + <appender name="perfAppender" type="log4net.Appender.RollingFileAppender"> + <filter type="log4net.Filter.LevelMatchFilter"> + <levelToMatch value="INFO" /> + </filter> + <filter type="log4net.Filter.DenyAllFilter" /> + <file value="Logs\perf.log" /> + <encoding value="utf-8" /> + <preserveLogFileNameExtension value="true" /> + <appendToFile value="true" /> + <rollingStyle value="Date" /> + <datePattern value="yyyyMMdd" /> + <layout type="log4net.Layout.PatternLayout"> + <conversionPattern value="%date %logger - %message%newline" /> + </layout> + </appender> + <root> + <level value="ALL" /> + <appender-ref ref="errorAppender" /> + <appender-ref ref="infoAppender" /> + <appender-ref ref="debugAppender" /> + </root> + <logger name="Performance" additivity="false"> + <level value="ALL" /> + <appender-ref ref="perfAppender" /> + </logger> </log4net> \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/Config/log4net.unix.config b/PokemonGo.RocketBot.Window/Config/log4net.unix.config index 3b07772..c84e0f7 100644 --- a/PokemonGo.RocketBot.Window/Config/log4net.unix.config +++ b/PokemonGo.RocketBot.Window/Config/log4net.unix.config @@ -1,73 +1,74 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0" encoding="utf-8"?> + <log4net> - <appender name="errorAppender" type="log4net.Appender.RollingFileAppender"> - <filter type="log4net.Filter.LevelMatchFilter"> - <levelToMatch value="ERROR" /> - </filter> - <filter type="log4net.Filter.DenyAllFilter" /> - <File value="Logs/err.log" /> - <encoding value="utf-8"/> - <preserveLogFileNameExtension value="true" /> - <appendToFile value="true" /> - <rollingStyle value="Date" /> - <datePattern value="yyyyMMdd" /> - <layout type="log4net.Layout.PatternLayout"> - <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /> - </layout> - </appender> - <appender name="infoAppender" type="log4net.Appender.RollingFileAppender"> - <filter type="log4net.Filter.LevelMatchFilter"> - <levelToMatch value="INFO" /> - </filter> - <filter type="log4net.Filter.DenyAllFilter" /> - <file value="Logs/info.log" /> - <encoding value="utf-8"/> - <preserveLogFileNameExtension value="true" /> - <appendToFile value="true" /> - <rollingStyle value="Date" /> - <datePattern value="yyyyMMdd" /> - <layout type="log4net.Layout.PatternLayout"> - <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /> - </layout> - </appender> - <appender name="debugAppender" type="log4net.Appender.RollingFileAppender"> - <filter type="log4net.Filter.LevelMatchFilter"> - <levelToMatch value="DEBUG" /> - </filter> - <filter type="log4net.Filter.DenyAllFilter" /> - <file value="Logs/debug.log" /> - <encoding value="utf-8"/> - <preserveLogFileNameExtension value="true" /> - <appendToFile value="true" /> - <rollingStyle value="Date" /> - <datePattern value="yyyyMMdd" /> - <layout type="log4net.Layout.PatternLayout"> - <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /> - </layout> - </appender> - <appender name="perfAppender" type="log4net.Appender.RollingFileAppender"> - <filter type="log4net.Filter.LevelMatchFilter"> - <levelToMatch value="INFO" /> - </filter> - <filter type="log4net.Filter.DenyAllFilter" /> - <file value="Logs/perf.log" /> - <encoding value="utf-8"/> - <preserveLogFileNameExtension value="true" /> - <appendToFile value="true" /> - <rollingStyle value="Date" /> - <datePattern value="yyyyMMdd" /> - <layout type="log4net.Layout.PatternLayout"> - <conversionPattern value="%date %logger - %message%newline" /> - </layout> - </appender> - <root> - <level value="ALL" /> - <appender-ref ref="errorAppender" /> - <appender-ref ref="infoAppender" /> - <appender-ref ref="debugAppender" /> - </root> - <logger name="Performance" additivity="false"> - <level value="ALL" /> - <appender-ref ref="perfAppender" /> - </logger> + <appender name="errorAppender" type="log4net.Appender.RollingFileAppender"> + <filter type="log4net.Filter.LevelMatchFilter"> + <levelToMatch value="ERROR" /> + </filter> + <filter type="log4net.Filter.DenyAllFilter" /> + <File value="Logs/err.log" /> + <encoding value="utf-8" /> + <preserveLogFileNameExtension value="true" /> + <appendToFile value="true" /> + <rollingStyle value="Date" /> + <datePattern value="yyyyMMdd" /> + <layout type="log4net.Layout.PatternLayout"> + <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /> + </layout> + </appender> + <appender name="infoAppender" type="log4net.Appender.RollingFileAppender"> + <filter type="log4net.Filter.LevelMatchFilter"> + <levelToMatch value="INFO" /> + </filter> + <filter type="log4net.Filter.DenyAllFilter" /> + <file value="Logs/info.log" /> + <encoding value="utf-8" /> + <preserveLogFileNameExtension value="true" /> + <appendToFile value="true" /> + <rollingStyle value="Date" /> + <datePattern value="yyyyMMdd" /> + <layout type="log4net.Layout.PatternLayout"> + <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /> + </layout> + </appender> + <appender name="debugAppender" type="log4net.Appender.RollingFileAppender"> + <filter type="log4net.Filter.LevelMatchFilter"> + <levelToMatch value="DEBUG" /> + </filter> + <filter type="log4net.Filter.DenyAllFilter" /> + <file value="Logs/debug.log" /> + <encoding value="utf-8" /> + <preserveLogFileNameExtension value="true" /> + <appendToFile value="true" /> + <rollingStyle value="Date" /> + <datePattern value="yyyyMMdd" /> + <layout type="log4net.Layout.PatternLayout"> + <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /> + </layout> + </appender> + <appender name="perfAppender" type="log4net.Appender.RollingFileAppender"> + <filter type="log4net.Filter.LevelMatchFilter"> + <levelToMatch value="INFO" /> + </filter> + <filter type="log4net.Filter.DenyAllFilter" /> + <file value="Logs/perf.log" /> + <encoding value="utf-8" /> + <preserveLogFileNameExtension value="true" /> + <appendToFile value="true" /> + <rollingStyle value="Date" /> + <datePattern value="yyyyMMdd" /> + <layout type="log4net.Layout.PatternLayout"> + <conversionPattern value="%date %logger - %message%newline" /> + </layout> + </appender> + <root> + <level value="ALL" /> + <appender-ref ref="errorAppender" /> + <appender-ref ref="infoAppender" /> + <appender-ref ref="debugAppender" /> + </root> + <logger name="Performance" additivity="false"> + <level value="ALL" /> + <appender-ref ref="perfAppender" /> + </logger> </log4net> \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/ConsoleEventListener.cs b/PokemonGo.RocketBot.Window/ConsoleEventListener.cs index c5565e3..ac85971 100644 --- a/PokemonGo.RocketBot.Window/ConsoleEventListener.cs +++ b/PokemonGo.RocketBot.Window/ConsoleEventListener.cs @@ -46,16 +46,19 @@ namespace PokemonGo.RocketBot.Window private static void HandleEvent(UseLuckyEggEvent useLuckyEggEvent, ISession session) { - Logger.Write(session.Translation.GetTranslation(TranslationString.EventUsedLuckyEgg, useLuckyEggEvent.Count), + Logger.Write( + session.Translation.GetTranslation(TranslationString.EventUsedLuckyEgg, useLuckyEggEvent.Count), LogLevel.Egg); } private static void HandleEvent(PokemonEvolveEvent pokemonEvolveEvent, ISession session) { - string strPokemon = session.Translation.GetPokemonTranslation(pokemonEvolveEvent.Id); + var strPokemon = session.Translation.GetPokemonTranslation(pokemonEvolveEvent.Id); Logger.Write(pokemonEvolveEvent.Result == EvolvePokemonResponse.Types.Result.Success - ? session.Translation.GetTranslation(TranslationString.EventPokemonEvolvedSuccess, strPokemon, pokemonEvolveEvent.Exp) - : session.Translation.GetTranslation(TranslationString.EventPokemonEvolvedFailed, pokemonEvolveEvent.Id, pokemonEvolveEvent.Result, + ? session.Translation.GetTranslation(TranslationString.EventPokemonEvolvedSuccess, strPokemon, + pokemonEvolveEvent.Exp) + : session.Translation.GetTranslation(TranslationString.EventPokemonEvolvedFailed, pokemonEvolveEvent.Id, + pokemonEvolveEvent.Result, strPokemon), LogLevel.Evolve); } @@ -64,33 +67,38 @@ namespace PokemonGo.RocketBot.Window { Logger.Write( session.Translation.GetTranslation(TranslationString.EventPokemonTransferred, - session.Translation.GetPokemonTranslation(transferPokemonEvent.Id).PadRight(12, ' '), - transferPokemonEvent.Cp.ToString().PadLeft(4, ' '), - transferPokemonEvent.Perfection.ToString("0.00").PadLeft(6, ' '), - transferPokemonEvent.BestCp.ToString().PadLeft(4, ' '), - transferPokemonEvent.BestPerfection.ToString("0.00").PadLeft(6, ' '), - transferPokemonEvent.FamilyCandies), + session.Translation.GetPokemonTranslation(transferPokemonEvent.Id).PadRight(12, ' '), + transferPokemonEvent.Cp.ToString().PadLeft(4, ' '), + transferPokemonEvent.Perfection.ToString("0.00").PadLeft(6, ' '), + transferPokemonEvent.BestCp.ToString().PadLeft(4, ' '), + transferPokemonEvent.BestPerfection.ToString("0.00").PadLeft(6, ' '), + transferPokemonEvent.FamilyCandies), LogLevel.Transfer); } private static void HandleEvent(ItemRecycledEvent itemRecycledEvent, ISession session) { - Logger.Write(session.Translation.GetTranslation(TranslationString.EventItemRecycled, itemRecycledEvent.Count, itemRecycledEvent.Id), + Logger.Write( + session.Translation.GetTranslation(TranslationString.EventItemRecycled, itemRecycledEvent.Count, + itemRecycledEvent.Id), LogLevel.Recycling); } private static void HandleEvent(EggIncubatorStatusEvent eggIncubatorStatusEvent, ISession session) { Logger.Write(eggIncubatorStatusEvent.WasAddedNow - ? session.Translation.GetTranslation(TranslationString.IncubatorPuttingEgg, eggIncubatorStatusEvent.KmRemaining) - : session.Translation.GetTranslation(TranslationString.IncubatorStatusUpdate, eggIncubatorStatusEvent.KmRemaining), + ? session.Translation.GetTranslation(TranslationString.IncubatorPuttingEgg, + eggIncubatorStatusEvent.KmRemaining) + : session.Translation.GetTranslation(TranslationString.IncubatorStatusUpdate, + eggIncubatorStatusEvent.KmRemaining), LogLevel.Egg); } private static void HandleEvent(EggHatchedEvent eggHatchedEvent, ISession session) { Logger.Write(session.Translation.GetTranslation(TranslationString.IncubatorEggHatched, - session.Translation.GetPokemonTranslation(eggHatchedEvent.PokemonId), eggHatchedEvent.Level, eggHatchedEvent.Cp, eggHatchedEvent.MaxCp, eggHatchedEvent.Perfection), + session.Translation.GetPokemonTranslation(eggHatchedEvent.PokemonId), eggHatchedEvent.Level, + eggHatchedEvent.Cp, eggHatchedEvent.MaxCp, eggHatchedEvent.Perfection), LogLevel.Egg); } @@ -100,7 +108,8 @@ namespace PokemonGo.RocketBot.Window ? session.Translation.GetTranslation(TranslationString.InvFullPokestopLooting) : fortUsedEvent.Items; Logger.Write( - session.Translation.GetTranslation(TranslationString.EventFortUsed, fortUsedEvent.Name, fortUsedEvent.Exp, fortUsedEvent.Gems, + session.Translation.GetTranslation(TranslationString.EventFortUsed, fortUsedEvent.Name, + fortUsedEvent.Exp, fortUsedEvent.Gems, itemString, fortUsedEvent.Latitude, fortUsedEvent.Longitude), LogLevel.Pokestop); } @@ -112,26 +121,29 @@ namespace PokemonGo.RocketBot.Window Logger.lineSelect(0, 1); // Replaces the last line to prevent spam. } - if (fortFailedEvent.Looted == true) + if (fortFailedEvent.Looted) { Logger.Write( - session.Translation.GetTranslation(TranslationString.SoftBanBypassed), - LogLevel.SoftBan, ConsoleColor.Green); - } else { + session.Translation.GetTranslation(TranslationString.SoftBanBypassed), + LogLevel.SoftBan, ConsoleColor.Green); + } + else + { Logger.Write( - session.Translation.GetTranslation(TranslationString.EventFortFailed, fortFailedEvent.Name, fortFailedEvent.Try, fortFailedEvent.Max), - LogLevel.SoftBan); + session.Translation.GetTranslation(TranslationString.EventFortFailed, fortFailedEvent.Name, + fortFailedEvent.Try, fortFailedEvent.Max), + LogLevel.SoftBan); } } private static void HandleEvent(FortTargetEvent fortTargetEvent, ISession session) { - - int intTimeForArrival = (int) ( fortTargetEvent.Distance / ( session.LogicSettings.WalkingSpeedInKilometerPerHour * 0.8 ) ); + var intTimeForArrival = + (int) (fortTargetEvent.Distance/(session.LogicSettings.WalkingSpeedInKilometerPerHour*0.8)); Logger.Write( session.Translation.GetTranslation(TranslationString.EventFortTargeted, fortTargetEvent.Name, - Math.Round(fortTargetEvent.Distance), intTimeForArrival ), + Math.Round(fortTargetEvent.Distance), intTimeForArrival), LogLevel.Info, ConsoleColor.Gray); } @@ -181,7 +193,8 @@ namespace PokemonGo.RocketBot.Window } var catchStatus = pokemonCaptureEvent.Attempt > 1 - ? session.Translation.GetTranslation(TranslationString.CatchStatusAttempt, strStatus, pokemonCaptureEvent.Attempt) + ? session.Translation.GetTranslation(TranslationString.CatchStatusAttempt, strStatus, + pokemonCaptureEvent.Attempt) : session.Translation.GetTranslation(TranslationString.CatchStatus, strStatus); var familyCandies = pokemonCaptureEvent.FamilyCandies > 0 @@ -192,28 +205,35 @@ namespace PokemonGo.RocketBot.Window if (pokemonCaptureEvent.Status == CatchPokemonResponse.Types.CatchStatus.CatchSuccess) { - message = session.Translation.GetTranslation(TranslationString.EventPokemonCaptureSuccess, catchStatus, catchType, session.Translation.GetPokemonTranslation(pokemonCaptureEvent.Id), - pokemonCaptureEvent.Level, pokemonCaptureEvent.Cp, pokemonCaptureEvent.MaxCp, pokemonCaptureEvent.Perfection.ToString("0.00"), pokemonCaptureEvent.Probability, - pokemonCaptureEvent.Distance.ToString("F2"), - returnRealBallName(pokemonCaptureEvent.Pokeball), pokemonCaptureEvent.BallAmount, - pokemonCaptureEvent.Exp, familyCandies, pokemonCaptureEvent.Latitude.ToString("0.000000"), pokemonCaptureEvent.Longitude.ToString("0.000000")); - Logger.Write(message, LogLevel.Caught); + message = session.Translation.GetTranslation(TranslationString.EventPokemonCaptureSuccess, catchStatus, + catchType, session.Translation.GetPokemonTranslation(pokemonCaptureEvent.Id), + pokemonCaptureEvent.Level, pokemonCaptureEvent.Cp, pokemonCaptureEvent.MaxCp, + pokemonCaptureEvent.Perfection.ToString("0.00"), pokemonCaptureEvent.Probability, + pokemonCaptureEvent.Distance.ToString("F2"), + returnRealBallName(pokemonCaptureEvent.Pokeball), pokemonCaptureEvent.BallAmount, + pokemonCaptureEvent.Exp, familyCandies, pokemonCaptureEvent.Latitude.ToString("0.000000"), + pokemonCaptureEvent.Longitude.ToString("0.000000")); + Logger.Write(message, LogLevel.Caught); } else { - message = session.Translation.GetTranslation(TranslationString.EventPokemonCaptureFailed, catchStatus, catchType, session.Translation.GetPokemonTranslation(pokemonCaptureEvent.Id), - pokemonCaptureEvent.Level, pokemonCaptureEvent.Cp, pokemonCaptureEvent.MaxCp, pokemonCaptureEvent.Perfection.ToString("0.00"), pokemonCaptureEvent.Probability, - pokemonCaptureEvent.Distance.ToString("F2"), - returnRealBallName(pokemonCaptureEvent.Pokeball), pokemonCaptureEvent.BallAmount, - pokemonCaptureEvent.Latitude.ToString("0.000000"), pokemonCaptureEvent.Longitude.ToString("0.000000")); + message = session.Translation.GetTranslation(TranslationString.EventPokemonCaptureFailed, catchStatus, + catchType, session.Translation.GetPokemonTranslation(pokemonCaptureEvent.Id), + pokemonCaptureEvent.Level, pokemonCaptureEvent.Cp, pokemonCaptureEvent.MaxCp, + pokemonCaptureEvent.Perfection.ToString("0.00"), pokemonCaptureEvent.Probability, + pokemonCaptureEvent.Distance.ToString("F2"), + returnRealBallName(pokemonCaptureEvent.Pokeball), pokemonCaptureEvent.BallAmount, + pokemonCaptureEvent.Latitude.ToString("0.000000"), + pokemonCaptureEvent.Longitude.ToString("0.000000")); Logger.Write(message, LogLevel.Flee); } - } private static void HandleEvent(NoPokeballEvent noPokeballEvent, ISession session) { - Logger.Write(session.Translation.GetTranslation(TranslationString.EventNoPokeballs, noPokeballEvent.Id, noPokeballEvent.Cp), + Logger.Write( + session.Translation.GetTranslation(TranslationString.EventNoPokeballs, noPokeballEvent.Id, + noPokeballEvent.Cp), LogLevel.Caught); } @@ -230,7 +250,8 @@ namespace PokemonGo.RocketBot.Window break; } - Logger.Write(session.Translation.GetTranslation(TranslationString.EventUseBerry, strBerry, useBerryEvent.Count), + Logger.Write( + session.Translation.GetTranslation(TranslationString.EventUseBerry, strBerry, useBerryEvent.Count), LogLevel.Berry); } @@ -242,11 +263,16 @@ namespace PokemonGo.RocketBot.Window private static void HandleEvent(SnipeScanEvent snipeScanEvent, ISession session) { Logger.Write(snipeScanEvent.PokemonId == PokemonId.Missingno - ? ((snipeScanEvent.Source != null) ? "(" + snipeScanEvent.Source + ") " : null) + session.Translation.GetTranslation(TranslationString.SnipeScan, - $"{snipeScanEvent.Bounds.Latitude},{snipeScanEvent.Bounds.Longitude}") - : ((snipeScanEvent.Source != null) ? "(" + snipeScanEvent.Source + ") " : null) + session.Translation.GetTranslation(TranslationString.SnipeScanEx, session.Translation.GetPokemonTranslation(snipeScanEvent.PokemonId), - snipeScanEvent.Iv > 0 ? snipeScanEvent.Iv.ToString(CultureInfo.InvariantCulture) : session.Translation.GetTranslation(TranslationString.CommonWordUnknown), - $"{snipeScanEvent.Bounds.Latitude},{snipeScanEvent.Bounds.Longitude}"), LogLevel.Sniper); + ? (snipeScanEvent.Source != null ? "(" + snipeScanEvent.Source + ") " : null) + + session.Translation.GetTranslation(TranslationString.SnipeScan, + $"{snipeScanEvent.Bounds.Latitude},{snipeScanEvent.Bounds.Longitude}") + : (snipeScanEvent.Source != null ? "(" + snipeScanEvent.Source + ") " : null) + + session.Translation.GetTranslation(TranslationString.SnipeScanEx, + session.Translation.GetPokemonTranslation(snipeScanEvent.PokemonId), + snipeScanEvent.Iv > 0 + ? snipeScanEvent.Iv.ToString(CultureInfo.InvariantCulture) + : session.Translation.GetTranslation(TranslationString.CommonWordUnknown), + $"{snipeScanEvent.Bounds.Latitude},{snipeScanEvent.Bounds.Longitude}"), LogLevel.Sniper); } private static void HandleEvent(DisplayHighestsPokemonEvent displayHighestsPokemonEvent, ISession session) @@ -284,25 +310,27 @@ namespace PokemonGo.RocketBot.Window var candy = session.Translation.GetTranslation(TranslationString.DisplayHighestCandy); Logger.Write($"====== {strHeader} ======", LogLevel.Info, ConsoleColor.Yellow); - foreach( var pokemon in displayHighestsPokemonEvent.PokemonList ) + foreach (var pokemon in displayHighestsPokemonEvent.PokemonList) { - string strMove1 = session.Translation.GetPokemonMovesetTranslation( pokemon.Item5 ); - string strMove2 = session.Translation.GetPokemonMovesetTranslation( pokemon.Item6 ); + var strMove1 = session.Translation.GetPokemonMovesetTranslation(pokemon.Item5); + var strMove2 = session.Translation.GetPokemonMovesetTranslation(pokemon.Item6); Logger.Write( - $"# CP {pokemon.Item1.Cp.ToString().PadLeft( 4, ' ' )}/{pokemon.Item2.ToString().PadLeft( 4, ' ' )} | ({pokemon.Item3.ToString( "0.00" )}% {strPerfect})\t| Lvl {pokemon.Item4.ToString( "00" )}\t {strName}: {session.Translation.GetPokemonTranslation( pokemon.Item1.PokemonId ).PadRight( 10, ' ' )}\t {move1}: {strMove1.PadRight( 20, ' ' )} {move2}: {strMove2.PadRight( 20, ' ' )} {candy}: {pokemon.Item7}", - LogLevel.Info, ConsoleColor.Yellow ); + $"# CP {pokemon.Item1.Cp.ToString().PadLeft(4, ' ')}/{pokemon.Item2.ToString().PadLeft(4, ' ')} | ({pokemon.Item3.ToString("0.00")}% {strPerfect})\t| Lvl {pokemon.Item4.ToString("00")}\t {strName}: {session.Translation.GetPokemonTranslation(pokemon.Item1.PokemonId).PadRight(10, ' ')}\t {move1}: {strMove1.PadRight(20, ' ')} {move2}: {strMove2.PadRight(20, ' ')} {candy}: {pokemon.Item7}", + LogLevel.Info, ConsoleColor.Yellow); } } - private static void HandleEvent(EvolveCountEvent evolveCountEvent, ISession session ) + private static void HandleEvent(EvolveCountEvent evolveCountEvent, ISession session) { - Logger.Write(session.Translation.GetTranslation(TranslationString.PkmPotentialEvolveCount, evolveCountEvent.Evolves), LogLevel.Evolve); + Logger.Write( + session.Translation.GetTranslation(TranslationString.PkmPotentialEvolveCount, evolveCountEvent.Evolves), + LogLevel.Evolve); } - private static void HandleEvent( UpdateEvent updateEvent, ISession session ) + private static void HandleEvent(UpdateEvent updateEvent, ISession session) { - Logger.Write( updateEvent.ToString(), LogLevel.Update ); + Logger.Write(updateEvent.ToString(), LogLevel.Update); } internal void Listen(IEvent evt, ISession session) @@ -319,4 +347,4 @@ namespace PokemonGo.RocketBot.Window } } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/ConsoleLogger.cs b/PokemonGo.RocketBot.Window/ConsoleLogger.cs index 1b9c18a..c746524 100644 --- a/PokemonGo.RocketBot.Window/ConsoleLogger.cs +++ b/PokemonGo.RocketBot.Window/ConsoleLogger.cs @@ -1,31 +1,29 @@ #region using directives using System; -using System.Text; -using PokemonGo.RocketBot.Window.Models; +using System.Drawing; using PokemonGo.RocketBot.Logic.Logging; using PokemonGo.RocketBot.Logic.State; -using System.Drawing; +using PokemonGo.RocketBot.Window.Models; #endregion namespace PokemonGo.RocketBot.Window { /// <summary> - /// The ConsoleLogger is a simple logger which writes all logs to the Console. + /// The ConsoleLogger is a simple logger which writes all logs to the Console. /// </summary> public class ConsoleLogger : ILogger { - private readonly LogLevel _maxLogLevel; - private ISession _session; - // Log write event definition. public delegate void LogWriteHandler(object sender, LogWriteEventArgs e); - public event LogWriteHandler OnLogWrite; + + private readonly LogLevel _maxLogLevel; + private ISession _session; /// <summary> - /// To create a ConsoleLogger, we must define a maximum log level. - /// All levels above won't be logged. + /// To create a ConsoleLogger, we must define a maximum log level. + /// All levels above won't be logged. /// </summary> /// <param name="maxLogLevel"></param> internal ConsoleLogger(LogLevel maxLogLevel) @@ -40,7 +38,7 @@ namespace PokemonGo.RocketBot.Window } /// <summary> - /// Log a specific message by LogLevel. Won't log if the LogLevel is greater than the maxLogLevel set. + /// Log a specific message by LogLevel. Won't log if the LogLevel is greater than the maxLogLevel set. /// </summary> /// <param name="message">The message to log. The current time will be prepended.</param> /// <param name="level">Optional. Default <see cref="LogLevel.Info" />.</param> @@ -52,70 +50,87 @@ namespace PokemonGo.RocketBot.Window return; // Fire log write event. - OnLogWrite?.Invoke(this, new LogWriteEventArgs() { Message = message, Level = level, Color = color }); + OnLogWrite?.Invoke(this, new LogWriteEventArgs {Message = message, Level = level, Color = color}); message = message + "\r\n"; // ReSharper disable once SwitchStatementMissingSomeCases switch (level) { case LogLevel.Error: - MainForm.ColoredConsoleWrite(Color.Red, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Error}) {message}"); + MainForm.ColoredConsoleWrite(Color.Red, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Error}) {message}"); break; case LogLevel.Warning: - MainForm.ColoredConsoleWrite(Color.Goldenrod, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Attention}) {message}"); + MainForm.ColoredConsoleWrite(Color.Goldenrod, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Attention}) {message}"); break; case LogLevel.Info: - MainForm.ColoredConsoleWrite(Color.DarkCyan, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Info}) {message}"); + MainForm.ColoredConsoleWrite(Color.DarkCyan, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Info}) {message}"); break; case LogLevel.Pokestop: - MainForm.ColoredConsoleWrite(Color.Cyan, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Pokestop}) {message}"); + MainForm.ColoredConsoleWrite(Color.Cyan, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Pokestop}) {message}"); break; case LogLevel.Farming: - MainForm.ColoredConsoleWrite(Color.Magenta, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Farming}) {message}"); + MainForm.ColoredConsoleWrite(Color.Magenta, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Farming}) {message}"); break; case LogLevel.Sniper: - MainForm.ColoredConsoleWrite(Color.White, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Sniper}) {message}"); + MainForm.ColoredConsoleWrite(Color.White, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Sniper}) {message}"); break; case LogLevel.Recycling: - MainForm.ColoredConsoleWrite(Color.DarkMagenta, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Recycling}) {message}"); + MainForm.ColoredConsoleWrite(Color.DarkMagenta, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Recycling}) {message}"); break; case LogLevel.Caught: - MainForm.ColoredConsoleWrite(Color.Green, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Pkmn}) {message}"); + MainForm.ColoredConsoleWrite(Color.Green, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Pkmn}) {message}"); break; case LogLevel.Transfer: - MainForm.ColoredConsoleWrite(Color.DarkGreen, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Transferred}) {message}"); + MainForm.ColoredConsoleWrite(Color.DarkGreen, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Transferred}) {message}"); break; case LogLevel.Evolve: - MainForm.ColoredConsoleWrite(Color.Yellow, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Evolved}) {message}"); + MainForm.ColoredConsoleWrite(Color.Yellow, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Evolved}) {message}"); break; case LogLevel.Berry: - MainForm.ColoredConsoleWrite(Color.DarkGoldenrod, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Berry}) {message}"); + MainForm.ColoredConsoleWrite(Color.DarkGoldenrod, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Berry}) {message}"); break; case LogLevel.Egg: - MainForm.ColoredConsoleWrite(Color.DarkGoldenrod, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Egg}) {message}"); + MainForm.ColoredConsoleWrite(Color.DarkGoldenrod, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Egg}) {message}"); break; case LogLevel.Debug: - MainForm.ColoredConsoleWrite(Color.Gray, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Debug}) {message}"); + MainForm.ColoredConsoleWrite(Color.Gray, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Debug}) {message}"); break; case LogLevel.Update: - MainForm.ColoredConsoleWrite(Color.White, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Update}) {message}"); + MainForm.ColoredConsoleWrite(Color.White, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Update}) {message}"); break; case LogLevel.New: - MainForm.ColoredConsoleWrite(Color.Green, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.New}) {message}"); + MainForm.ColoredConsoleWrite(Color.Green, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.New}) {message}"); break; default: - MainForm.ColoredConsoleWrite(Color.White, $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Error}) {message}"); + MainForm.ColoredConsoleWrite(Color.White, + $"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Error}) {message}"); break; } } public void lineSelect(int lineChar = 0, int linesUp = 1) { - } + + public event LogWriteHandler OnLogWrite; } /// <summary> - /// Event args for Log Write Event. + /// Event args for Log Write Event. /// </summary> public class LogWriteEventArgs { @@ -123,4 +138,4 @@ namespace PokemonGo.RocketBot.Window public LogLevel Level { get; set; } public ConsoleColor Color { get; set; } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/MainForm.cs b/PokemonGo.RocketBot.Window/MainForm.cs index 646a60e..91c28de 100644 --- a/PokemonGo.RocketBot.Window/MainForm.cs +++ b/PokemonGo.RocketBot.Window/MainForm.cs @@ -11,6 +11,8 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; using BrightIdeasSoftware; +using PokemonGo.RocketAPI.Exceptions; +using PokemonGo.RocketAPI.Helpers; using PokemonGo.RocketBot.Logic; using PokemonGo.RocketBot.Logic.Common; using PokemonGo.RocketBot.Logic.Event; @@ -23,8 +25,6 @@ using PokemonGo.RocketBot.Window.Plugin; using POGOProtos.Inventory; using POGOProtos.Inventory.Item; using static System.Reflection.Assembly; -using PokemonGo.RocketAPI.Helpers; -using PokemonGo.RocketAPI.Exceptions; namespace PokemonGo.RocketBot.Window { diff --git a/PokemonGo.RocketBot.Window/Models/LoggingStrings.cs b/PokemonGo.RocketBot.Window/Models/LoggingStrings.cs index 5a3535d..38e166d 100644 --- a/PokemonGo.RocketBot.Window/Models/LoggingStrings.cs +++ b/PokemonGo.RocketBot.Window/Models/LoggingStrings.cs @@ -93,15 +93,15 @@ namespace PokemonGo.RocketBot.Window.Models Update = session?.Translation.GetTranslation( - TranslationString.LogEntryUpdate ) ?? "UPDATE"; + TranslationString.LogEntryUpdate) ?? "UPDATE"; New = session?.Translation.GetTranslation( - TranslationString.LogEntryNew ) ?? "NEW"; + TranslationString.LogEntryNew) ?? "NEW"; SoftBan = session?.Translation.GetTranslation( - TranslationString.LogEntrySoftBan) ?? "SOFTBAN"; + TranslationString.LogEntrySoftBan) ?? "SOFTBAN"; } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/Plugin/INecroPlugin.cs b/PokemonGo.RocketBot.Window/Plugin/INecroPlugin.cs index d22fe3d..ff7b1f7 100644 --- a/PokemonGo.RocketBot.Window/Plugin/INecroPlugin.cs +++ b/PokemonGo.RocketBot.Window/Plugin/INecroPlugin.cs @@ -1,13 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PokemonGo.RocketBot.Window.Plugin +namespace PokemonGo.RocketBot.Window.Plugin { public interface INecroPlugin { void Initialize(PluginInitializerInfo pii); } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/Plugin/PluginInitializerInfo.cs b/PokemonGo.RocketBot.Window/Plugin/PluginInitializerInfo.cs index 968e101..b37cbe0 100644 --- a/PokemonGo.RocketBot.Window/Plugin/PluginInitializerInfo.cs +++ b/PokemonGo.RocketBot.Window/Plugin/PluginInitializerInfo.cs @@ -1,11 +1,6 @@ using PokemonGo.RocketBot.Logic; using PokemonGo.RocketBot.Logic.State; using PokemonGo.RocketBot.Logic.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PokemonGo.RocketBot.Window.Plugin { @@ -16,4 +11,4 @@ namespace PokemonGo.RocketBot.Window.Plugin public ConsoleLogger Logger { get; set; } public Statistics Statistics { get; set; } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/Plugin/PluginManager.cs b/PokemonGo.RocketBot.Window/Plugin/PluginManager.cs index e55d9ce..0247b27 100644 --- a/PokemonGo.RocketBot.Window/Plugin/PluginManager.cs +++ b/PokemonGo.RocketBot.Window/Plugin/PluginManager.cs @@ -1,27 +1,24 @@ -using PokemonGo.RocketBot.Logic.Logging; -using System; +using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Reflection; -using System.Text; -using System.Threading.Tasks; +using PokemonGo.RocketBot.Logic.Logging; namespace PokemonGo.RocketBot.Window.Plugin { /// <summary> - /// Plugin loader. + /// Plugin loader. /// </summary> - class PluginManager - { + internal class PluginManager + { // Private vars. - private PluginInitializerInfo _initInfo; - private List<INecroPlugin> _plugins; - private Type _pluginType = typeof(INecroPlugin); + private readonly PluginInitializerInfo _initInfo; + private readonly List<INecroPlugin> _plugins; + private readonly Type _pluginType = typeof(INecroPlugin); /// <summary> - /// Plugin loader. + /// Plugin loader. /// </summary> /// <param name="initInfo"></param> public PluginManager(PluginInitializerInfo initInfo) @@ -32,20 +29,20 @@ namespace PokemonGo.RocketBot.Window.Plugin /// <summary> - /// Load all the plugins found in the Necro root folder. + /// Load all the plugins found in the Necro root folder. /// </summary> public void InitPlugins() { // Get all the plugin DLLs. - string pluginDir = Path.Combine(Directory.GetCurrentDirectory(), "Plugins"); + var pluginDir = Path.Combine(Directory.GetCurrentDirectory(), "Plugins"); if (!Directory.Exists(pluginDir)) Directory.CreateDirectory(pluginDir); var dllFiles = Directory.GetFiles(pluginDir, "*.dll"); // Attempt to load all the assemblies from the DLLs. - List<Assembly> assemblies = new List<Assembly>(); - foreach (string dll in dllFiles) + var assemblies = new List<Assembly>(); + foreach (var dll in dllFiles) { var assembly = AttemptAssemblyLoad(dll); if (assembly != null) @@ -58,7 +55,7 @@ namespace PokemonGo.RocketBot.Window.Plugin /// <summary> - /// Attempt to load an assembly. + /// Attempt to load an assembly. /// </summary> /// <param name="dll">List of DLLs</param> /// <returns>Assembly if found, null if not.</returns> @@ -66,8 +63,8 @@ namespace PokemonGo.RocketBot.Window.Plugin { try { - AssemblyName an = AssemblyName.GetAssemblyName(dll); - Assembly assembly = Assembly.Load(an); + var an = AssemblyName.GetAssemblyName(dll); + var assembly = Assembly.Load(an); return assembly; } catch @@ -78,20 +75,19 @@ namespace PokemonGo.RocketBot.Window.Plugin /// <summary> - /// Load plugins from an assembly. + /// Load plugins from an assembly. /// </summary> /// <param name="assemblies">List of assemblies.</param> private void LoadPlugins(List<Assembly> assemblies) { - // Get all the types from this assembly that match our plugin type. ICollection<Type> pluginTypes = new List<Type>(); - foreach (Assembly assembly in assemblies) + foreach (var assembly in assemblies) { try { - Type[] types = assembly.GetTypes(); - foreach (Type type in types) + var types = assembly.GetTypes(); + foreach (var type in types) { if (type.IsInterface || type.IsAbstract) continue; @@ -107,11 +103,11 @@ namespace PokemonGo.RocketBot.Window.Plugin } // Iterate through them all and create an instance of the plugin. - foreach (Type type in pluginTypes) + foreach (var type in pluginTypes) { try { - INecroPlugin plugin = (INecroPlugin)Activator.CreateInstance(type); + var plugin = (INecroPlugin) Activator.CreateInstance(type); plugin.Initialize(_initInfo); _plugins.Add(plugin); } @@ -122,4 +118,4 @@ namespace PokemonGo.RocketBot.Window.Plugin } } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/Program.cs b/PokemonGo.RocketBot.Window/Program.cs index a907f36..3262316 100644 --- a/PokemonGo.RocketBot.Window/Program.cs +++ b/PokemonGo.RocketBot.Window/Program.cs @@ -1,20 +1,6 @@ #region using directives using System; -using System.Globalization; -using System.Threading; -using PokemonGo.RocketBot.Logic; -using PokemonGo.RocketBot.Logic.Common; -using PokemonGo.RocketBot.Logic.Event; -using PokemonGo.RocketBot.Logic.Logging; -using PokemonGo.RocketBot.Logic.State; -using PokemonGo.RocketBot.Logic.Tasks; -using PokemonGo.RocketBot.Logic.Utils; -using System.IO; -using System.Net; -using PokemonGo.RocketBot.Window.Resources; -using System.Reflection; -using PokemonGo.RocketBot.Window.Plugin; using System.Windows.Forms; #endregion @@ -30,4 +16,4 @@ namespace PokemonGo.RocketBot.Window Application.Run(new MainForm()); } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/Resources/ProgressBar.cs b/PokemonGo.RocketBot.Window/Resources/ProgressBar.cs index 945a225..7887a6a 100644 --- a/PokemonGo.RocketBot.Window/Resources/ProgressBar.cs +++ b/PokemonGo.RocketBot.Window/Resources/ProgressBar.cs @@ -1,12 +1,13 @@ #region using directives using System; +using System.IO; #endregion namespace PokemonGo.RocketBot.Window.Resources { - class ProgressBar + internal class ProgressBar { public static int total = 100; private static int leftOffset; @@ -17,7 +18,7 @@ namespace PokemonGo.RocketBot.Window.Resources Console.ForegroundColor = ConsoleColor.White; Console.Write(startText); - leftOffset = startText.Length+1; + leftOffset = startText.Length + 1; fill(startAmt); } @@ -38,17 +39,17 @@ namespace PokemonGo.RocketBot.Window.Resources Console.CursorLeft = 47 + leftOffset; Console.Write("]"); Console.CursorLeft = 1 + leftOffset; - float segment = 45.5f / total; + var segment = 45.5f/total; - int pos = 1 + leftOffset; - for (int i = 0; i < segment * amt; i++) + var pos = 1 + leftOffset; + for (var i = 0; i < segment*amt; i++) { Console.BackgroundColor = barColor; Console.CursorLeft = pos++; Console.Write(" "); } - for (int i = pos; i <= (46 + leftOffset - 2); i++) + for (var i = pos; i <= 46 + leftOffset - 2; i++) { Console.BackgroundColor = ConsoleColor.Black; Console.CursorLeft = pos++; @@ -58,12 +59,14 @@ namespace PokemonGo.RocketBot.Window.Resources Console.CursorLeft = 50 + leftOffset; Console.BackgroundColor = ConsoleColor.Black; Console.ForegroundColor = ConsoleColor.White; - Console.Write(amt.ToString() + "%"); + Console.Write(amt + "%"); if (amt == total) Console.Write(Environment.NewLine); } - catch (System.IO.IOException) { } + catch (IOException) + { + } } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/ActionCommands/EvolvePokemonHandler.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/ActionCommands/EvolvePokemonHandler.cs index 3eab35f..9117862 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/ActionCommands/EvolvePokemonHandler.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/ActionCommands/EvolvePokemonHandler.cs @@ -1,26 +1,22 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using SuperSocket.WebSocket; -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks; +using System.Threading.Tasks; using PokemonGo.RocketBot.Logic.State; +using PokemonGo.RocketBot.Logic.Tasks; +using SuperSocket.WebSocket; namespace PokemonGo.RocketBot.Window.WebSocketHandler.ActionCommands { public class EvolvePokemonHandler : IWebSocketRequestHandler { - public string Command { get; private set;} - public EvolvePokemonHandler() { Command = "EvolvePokemon"; } + public string Command { get; } + public async Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message) { - await Logic.Tasks.EvolveSpecificPokemonTask.Execute(session, (ulong)message.PokemonId); + await EvolveSpecificPokemonTask.Execute(session, (ulong) message.PokemonId); } } } \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/ActionCommands/TransferPokemonHandler.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/ActionCommands/TransferPokemonHandler.cs index 3772427..70ded15 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/ActionCommands/TransferPokemonHandler.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/ActionCommands/TransferPokemonHandler.cs @@ -1,26 +1,22 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using SuperSocket.WebSocket; -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks; +using System.Threading.Tasks; using PokemonGo.RocketBot.Logic.State; +using PokemonGo.RocketBot.Logic.Tasks; +using SuperSocket.WebSocket; namespace PokemonGo.RocketBot.Window.WebSocketHandler.ActionCommands { public class TransferPokemonHandler : IWebSocketRequestHandler { - public string Command { get; private set;} - public TransferPokemonHandler() { Command = "TransferPokemon"; } + public string Command { get; } + public async Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message) { - await Logic.Tasks.TransferPokemonTask.Execute(session, (ulong)message.PokemonId); + await TransferPokemonTask.Execute(session, (ulong) message.PokemonId); } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/EncodingHelper.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/EncodingHelper.cs index caebc8d..c9046e6 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/EncodingHelper.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/EncodingHelper.cs @@ -1,18 +1,14 @@ -using Newtonsoft.Json; +using System; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PokemonGo.RocketBot.Window.WebSocketHandler { - class EncodingHelper + internal class EncodingHelper { public static string Serialize(dynamic evt) { - var jsonSerializerSettings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All }; + var jsonSerializerSettings = new JsonSerializerSettings {TypeNameHandling = TypeNameHandling.All}; // Add custom seriaizer to convert uong to string (ulong shoud not appear to json according to json specs) jsonSerializerSettings.Converters.Add(new IdToStringConverter()); @@ -22,15 +18,16 @@ namespace PokemonGo.RocketBot.Window.WebSocketHandler public class IdToStringConverter : JsonConverter { - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, + JsonSerializer serializer) { - JToken jt = JValue.ReadFrom(reader); + var jt = JToken.ReadFrom(reader); return jt.Value<long>(); } public override bool CanConvert(Type objectType) { - return typeof(System.Int64).Equals(objectType) || typeof(ulong).Equals(objectType); + return typeof(long).Equals(objectType) || typeof(ulong).Equals(objectType); } public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) @@ -39,4 +36,4 @@ namespace PokemonGo.RocketBot.Window.WebSocketHandler } } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/EggListResponce.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/EggListResponce.cs index ed85f8f..da17f40 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/EggListResponce.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/EggListResponce.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events +namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events { public class EggListResponce : IWebSocketResponce { @@ -14,9 +8,9 @@ namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events Data = data; RequestID = requestID; } - public string RequestID { get; private set; } - public string Command { get; private set; } - public dynamic Data { get; private set; } - + + public string RequestID { get; } + public string Command { get; } + public dynamic Data { get; } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/ItemListResponce.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/ItemListResponce.cs index cc4de73..a0a3995 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/ItemListResponce.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/ItemListResponce.cs @@ -1,21 +1,16 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events +namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events { - class ItemListResponce : IWebSocketResponce + internal class ItemListResponce : IWebSocketResponce { - public ItemListResponce(dynamic data,string requestID) + public ItemListResponce(dynamic data, string requestID) { Command = "ItemListWeb"; Data = data; RequestID = requestID; } - public string RequestID { get; private set; } - public string Command { get; private set; } - public dynamic Data { get; private set; } + + public string RequestID { get; } + public string Command { get; } + public dynamic Data { get; } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/PokemonListResponce.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/PokemonListResponce.cs index 542c305..57c4e4f 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/PokemonListResponce.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/PokemonListResponce.cs @@ -1,9 +1,4 @@ using PokemonGo.RocketBot.Logic.Event; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events { @@ -15,8 +10,9 @@ namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events Data = data; RequestID = requestID; } - public string RequestID { get; private set; } - public string Command { get; private set; } - public dynamic Data { get; private set; } + + public string RequestID { get; } + public string Command { get; } + public dynamic Data { get; } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/TrainerProfileResponce.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/TrainerProfileResponce.cs index c461138..7491b16 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/TrainerProfileResponce.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/TrainerProfileResponce.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events +namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events { - class TrainerProfileResponce : IWebSocketResponce + internal class TrainerProfileResponce : IWebSocketResponce { public TrainerProfileResponce(dynamic data, string requestID) { @@ -14,8 +8,9 @@ namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events Data = data; RequestID = requestID; } - public string RequestID { get; private set; } - public string Command { get; private set; } - public dynamic Data { get; private set; } + + public string RequestID { get; } + public string Command { get; } + public dynamic Data { get; } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/WebResponce.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/WebResponce.cs index 8d9ba1e..6a26020 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/WebResponce.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Events/WebResponce.cs @@ -1,16 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events +namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events { public class WebResponce : IWebSocketResponce { public string RequestID { get; set; } public string Command { get; set; } public dynamic Data { get; set; } - } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetEggListHandler.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetEggListHandler.cs index ee61aed..1c7cd3f 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetEggListHandler.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetEggListHandler.cs @@ -1,26 +1,22 @@ -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks; +using System.Threading.Tasks; using PokemonGo.RocketBot.Logic.State; +using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks; using SuperSocket.WebSocket; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands { - class GetEggListHandler : IWebSocketRequestHandler + internal class GetEggListHandler : IWebSocketRequestHandler { - public string Command { get; private set; } - public GetEggListHandler() { Command = "GetEggList"; } + public string Command { get; } + public async Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message) { - await GetEggListTask.Execute(session, webSocketSession, (string)message.RequestID); + await GetEggListTask.Execute(session, webSocketSession, (string) message.RequestID); } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetItemsListHandler.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetItemsListHandler.cs index 9749b3c..bd6977c 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetItemsListHandler.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetItemsListHandler.cs @@ -1,27 +1,22 @@ -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks; +using System.Threading.Tasks; using PokemonGo.RocketBot.Logic.State; +using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks; using SuperSocket.WebSocket; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands { - class GetItemsListHandler : IWebSocketRequestHandler + internal class GetItemsListHandler : IWebSocketRequestHandler { - public string Command { get; private set; } - public GetItemsListHandler() { Command = "GetItemsList"; } + public string Command { get; } + public async Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message) { - await GetItemListTask.Execute(session, webSocketSession, (string)message.RequestID); + await GetItemListTask.Execute(session, webSocketSession, (string) message.RequestID); } - } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetPokemonListHandler.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetPokemonListHandler.cs index 9e120b1..16398fd 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetPokemonListHandler.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetPokemonListHandler.cs @@ -1,26 +1,22 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using SuperSocket.WebSocket; -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks; +using System.Threading.Tasks; using PokemonGo.RocketBot.Logic.State; +using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks; +using SuperSocket.WebSocket; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands { public class GetPokemonListHandler : IWebSocketRequestHandler { - public string Command { get; private set;} - public GetPokemonListHandler() { Command = "GetPokemonList"; } + public string Command { get; } + public async Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message) { - await GetPokemonListTask.Execute(session, webSocketSession, (string)message.RequestID); + await GetPokemonListTask.Execute(session, webSocketSession, (string) message.RequestID); } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetPokemonSettingsHandler.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetPokemonSettingsHandler.cs index 72f0059..46368e5 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetPokemonSettingsHandler.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetPokemonSettingsHandler.cs @@ -1,26 +1,22 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using SuperSocket.WebSocket; -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks; +using System.Threading.Tasks; using PokemonGo.RocketBot.Logic.State; +using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks; +using SuperSocket.WebSocket; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands { public class GetPokemonSettingsHandler : IWebSocketRequestHandler { - public string Command { get; private set;} - public GetPokemonSettingsHandler() { Command = "GetPokemonSettings"; } + public string Command { get; } + public async Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message) { - await GetPokemonSettingsTask.Execute(session, webSocketSession, (string)message.RequestID); + await GetPokemonSettingsTask.Execute(session, webSocketSession, (string) message.RequestID); } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetTrainerProfileHandler.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetTrainerProfileHandler.cs index 2e7210d..af7152c 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetTrainerProfileHandler.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/GetTrainerProfileHandler.cs @@ -1,27 +1,22 @@ -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks; +using System.Threading.Tasks; using PokemonGo.RocketBot.Logic.State; +using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks; using SuperSocket.WebSocket; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands { - class GetTrainerProfileHandler : IWebSocketRequestHandler + internal class GetTrainerProfileHandler : IWebSocketRequestHandler { - - public string Command { get; private set; } - public GetTrainerProfileHandler() { Command = "GetTrainerProfile"; } + public string Command { get; } + public async Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message) { - await GetTrainerProfileTask.Execute(session, webSocketSession, (string)message.RequestID); + await GetTrainerProfileTask.Execute(session, webSocketSession, (string) message.RequestID); } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Helpers/EggListWeb.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Helpers/EggListWeb.cs index 55493cf..1a037f7 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Helpers/EggListWeb.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Helpers/EggListWeb.cs @@ -1,15 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Helpers +namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Helpers { - class EggListWeb + internal class EggListWeb { public object Incubators { get; set; } public object UnusedEggs { get; set; } - } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Helpers/PokemonListWeb.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Helpers/PokemonListWeb.cs index cd047f7..a0a27f7 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Helpers/PokemonListWeb.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Helpers/PokemonListWeb.cs @@ -1,4 +1,5 @@ -using POGOProtos.Data; +using PokemonGo.RocketBot.Logic.PoGoUtils; +using POGOProtos.Data; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Helpers { @@ -13,14 +14,7 @@ namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Helpers public double IvPerfection { - get - { - return Logic.PoGoUtils.PokemonInfo.CalculatePokemonPerfection(Base); - } + get { return PokemonInfo.CalculatePokemonPerfection(Base); } } - } -} - - - +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Helpers/TrainerProfileWeb.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Helpers/TrainerProfileWeb.cs index 57270e2..42e72d9 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Helpers/TrainerProfileWeb.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Helpers/TrainerProfileWeb.cs @@ -1,14 +1,9 @@ using POGOProtos.Data; using POGOProtos.Data.Player; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Helpers { - class TrainerProfileWeb + internal class TrainerProfileWeb { public PlayerData Profile; public PlayerStats Stats; @@ -19,4 +14,4 @@ namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Helpers Stats = stats; } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetEggListTask.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetEggListTask.cs index 9cf036e..e06be03 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetEggListTask.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetEggListTask.cs @@ -1,19 +1,15 @@ -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events; -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Helpers; +using System.Linq; +using System.Threading.Tasks; using PokemonGo.RocketBot.Logic.State; +using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events; +using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Helpers; using POGOProtos.Inventory.Item; using SuperSocket.WebSocket; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks { - class GetEggListTask + internal class GetEggListTask { - public static async Task Execute(ISession session, WebSocketSession webSocketSession, string requestID) { var incubators = (await session.Inventory.GetEggIncubators()) @@ -26,13 +22,13 @@ namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks .OrderBy(x => x.EggKmWalkedTarget - x.EggKmWalkedStart) .ToList(); - - var list = new EggListWeb - { - Incubators = incubators, - UnusedEggs = unusedEggs - }; - webSocketSession.Send(EncodingHelper.Serialize(new EggListResponce(list,requestID))); + + var list = new EggListWeb + { + Incubators = incubators, + UnusedEggs = unusedEggs + }; + webSocketSession.Send(EncodingHelper.Serialize(new EggListResponce(list, requestID))); } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetItemListTask.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetItemListTask.cs index d9bdf3b..d053cdc 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetItemListTask.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetItemListTask.cs @@ -1,15 +1,11 @@ -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events; +using System.Threading.Tasks; using PokemonGo.RocketBot.Logic.State; +using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events; using SuperSocket.WebSocket; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks { - class GetItemListTask + internal class GetItemListTask { public static async Task Execute(ISession session, WebSocketSession webSocketSession, string requestID) { @@ -17,4 +13,4 @@ namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks webSocketSession.Send(EncodingHelper.Serialize(new ItemListResponce(allItems, requestID))); } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetPokemonListTask.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetPokemonListTask.cs index f183975..02fc7bc 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetPokemonListTask.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetPokemonListTask.cs @@ -1,25 +1,21 @@ -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events; -using PokemonGo.RocketBot.Logic.State; -using SuperSocket.WebSocket; -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; +using PokemonGo.RocketBot.Logic.State; +using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events; using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Helpers; +using SuperSocket.WebSocket; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks { - class GetPokemonListTask + internal class GetPokemonListTask { - public static async Task Execute(ISession session, WebSocketSession webSocketSession, string requestID) { var allPokemonInBag = await session.Inventory.GetHighestsCp(1000); var list = new List<PokemonListWeb>(); allPokemonInBag.ToList().ForEach(o => list.Add(new PokemonListWeb(o))); - webSocketSession.Send(EncodingHelper.Serialize(new PokemonListResponce(list,requestID))); + webSocketSession.Send(EncodingHelper.Serialize(new PokemonListResponce(list, requestID))); } - } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetPokemonSettingsTask.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetPokemonSettingsTask.cs index 10113e5..5c84b20 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetPokemonSettingsTask.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetPokemonSettingsTask.cs @@ -1,27 +1,21 @@ -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events; +using System.Threading.Tasks; using PokemonGo.RocketBot.Logic.State; +using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events; using SuperSocket.WebSocket; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks { - class GetPokemonSettingsTask + internal class GetPokemonSettingsTask { - public static async Task Execute(ISession session, WebSocketSession webSocketSession, string requestID) { var settings = await session.Inventory.GetPokemonSettings(); - webSocketSession.Send(EncodingHelper.Serialize(new WebResponce() + webSocketSession.Send(EncodingHelper.Serialize(new WebResponce { Command = "PokemonSettings", Data = settings, RequestID = requestID })); } - } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetTrainerProfileTask.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetTrainerProfileTask.cs index 4c2da76..2b47012 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetTrainerProfileTask.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/GetCommands/Tasks/GetTrainerProfileTask.cs @@ -1,16 +1,13 @@ -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events; -using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Helpers; +using System.Linq; +using System.Threading.Tasks; using PokemonGo.RocketBot.Logic.State; +using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Events; +using PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Helpers; using SuperSocket.WebSocket; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks { - class GetTrainerProfileTask + internal class GetTrainerProfileTask { public static async Task Execute(ISession session, WebSocketSession webSocketSession, string requestID) { @@ -21,4 +18,4 @@ namespace PokemonGo.RocketBot.Window.WebSocketHandler.GetCommands.Tasks webSocketSession.Send(EncodingHelper.Serialize(new TrainerProfileResponce(tmpData, requestID))); } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/IWebSocketRequestHandler.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/IWebSocketRequestHandler.cs index 02fd966..941c961 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/IWebSocketRequestHandler.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/IWebSocketRequestHandler.cs @@ -1,16 +1,12 @@ -using PokemonGo.RocketBot.Logic.State; +using System.Threading.Tasks; +using PokemonGo.RocketBot.Logic.State; using SuperSocket.WebSocket; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PokemonGo.RocketBot.Window.WebSocketHandler { - interface IWebSocketRequestHandler + internal interface IWebSocketRequestHandler { string Command { get; } Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message); } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/IWebSocketResponce.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/IWebSocketResponce.cs index 46677d2..0a8b301 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/IWebSocketResponce.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/IWebSocketResponce.cs @@ -1,15 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PokemonGo.RocketBot.Window.WebSocketHandler +namespace PokemonGo.RocketBot.Window.WebSocketHandler { - interface IWebSocketResponce + internal interface IWebSocketResponce { - string RequestID { get; } + string RequestID { get; } string Command { get; } dynamic Data { get; } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketHandler/WebSocketEventManager.cs b/PokemonGo.RocketBot.Window/WebSocketHandler/WebSocketEventManager.cs index 5d6c5eb..9ddbce9 100644 --- a/PokemonGo.RocketBot.Window/WebSocketHandler/WebSocketEventManager.cs +++ b/PokemonGo.RocketBot.Window/WebSocketHandler/WebSocketEventManager.cs @@ -1,43 +1,35 @@ -using SuperSocket.WebSocket; -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; -using PokemonGo.RocketBot.Logic.Tasks; -using System.Reflection; using PokemonGo.RocketBot.Logic.State; +using SuperSocket.WebSocket; namespace PokemonGo.RocketBot.Window.WebSocketHandler { - class WebSocketEventManager + internal class WebSocketEventManager { - Dictionary<string, IWebSocketRequestHandler> _registerdHandlers = new Dictionary<string, IWebSocketRequestHandler>(); - + private readonly Dictionary<string, IWebSocketRequestHandler> _registerdHandlers = + new Dictionary<string, IWebSocketRequestHandler>(); + public void RegisterHandler(string actionName, IWebSocketRequestHandler action) - { + { try { - _registerdHandlers.Add(actionName,action); + _registerdHandlers.Add(actionName, action); } catch { // ignore - } + } } public async Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message) { - if (_registerdHandlers.ContainsKey((string)message.Command)) + if (_registerdHandlers.ContainsKey((string) message.Command)) { - await _registerdHandlers[(string)message.Command].Handle(session, webSocketSession, message); + await _registerdHandlers[(string) message.Command].Handle(session, webSocketSession, message); } - else - { - // Unknown command. - } - - } // Registers all IWebSocketRequestHandler's automatically. @@ -51,13 +43,13 @@ namespace PokemonGo.RocketBot.Window.WebSocketHandler .SelectMany(s => s.GetTypes()) .Where(p => type.IsAssignableFrom(p) && p.IsClass); - foreach(var plugin in types) + foreach (var plugin in types) { - IWebSocketRequestHandler instance = (IWebSocketRequestHandler)Activator.CreateInstance(plugin); + var instance = (IWebSocketRequestHandler) Activator.CreateInstance(plugin); manager.RegisterHandler(instance.Command, instance); } return manager; } } -} +} \ No newline at end of file diff --git a/PokemonGo.RocketBot.Window/WebSocketInterface.cs b/PokemonGo.RocketBot.Window/WebSocketInterface.cs index 0aba8d1..ab0bbba 100644 --- a/PokemonGo.RocketBot.Window/WebSocketInterface.cs +++ b/PokemonGo.RocketBot.Window/WebSocketInterface.cs @@ -1,18 +1,18 @@ #region using directives +using System; +using System.Collections.Generic; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using PokemonGo.RocketBot.Window.WebSocketHandler; using PokemonGo.RocketBot.Logic.Common; using PokemonGo.RocketBot.Logic.Event; using PokemonGo.RocketBot.Logic.Logging; using PokemonGo.RocketBot.Logic.State; using PokemonGo.RocketBot.Logic.Tasks; +using PokemonGo.RocketBot.Window.WebSocketHandler; using SuperSocket.SocketBase; using SuperSocket.SocketBase.Config; using SuperSocket.WebSocket; -using System; -using System.Collections.Generic; #endregion @@ -24,7 +24,7 @@ namespace PokemonGo.RocketBot.Window private readonly Session _session; private PokeStopListEvent _lastPokeStopList; private ProfileEvent _lastProfile; - private WebSocketEventManager _websocketHandler; + private readonly WebSocketEventManager _websocketHandler; public WebSocketInterface(int port, Session session) { @@ -40,17 +40,21 @@ namespace PokemonGo.RocketBot.Window { FilePath = @"cert.pfx", Password = "necro" - }, + } }; config.Listeners = new List<ListenerConfig> { - new ListenerConfig() + new ListenerConfig { - Ip = "Any", Port = port, Security = "tls" + Ip = "Any", + Port = port, + Security = "tls" }, - new ListenerConfig() + new ListenerConfig { - Ip = "Any", Port = port + 1, Security = "none" + Ip = "Any", + Port = port + 1, + Security = "none" } }; @@ -95,7 +99,7 @@ namespace PokemonGo.RocketBot.Window private async void HandleMessage(WebSocketSession session, string message) { - switch(message) + switch (message) { case "PokemonList": await PokemonListTask.Execute(_session); @@ -132,13 +136,15 @@ namespace PokemonGo.RocketBot.Window try { - session.Send(Serialize(new UpdatePositionEvent() + session.Send(Serialize(new UpdatePositionEvent { Latitude = _session.Client.CurrentLatitude, Longitude = _session.Client.CurrentLongitude })); } - catch { } + catch + { + } } public void Listen(IEvent evt, Session session) @@ -159,7 +165,7 @@ namespace PokemonGo.RocketBot.Window private string Serialize(dynamic evt) { - var jsonSerializerSettings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All }; + var jsonSerializerSettings = new JsonSerializerSettings {TypeNameHandling = TypeNameHandling.All}; // Add custom seriaizer to convert uong to string (ulong shoud not appear to json according to json specs) jsonSerializerSettings.Converters.Add(new IdToStringConverter()); @@ -170,15 +176,16 @@ namespace PokemonGo.RocketBot.Window public class IdToStringConverter : JsonConverter { - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, + JsonSerializer serializer) { - JToken jt = JValue.ReadFrom(reader); + var jt = JToken.ReadFrom(reader); return jt.Value<long>(); } public override bool CanConvert(Type objectType) { - return typeof(System.Int64).Equals(objectType) || typeof(ulong).Equals(objectType); + return typeof(long).Equals(objectType) || typeof(ulong).Equals(objectType); } public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) diff --git a/PokemonGo.RocketBot.Window/packages.config b/PokemonGo.RocketBot.Window/packages.config index 51bda38..7fd6988 100644 --- a/PokemonGo.RocketBot.Window/packages.config +++ b/PokemonGo.RocketBot.Window/packages.config @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <packages> <package id="C5" version="2.4.5947.17249" targetFramework="net452" /> <package id="Costura.Fody" version="1.3.3.0" targetFramework="net45" developmentDependency="true" />