Skip to content

Commit 5ca74e0

Browse files
authored
Merge pull request #195 from Erol444/release/2.3.0
Release 2.3.0 - Change to numeric input instead of text input - Fix sleep problem - Fix wrong condition on auto NPC crop (thanks to @valenciaga1231) - Add auto NPC for normal resource - Add ignore Roman tribe's advantage (build 2 buildings instead of 3 for first village) If you like my work, you can donate to me through [ko-fi.com/vinaghost](https://ko-fi.com/vinaghost)
2 parents 9dc927e + 4fbbb62 commit 5ca74e0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+288
-147
lines changed

.github/workflows/hotfix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
uses: sarisia/actions-status-discord@v1
113113
with:
114114
webhook: ${{ secrets.DISCORD_BOT }}
115-
title: New hotfix
115+
title: New patch
116116
nodetail: true
117117
description: |
118118
Version `TBS-${{needs.version.outputs.version}}`

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,4 +376,6 @@ data/
376376

377377
Web/Client/
378378
Web/Server/
379-
Web/Shared/
379+
Web/Shared/
380+
/TBS.db-shm
381+
/TBS.db-wal

MainCore/AppDbContext.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,8 @@ public void AddVersionInfo()
507507
KeyValuePair.Create(202210061322,"NPCMigrations"),
508508
KeyValuePair.Create(202210162304,"TroopsMigrations"),
509509
KeyValuePair.Create(202210181120,"UpgradeTroopMigrations"),
510+
KeyValuePair.Create(202210271504,"NPCForWarhouse"),
511+
KeyValuePair.Create(2022102716038,"IgnoreRomanAdvantage"),
510512
};
511513
foreach (var migration in migrations)
512514
{

MainCore/Helper/BuildingsHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using MainCore.Enums;
22
using MainCore.Models.Runtime;
3-
using MainCore.Services;
3+
using MainCore.Services.Interface;
44
using System.Collections.Generic;
55
using System.Linq;
66

MainCore/Helper/CheckHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using HtmlAgilityPack;
22
using MainCore.Enums;
3-
using MainCore.Services;
43
using System.Linq;
4+
using MainCore.Services.Interface;
55

66
#if TRAVIAN_OFFICIAL
77

MainCore/Helper/ClickHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using HtmlAgilityPack;
2-
using MainCore.Services;
2+
using MainCore.Services.Interface;
33
using OpenQA.Selenium;
44
using System;
55

MainCore/Helper/HeroHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using HtmlAgilityPack;
22
using MainCore.Enums;
3-
using MainCore.Services;
3+
using MainCore.Services.Interface;
44
using OpenQA.Selenium;
55
using System;
66

MainCore/Helper/NavigateHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using MainCore.Services;
2-
using System;
1+
using System;
32
using OpenQA.Selenium;
43
using MainCore.Exceptions;
54
using System.Threading;
65
using System.Collections.ObjectModel;
6+
using MainCore.Services.Interface;
77

88
#if TRAVIAN_OFFICIAL
99

MainCore/Helper/UpdateHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using MainCore.Enums;
22
using MainCore.Models.Database;
3-
using MainCore.Services;
3+
using MainCore.Services.Interface;
44
using System;
55
using System.Collections.Generic;
66
using System.Linq;

MainCore/Helper/UpgradeBuildingHelper.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using MainCore.Enums;
22
using MainCore.Models.Database;
33
using MainCore.Models.Runtime;
4-
using MainCore.Services;
4+
using MainCore.Services.Interface;
55
using System;
66
using System.Collections.Generic;
77
using System.Linq;
@@ -27,17 +27,18 @@ public static PlanTask NextBuildingTask(AppDbContext context, IPlanManager planM
2727
var accountInfo = context.AccountsInfo.Find(accountId);
2828
var tribe = accountInfo.Tribe;
2929
var hasPlusAccount = accountInfo.HasPlusAccount;
30+
var setting = context.VillagesSettings.Find(villageId);
3031

3132
var maxBuild = 1;
3233
if (hasPlusAccount) maxBuild++;
33-
if (tribe == TribeEnums.Romans) maxBuild++;
34+
if (tribe == TribeEnums.Romans && !setting.IsIgnoreRomanAdvantage) maxBuild++;
3435
if (totalBuild == maxBuild)
3536
{
3637
logManager.Information(accountId, "Amount of currently building is equal with maximum building can build in same time");
3738
return null;
3839
}
3940

40-
if (tribe == TribeEnums.Romans && maxBuild - totalBuild == 1)
41+
if (tribe == TribeEnums.Romans && !setting.IsIgnoreRomanAdvantage && maxBuild - totalBuild == 1)
4142
{
4243
var numRes = currentList.Count(x => x.Type.IsResourceField());
4344
var numInfra = totalBuild - numRes;

0 commit comments

Comments
 (0)