Skip to content

Commit

Permalink
Merged
Browse files Browse the repository at this point in the history
  • Loading branch information
grimmgringo committed Aug 9, 2016
2 parents fd3d3eb + e459802 commit 4b9f25d
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 41 deletions.
72 changes: 36 additions & 36 deletions PoGo.NecroBot.CLI/Config/Translations/translation.pt-br.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"TranslationStrings": [
{
"Key": "pokeball",
"Value": "PokeBall"
"Value": "Poké Bola Normal"
},
{
"Key": "greatPokeball",
"Value": "GreatBall"
"Value": "Poké Bola Great"
},
{
"Key": "ultraPokeball",
"Value": "UltraBall"
"Value": "Poké Bola Ultra"
},
{
"Key": "masterPokeball",
Expand All @@ -22,23 +22,23 @@
},
{
"Key": "loginInvalid",
"Value": "As credenciais de usuário estão inválidas, o login falhou."
"Value": "O Email e/ou A Senha esta(ao), o login falhou."
},
{
"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?"
},
{
"Key": "farmPokestopsNoUsableFound",
"Value": "Não foram encontradas PokeStops na sua área. Sua distância máxima de caminhada não está muito pequena?"
"Value": "Não foram encontradas PokeStops na sua área. Os Servidores (Google Login / PTC Login) Cairam?"
},
{
"Key": "eventFortUsed",
"Value": "Nome: {0} XP: {1}, Gemas: {2}, Itens: {3}, Lat: {4}, Long: {5}"
},
{
"Key": "eventFortFailed",
"Value": "Nome: {0} INFO: O saque falhou, possível softban. Desbanindo em: {1}/{2}"
"Value": "Nome: {0} INFO: O looting falhou, possível softban. Desbanindo em: {1}/{2}"
},
{
"Key": "eventFortTargeted",
Expand All @@ -54,7 +54,7 @@
},
{
"Key": "eventUsedLuckyEgg",
"Value": "Ovo da Sorte utilizado, restando: {0}"
"Value": "LuckyEgg utilizado, restando: {0}"
},
{
"Key": "eventPokemonEvolvedSuccess",
Expand All @@ -74,7 +74,7 @@
},
{
"Key": "eventPokemonCaptureSuccess",
"Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Chance: {7}% | {8}m dist | 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",
Expand Down Expand Up @@ -126,11 +126,11 @@
},
{
"Key": "commonWordPerfect",
"Value": "perfeito"
"Value": "Perfeito"
},
{
"Key": "commonWordName",
"Value": "nome"
"Value": "Nome"
},
{
"Key": "commonWordUnknown",
Expand All @@ -150,7 +150,7 @@
},
{
"Key": "welcomeWarning",
"Value": "Verifique se a Lat & Lng estão corretas. O bot irá fechar caso contrário! Lat: {0} Lng: {1}"
"Value": "Verifique se a Latitude & Longitude estão corretas. O bot irá fechar caso contrário! Lat: {0} Lng: {1}"
},
{
"Key": "incubatorPuttingEgg",
Expand Down Expand Up @@ -178,15 +178,15 @@
},
{
"Key": "logEntryPokestop",
"Value": "POKESTOP"
"Value": "POKÉSTOP"
},
{
"Key": "logEntryFarming",
"Value": "FARMANDO"
},
{
"Key": "logEntrySniper",
"Value": "SNIPER"
"Value": "CAPTURA"
},
{
"Key": "logEntryRecycling",
Expand Down Expand Up @@ -298,7 +298,7 @@
},
{
"Key": "lookingForLurePokemon",
"Value": "Procurando por atrator de pokémons..."
"Value": "Procurando por lure nos Pokéstops..."
},
{
"Key": "pokemonSkipped",
Expand Down Expand Up @@ -342,7 +342,7 @@
},
{
"Key": "invFullPokestopLooting",
"Value": "O inventório está cheio, nenhum item saqueado!"
"Value": "O inventário está cheio, nenhum item pego!"
},
{
"Key": "encounterProblem",
Expand All @@ -362,19 +362,19 @@
},
{
"Key": "pokemonFavorite",
"Value": "{0}% perfeito {1} (CP {2}) *favoritado*."
"Value": "{0}% Perfeito {1} (CP {2}) *Favoritado*."
},
{
"Key": "pokemonIgnoreFilter",
"Value": "[Filtro de pokémons ignorados] - Ignorando {0} como definido nas configurações"
},
{
"Key": "catchStatusAttempt",
"Value": "Tentativa de Captura"
"Value": "Tentando Capturar"
},
{
"Key": "catchStatusError",
"Value": "Erro de Captura"
"Value": "Captura Falha"
},
{
"Key": "catchStatusEscape",
Expand Down Expand Up @@ -418,7 +418,7 @@
},
{
"Key": "requireInputText",
"Value": "Pressione enter para dar início ao bot..."
"Value": "Pressione enter para iníciar o bot..."
},
{
"Key": "googleTwoFactorAuth",
Expand All @@ -438,27 +438,27 @@
},
{
"Key": "missingCredentialsGoogle",
"Value": "Você precisa informar o GoogleUsername e GooglePassword no arquivo auth.json!"
"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!"
"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",
"Value": "[Sniper] Verificando por Snipeable Pokémon em {0}..."
"Value": "[Captura] Verificando por Pokémon em {0}..."
},
{
"Key": "snipeScanEx",
"Value": "[Sniper] Mirando um {0} com {1} IV em {2}..."
"Value": "[Captura] Tentando Capturar um {0} com {1} IV em {2}..."
},
{
"Key": "noPokemonToSnipe",
"Value": "[Sniper] Nenhum Pokémon encontrado!"
"Value": "[Captura] Nenhum Pokémon encontrado!"
},
{
"Key": "notEnoughPokeballsToSnipe",
"Value": "Sem pokébolas suficientes para começar o sniping! ({0}/{1})"
"Value": "Sem pokébolas suficientes para começar a captura! ({0}/{1})"
},
{
"Key": "displayHighestMove1Header",
Expand Down Expand Up @@ -522,7 +522,7 @@
},
{
"Key": "snipeServerOffline",
"Value": "Servidor de Sniping está offline. Pulando..."
"Value": "Servidor de Captura está offline. Pulando..."
},
{
"Key": "firstStartPrompt",
Expand Down Expand Up @@ -624,15 +624,15 @@
"PokemonStrings": [
{
"Key": "bulbasaur",
"Value": "Bulbasaur"
"Value": "Bulbasauro"
},
{
"Key": "ivysaur",
"Value": "Ivysaur"
"Value": "Ivysauro"
},
{
"Key": "venusaur",
"Value": "Venusaur"
"Value": "Venusauro"
},
{
"Key": "charmander",
Expand Down Expand Up @@ -736,7 +736,7 @@
},
{
"Key": "nidoranFemale",
"Value": "NidoranF"
"Value": "NidoranFemea"
},
{
"Key": "nidorina",
Expand All @@ -748,7 +748,7 @@
},
{
"Key": "nidoranMale",
"Value": "NidoranM"
"Value": "NidoranMacho"
},
{
"Key": "nidorino",
Expand Down Expand Up @@ -1136,7 +1136,7 @@
},
{
"Key": "magikarp",
"Value": "Magikarp"
"Value": "Magikarpa"
},
{
"Key": "gyarados",
Expand Down Expand Up @@ -1234,11 +1234,11 @@
},
{
"Key": "thunderShock",
"Value": "ThunderShock"
"Value": "Choque Do Trovao"
},
{
"Key": "quickAttack",
"Value": "QuickAttack"
"Value": "Ataque Rapido"
},
{
"Key": "scratch",
Expand All @@ -1258,7 +1258,7 @@
},
{
"Key": "razorLeaf",
"Value": "RazorLeaf"
"Value": "Folha Navalha"
},
{
"Key": "takeDown",
Expand Down Expand Up @@ -1326,7 +1326,7 @@
},
{
"Key": "flamethrower",
"Value": "Flamethrower"
"Value": "Lança Chamas"
},
{
"Key": "suckerPunch",
Expand Down
8 changes: 8 additions & 0 deletions PoGo.NecroBot.CLI/Config/Translations/translation.zh_CN.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@
"Key": "logEntryNew",
"Value": "新"
},
{
"Key": "logEntrySoftBan",
"Value": "暂封"
},
{
"Key": "loggingIn",
"Value": "正在登录{0}账号\t\t"
Expand Down Expand Up @@ -640,6 +644,10 @@
"Key": "firstStartSetupDefaultLongConfirm",
"Value": "经度已设置: {0}\t\t"
},
{
"Key": "softBanBypassed",
"Value": "成功解封!"
},
{
"Key": "firstStartSetupCompleted",
"Value": "### 已完成设置 ###\t\t"
Expand Down
4 changes: 2 additions & 2 deletions PoGo.NecroBot.CLI/ConsoleEventListener.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ private static void HandleEvent(FortFailedEvent fortFailedEvent, ISession sessio
{
if (fortFailedEvent.Try != 1 && fortFailedEvent.Looted == false)
{
Logger.lineSelect(0, 1);
Logger.lineSelect(0, 1); // Replaces the last line to prevent spam.
}

if (fortFailedEvent.Looted == true)
{
Logger.Write(
session.Translation.GetTranslation(TranslationString.SoftBanBypassed),
LogLevel.SoftBan);
LogLevel.SoftBan, ConsoleColor.Green);
} else {
Logger.Write(
session.Translation.GetTranslation(TranslationString.EventFortFailed, fortFailedEvent.Name, fortFailedEvent.Try, fortFailedEvent.Max),
Expand Down
2 changes: 2 additions & 0 deletions PoGo.NecroBot.Logic/ILogicSettings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public interface ILogicSettings
bool UseKeepMinLvl { get; }
string KeepMinOperator { get; }
double WalkingSpeedInKilometerPerHour { get; }
bool FastSoftBanBypass { get; }
bool EvolveAllPokemonWithEnoughCandy { get; }
bool KeepPokemonsThatCanEvolve { get; }
bool TransferDuplicatePokemon { get; }
Expand Down Expand Up @@ -165,6 +166,7 @@ public interface ILogicSettings
bool SnipePokemonNotInPokedex { get; }
bool RandomizeRecycle { get; }
int RandomRecycleValue { get; }
bool DelayBetweenRecycleActions { get; }
int TotalAmountOfPokeballsToKeep { get; }
int TotalAmountOfPotionsToKeep { get; }
int TotalAmountOfRevivesToKeep { get; }
Expand Down
7 changes: 6 additions & 1 deletion PoGo.NecroBot.Logic/Settings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,9 @@ public class GlobalSettings
public double WalkingSpeedInKilometerPerHour;
[DefaultValue(10)]
public int MaxSpawnLocationOffset;
//softban related
[DefaultValue(false)]
public bool FastSoftBanBypass;
//delays
[DefaultValue(500)]
public int DelayBetweenPlayerActions;
Expand Down Expand Up @@ -489,7 +492,7 @@ public class GlobalSettings
new KeyValuePair<ItemId, int>(ItemId.ItemItemStorageUpgrade, 100)
};


public List<PokemonId> PokemonsNotToTransfer = new List<PokemonId>
{
//criteria: from SS Tier to A Tier + Regional Exclusive
Expand Down Expand Up @@ -1238,6 +1241,7 @@ public LogicSettings(GlobalSettings settings)
public float UpgradePokemonCpMinimum => _settings.UpgradePokemonCpMinimum;
public string UpgradePokemonMinimumStatsOperator => _settings.UpgradePokemonMinimumStatsOperator;
public double WalkingSpeedInKilometerPerHour => _settings.WalkingSpeedInKilometerPerHour;
public bool FastSoftBanBypass => _settings.FastSoftBanBypass;
public bool EvolveAllPokemonWithEnoughCandy => _settings.EvolveAllPokemonWithEnoughCandy;
public bool KeepPokemonsThatCanEvolve => _settings.KeepPokemonsThatCanEvolve;
public bool TransferDuplicatePokemon => _settings.TransferDuplicatePokemon;
Expand Down Expand Up @@ -1317,6 +1321,7 @@ public LogicSettings(GlobalSettings settings)
public bool SnipePokemonNotInPokedex => _settings.SnipePokemonNotInPokedex;
public bool RandomizeRecycle => _settings.RandomizeRecycle;
public int RandomRecycleValue => _settings.RandomRecycleValue;
public bool DelayBetweenRecycleActions => _settings.DelayBetweenRecycleActions;
public int TotalAmountOfPokeballsToKeep => _settings.TotalAmountOfPokeballsToKeep;
public int TotalAmountOfPotionsToKeep => _settings.TotalAmountOfPotionsToKeep;
public int TotalAmountOfRevivesToKeep => _settings.TotalAmountOfRevivesToKeep;
Expand Down
5 changes: 4 additions & 1 deletion PoGo.NecroBot.Logic/Tasks/FarmPokestopsTask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,10 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
Looted = false
});

DelayingUtils.Delay(session.LogicSettings.DelayBetweenPlayerActions, 0);
if (!session.LogicSettings.FastSoftBanBypass)
{
DelayingUtils.Delay(session.LogicSettings.DelayBetweenPlayerActions, 0);
}
}
}
else
Expand Down
4 changes: 4 additions & 0 deletions PoGo.NecroBot.Logic/Tasks/RecycleItemsTask.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ public static async Task Execute(ISession session, CancellationToken cancellatio

if (session.LogicSettings.VerboseRecycling)
session.EventDispatcher.Send(new ItemRecycledEvent { Id = item.ItemId, Count = item.Count });
if (session.LogicSettings.DelayBetweenRecycleActions)
DelayingUtils.Delay(session.LogicSettings.DelayBetweenPlayerActions, 500);
}

await session.Inventory.RefreshCachedInventory();
Expand All @@ -122,6 +124,8 @@ private static async Task RecycleItems(ISession session, CancellationToken cance
await session.Client.Inventory.RecycleItem(item, itemsToRecycle);
if (session.LogicSettings.VerboseRecycling)
session.EventDispatcher.Send(new ItemRecycledEvent { Id = item, Count = itemsToRecycle });
if (session.LogicSettings.DelayBetweenRecycleActions)
DelayingUtils.Delay(session.LogicSettings.DelayBetweenPlayerActions, 500);
}
}

Expand Down

0 comments on commit 4b9f25d

Please sign in to comment.