Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Added TransferLowStatPokemon" #475

Merged
merged 1 commit into from
Aug 3, 2016
Merged

Revert "Added TransferLowStatPokemon" #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions PoGo.PokeMobBot.Logic/ILogicSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,7 @@ public interface ILogicSettings

//transfer
bool TransferDuplicatePokemon { get; }
bool TransferLowStatPokemon { get; }
bool PrioritizeIvOverCp { get; }
bool PrioritizeIvAndCp { get; }
int KeepMinCp { get; }
float KeepMinIvPercentage { get; }
int KeepMinDuplicatePokemon { get; }
Expand Down
1 change: 0 additions & 1 deletion PoGo.PokeMobBot.Logic/PoGo.PokeMobBot.Logic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@
<Compile Include="Event\UseLuckyEggEvent.cs" />
<Compile Include="State\VersionCheckState.cs" />
<Compile Include="Event\WarnEvent.cs" />
<Compile Include="Tasks\TransferLowStatPokemon.cs" />
<Compile Include="Tasks\TransferPokemonTask.cs" />
<Compile Include="Tasks\UseIncubatorsTask.cs" />
<Compile Include="Tasks\UseNearbyPokestopsTask.cs" />
Expand Down
4 changes: 0 additions & 4 deletions PoGo.PokeMobBot.Logic/Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,7 @@ public class GlobalSettings

//transfer
public bool TransferDuplicatePokemon = true;
public bool TransferLowStatPokemon = false;
public bool PrioritizeIvOverCp = true;
public bool PrioritizeIvAndCp = false;
public int KeepMinCp = 1250;
public float KeepMinIvPercentage = 95;
public int KeepMinDuplicatePokemon = 1;
Expand Down Expand Up @@ -651,7 +649,6 @@ public LogicSettings(GlobalSettings settings)
public bool EvolveAllPokemonWithEnoughCandy => _settings.EvolveAllPokemonWithEnoughCandy;
public bool KeepPokemonsThatCanEvolve => _settings.KeepPokemonsThatCanEvolve;
public bool TransferDuplicatePokemon => _settings.TransferDuplicatePokemon;
public bool TransferLowStatPokemon => _settings.TransferLowStatPokemon;
public bool UseEggIncubators => _settings.UseEggIncubators;
public int UseGreatBallAboveIv => _settings.UseGreatBallAboveIv;
public int UseUltraBallAboveIv => _settings.UseUltraBallAboveIv;
Expand All @@ -662,7 +659,6 @@ public LogicSettings(GlobalSettings settings)
public bool UsePokemonToNotCatchFilter => _settings.UsePokemonToNotCatchFilter;
public int KeepMinDuplicatePokemon => _settings.KeepMinDuplicatePokemon;
public bool PrioritizeIvOverCp => _settings.PrioritizeIvOverCp;
public bool PrioritizeIvAndCp => _settings.PrioritizeIvAndCp;
public int MaxTravelDistanceInMeters => _settings.MaxTravelDistanceInMeters;
public string GpxFile => _settings.GpxFile;
public bool UseGpxPathing => _settings.UseGpxPathing;
Expand Down
4 changes: 0 additions & 4 deletions PoGo.PokeMobBot.Logic/State/FarmState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ public async Task<IState> Execute(ISession session, CancellationToken cancellati
{
await TransferDuplicatePokemonTask.Execute(session, cancellationToken);
}
if (session.LogicSettings.TransferLowStatPokemon)
{
await TransferLowStatPokemonTask.Execute(session, cancellationToken);
}
if (session.LogicSettings.AutomaticallyLevelUpPokemon)
{
await LevelUpPokemonTask.Execute(session, cancellationToken);
Expand Down
8 changes: 0 additions & 8 deletions PoGo.PokeMobBot.Logic/Tasks/CatchIncensePokemonsTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,6 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
});
await TransferDuplicatePokemonTask.Execute(session, cancellationToken);
}
if (session.LogicSettings.TransferLowStatPokemon)
{
session.EventDispatcher.Send(new WarnEvent
{
Message = session.Translation.GetTranslation(TranslationString.InvFullTransferring)
});
await TransferLowStatPokemonTask.Execute(session, cancellationToken);
}
else
session.EventDispatcher.Send(new WarnEvent
{
Expand Down
8 changes: 0 additions & 8 deletions PoGo.PokeMobBot.Logic/Tasks/CatchLurePokemonsTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,6 @@ public static async Task Execute(ISession session, FortData currentFortData, Can
});
await TransferDuplicatePokemonTask.Execute(session, cancellationToken);
}
if (session.LogicSettings.TransferLowStatPokemon)
{
session.EventDispatcher.Send(new WarnEvent
{
Message = session.Translation.GetTranslation(TranslationString.InvFullTransferring)
});
await TransferLowStatPokemonTask.Execute(session, cancellationToken);
}
else
session.EventDispatcher.Send(new WarnEvent
{
Expand Down
8 changes: 0 additions & 8 deletions PoGo.PokeMobBot.Logic/Tasks/CatchNearbyPokemonsTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,6 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
});
await TransferDuplicatePokemonTask.Execute(session, cancellationToken);
}
if (session.LogicSettings.TransferLowStatPokemon)
{
session.EventDispatcher.Send(new WarnEvent
{
Message = session.Translation.GetTranslation(TranslationString.InvFullTransferring)
});
await TransferLowStatPokemonTask.Execute(session, cancellationToken);
}
else
session.EventDispatcher.Send(new WarnEvent
{
Expand Down
4 changes: 0 additions & 4 deletions PoGo.PokeMobBot.Logic/Tasks/Farm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ public void Run(CancellationToken cancellationToken)
{
TransferDuplicatePokemonTask.Execute(_session, cancellationToken).Wait(cancellationToken);
}
if (_session.LogicSettings.TransferLowStatPokemon)
{
TransferLowStatPokemonTask.Execute(_session, cancellationToken).Wait(cancellationToken);
}

if (_session.LogicSettings.RenamePokemon)
{
Expand Down
4 changes: 0 additions & 4 deletions PoGo.PokeMobBot.Logic/Tasks/FarmPokestopsGPXTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,6 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
{
await TransferDuplicatePokemonTask.Execute(session, cancellationToken);
}
if (session.LogicSettings.TransferLowStatPokemon)
{
await TransferLowStatPokemonTask.Execute(session, cancellationToken);
}

if (session.LogicSettings.RenamePokemon)
{
Expand Down
4 changes: 0 additions & 4 deletions PoGo.PokeMobBot.Logic/Tasks/FarmPokestopsTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,10 +412,6 @@ await session.Navigation.HumanLikeWalking(new GeoCoordinate(pokeStop.Latitude, p
{
await TransferDuplicatePokemonTask.Execute(session, cancellationToken);
}
if (session.LogicSettings.TransferLowStatPokemon)
{
await TransferLowStatPokemonTask.Execute(session, cancellationToken);
}
if (session.LogicSettings.RenamePokemon)
{
await RenamePokemonTask.Execute(session, cancellationToken);
Expand Down
93 changes: 0 additions & 93 deletions PoGo.PokeMobBot.Logic/Tasks/TransferLowStatPokemon.cs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions PoGo.PokeMobBot.Logic/Tasks/UseNearbyPokestopsTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
{
await TransferDuplicatePokemonTask.Execute(session, cancellationToken);
}
if (session.LogicSettings.TransferLowStatPokemon)
{
await TransferLowStatPokemonTask.Execute(session, cancellationToken);
}
}
}

Expand Down