Merge pull request #51 from Erol444/hotfix_1.300.0

Hotfix 1.300.0

Author: Erol444

.github/workflows/release.yml

@@ -39,7 +39,7 @@ jobs:
         run: |
           git branch --show-current
           last=$(git log --merges --grep='develop' --first-parent master --pretty=format:"%h" | sed -n '2p')
-          changelog=$(git log --no-merges --pretty=format:'- %s' $last..HEAD)
+          changelog=$(git log --no-merges --pretty=format:'- %s' $last..HEAD --reverse)
           changelog="${changelog//'%'/'%25'}"
           changelog="${changelog//$'\n'/'%0A'}"
           changelog="${changelog//$'\r'/'%0D'}"
@@ -130,7 +130,7 @@ jobs:
           nodetail: retrue
           description: |
               Version `TBS-${{needs.version.outputs.version}}`
-              Click [here](https://github.com/Erol444/TravianBotSharp/releases/tag/${{steps.tag.outputs.tag}}) to download!
+              Click [here](https://github.com/Erol444/TravianBotSharp/releases/tag/${{needs.version.outputs.version}}) to download!
               **Changelog**:
               ${{needs.version.outputs.changelog}}
   Clear:

TbsCore/Helpers/AccountHelper.cs

@@ -53,7 +53,7 @@ public static int Delay(Account acc)
         {
             //Return random delay
             Random rnd = new Random();
-            return acc.Settings.DelayClicking + rnd.Next(-500, 500);
+            return rnd.Next(acc.Settings.DelayClickingMin, acc.Settings.DelayClickingMax);
         }
 
         public static void StartAccountTasks(Account acc)

TbsCore/Models/Settings/GeneralSettings.cs

@@ -26,7 +26,8 @@ public void Init()
             DonateAbove = 95;
             DonateExcessOf = 65;
             DiscordWebhook = false;
-            DelayClicking = 3000;
+            DelayClickingMin = 2500;
+            DelayClickingMax = 3800;
         }
 
         public bool AutoActivateProductionBoost { get; set; }
@@ -134,9 +135,14 @@ public void Init()
         public bool DiscordOnlineAnnouncement { get; set; }
 
         /// <summary>
-        /// How long should bot click between 2 click ( bot will +- 500ms for random )
+        /// Minimum time between 2 click
         /// </summary>
-        public int DelayClicking { get; set; }
+        public int DelayClickingMin { get; set; }
+
+        /// <summary>
+        /// Maximum time between 2 click
+        /// </summary>
+        public int DelayClickingMax { get; set; }
     }
 
     /// <summary>

TravBotSharp/ControlPanel.Designer.cs

@@ -258,7 +258,7 @@ private void button6_Click(object sender, EventArgs e) // Login all accounts
                     if (acc.TaskTimer?.IsBotRunning() ?? false) continue;
 
                     _ = IoHelperCore.LoginAccount(acc);
-                    await Task.Delay(ran.Next(500, 5000));
+                    await Task.Delay(AccountHelper.Delay(acc));
                 }
             }).Start();
             generalUc1.UpdateBotRunning("true");

TravBotSharp/ControlPanel.cs

@@ -11,10 +11,12 @@ namespace TravBotSharp.Views
     public partial class DebugUc : TbsBaseUc, ITbsUc
     {
         public LogOutput Log;
+        public bool active;
 
         public DebugUc()
         {
             InitializeComponent();
+            active = false;
         }
 
         public void InitLog(LogOutput log)
@@ -25,13 +27,20 @@ public void InitLog(LogOutput log)
 
         public void UpdateUc()
         {
+            active = true;
             UpdateTaskTable();
             GetLogData();
             this.Focus();
         }
 
+        public void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            active = false;
+        }
+
         private void LogUpdate(object sender, UpdateLogEventArgs e)
         {
+            if (!active) return;
             // only update current account
             if (e.Username == GetSelectedAcc().AccInfo.Nickname)
             {
@@ -41,6 +50,8 @@ private void LogUpdate(object sender, UpdateLogEventArgs e)
 
         public void GetLogData()
         {
+            if (!active) return;
+
             if (logTextBox.InvokeRequired)
             {
                 logTextBox.BeginInvoke(new Action(delegate
@@ -56,6 +67,7 @@ public void GetLogData()
 
         public void UpdateLogData()
         {
+            if (!active) return;
             if (logTextBox.InvokeRequired)
             {
                 logTextBox.BeginInvoke(new Action(delegate
@@ -65,11 +77,12 @@ public void UpdateLogData()
                 return;
             }
             var acc = GetSelectedAcc();
-            logTextBox.Text = $"{Log.GetLog(acc.AccInfo.Nickname)}{logTextBox.Text}";
+            logTextBox.Text = $"{Log.GetLastLog(acc.AccInfo.Nickname)}{logTextBox.Text}";
         }
 
         public void UpdateTaskTable()
         {
+            if (!active) return;
             if (taskListView.InvokeRequired)
             {
                 taskListView.BeginInvoke(new Action(delegate

TravBotSharp/Views/DebugUc.cs

@@ -64,7 +64,8 @@ public void UpdateUc()
             UpdaterBonusPrio(acc);
             UpdaterResPrio(acc);
 
-            clickDelayUpDown.Value = acc.Settings.DelayClicking;
+            clickDelayMin.Value = acc.Settings.DelayClickingMin > 0 ? acc.Settings.DelayClickingMin : 2500;
+            clickDelayMax.Value = acc.Settings.DelayClickingMax > 0 ? acc.Settings.DelayClickingMax : 3800;
         }
 
         private void SupplyResourcesButton_Click(object sender, EventArgs e) //select village to supply res to new villages
@@ -417,7 +418,12 @@ private void button12_Click(object sender, EventArgs e)
 
         private void clickDelayUpDown_ValueChanged(object sender, EventArgs e)
         {
-            GetSelectedAcc().Settings.DelayClicking = (int)clickDelayUpDown.Value;
+            GetSelectedAcc().Settings.DelayClickingMin = (int)clickDelayMin.Value;
+        }
+
+        private void clickDelayMax_ValueChanged(object sender, EventArgs e)
+        {
+            GetSelectedAcc().Settings.DelayClickingMax = (int)clickDelayMax.Value;
         }
 
         private void UpdaterResPrio(Account acc)