Skip to content

Commit 8b0846e

Browse files
committed
add switch village to Task.Sim
1 parent 4f2cca7 commit 8b0846e

File tree

6 files changed

+45
-0
lines changed

6 files changed

+45
-0
lines changed

TbsCore/Tasks/Sim/DemolishBuilding.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ public class DemolishBuilding : BotTask
1313
{
1414
public override async Task<TaskRes> Execute(Account acc)
1515
{
16+
StopFlag = false;
17+
{
18+
acc.Logger.Information($"Checking current village ...");
19+
var result = await NavigationHelper.SwitchVillage(acc, Vill);
20+
if (StopFlag) return TaskRes.Executed;
21+
if (!result) return TaskRes.Executed;
22+
}
1623
// First navigate to dorf2 and then to the main building, to make sure the currently demolish list is refreshed
1724
if (!await NavigationHelper.EnterBuilding(acc, Vill, Classificator.BuildingEnum.MainBuilding))
1825
return TaskRes.Executed;

TbsCore/Tasks/Sim/ExtendProtection.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Threading.Tasks;
2+
using TbsCore.Helpers;
23
using TbsCore.Models.AccModels;
34

45
namespace TbsCore.Tasks.Sim
@@ -10,6 +11,14 @@ public class ExtendProtection : BotTask
1011
{
1112
public override async Task<TaskRes> Execute(Account acc)
1213
{
14+
StopFlag = false;
15+
{
16+
acc.Logger.Information($"Checking current village ...");
17+
var result = await NavigationHelper.SwitchVillage(acc, Vill);
18+
if (StopFlag) return TaskRes.Executed;
19+
if (!result) return TaskRes.Executed;
20+
}
21+
1322
await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/options/game?extendBeginnersProtection");
1423
return TaskRes.Executed;
1524
}

TbsCore/Tasks/Sim/InstaUpgrade.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ public class InstaUpgrade : BotTask
1313
{
1414
public override async Task<TaskRes> Execute(Account acc)
1515
{
16+
StopFlag = false;
17+
{
18+
acc.Logger.Information($"Checking current village ...");
19+
var result = await NavigationHelper.SwitchVillage(acc, Vill);
20+
if (StopFlag) return TaskRes.Executed;
21+
if (!result) return TaskRes.Executed;
22+
}
23+
1624
await NavigationHelper.ToDorf1(acc);
1725

1826
var finishClass = acc.Wb.Html.DocumentNode

TbsCore/Tasks/Sim/NPC.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ public class NPC : BotTask
1212
{
1313
public override async Task<TaskRes> Execute(Account acc)
1414
{
15+
StopFlag = false;
16+
{
17+
acc.Logger.Information($"Checking current village ...");
18+
var result = await NavigationHelper.SwitchVillage(acc, Vill);
19+
if (StopFlag) return TaskRes.Executed;
20+
if (!result) return TaskRes.Executed;
21+
}
22+
1523
if (!await NavigationHelper.ToMarketplace(acc, Vill, NavigationHelper.MarketplaceTab.Managenment))
1624
return TaskRes.Executed;
1725

TbsCore/Tasks/Sim/SendSettlers.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ public class SendSettlers : BotTask
1111
{
1212
public override async Task<TaskRes> Execute(Account acc)
1313
{
14+
StopFlag = false;
15+
{
16+
acc.Logger.Information($"Checking current village ...");
17+
var result = await NavigationHelper.SwitchVillage(acc, Vill);
18+
if (StopFlag) return TaskRes.Executed;
19+
if (!result) return TaskRes.Executed;
20+
}
21+
1422
// Check if the account has enough culture points
1523
if (acc.AccInfo.CulturePoints.MaxVillages <= acc.AccInfo.CulturePoints.VillageCount)
1624
{

TbsCore/Tasks/Sim/TrainSettlers.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,11 @@ private async Task<bool> BuildingRequired(Account acc)
161161

162162
private async Task<bool> EnterBuilding(Account acc)
163163
{
164+
{
165+
acc.Logger.Information($"Checking current village ...");
166+
var result = await NavigationHelper.SwitchVillage(acc, Vill);
167+
if (!result) return false;
168+
}
164169
return await NavigationHelper.ToGovernmentBuilding(acc, Vill, NavigationHelper.ResidenceTab.Train);
165170
}
166171

0 commit comments

Comments
 (0)