Merge pull request #108 from Erol444/develop

Release 27/04/2022

Author: Erol444

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
       - name: setup-msbuild
         uses: microsoft/setup-msbuild@v1     
@@ -46,7 +46,7 @@ jobs:
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v2
         with:
-          name: TBS-Build
+          name: TBS-Build-${{ github.sha }}
           path: TravBotSharp\bin\Release
           if-no-files-found: error
 

.github/workflows/pre-release.yml

@@ -2,8 +2,8 @@ name: PreReleaseFlow
 
 on:
   pull_request:
-    branches: develop
-    types: closed
+    branches: [develop]
+    types: [closed]
   workflow_dispatch:
 
 jobs:
@@ -38,14 +38,14 @@ jobs:
       - name: 'Create changelog'
         id: Changelog
         run: |
-          changelog=$(git log --no-merges --pretty=format:'- %s' ${{ steps.previoustag.outputs.tag }}..HEAD --reverse)
+          changelog="${{github.event.pull_request.body}}"
           changelog="${changelog//'%'/'%25'}"
           changelog="${changelog//$'\n'/'%0A'}"
           changelog="${changelog//$'\r'/'%0D'}"
           echo "::set-output name=changelog::$changelog"
 
   build:
-    runs-on: windows-latest
+    runs-on: windows-2019
     needs: version
     steps:
       - name: setup-msbuild
@@ -90,18 +90,16 @@ jobs:
   prerelease:
     runs-on: ubuntu-latest
     needs: [build, version]
-    steps:    
-        
+    steps:        
       - name: Download artifact
         uses: actions/download-artifact@master
         with:
           name: TBS-prerelease
-          path: TravBotSharp/bin/Release
-      
+          path: TBS-${{needs.version.outputs.version}}
       - name: Archive pre release
         uses: montudor/action-zip@v1
         with:
-            args: zip -qq -r TBS-${{needs.version.outputs.version}}.zip TravBotSharp/bin/Release
+            args: zip -r TBS-${{needs.version.outputs.version}}.zip TBS-${{needs.version.outputs.version}}
 
       - name: Create pre release
         uses: ncipollo/release-action@v1

.github/workflows/release.yml

@@ -2,8 +2,8 @@ name: ReleaseFlow
 
 on:
   pull_request:
-    branches: master
-    types: closed
+    branches: [master]
+    types: [closed]
   workflow_dispatch:
 
 jobs:
@@ -18,7 +18,7 @@ jobs:
         with:
           one_of: release
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-      
+          
       - name: 'Checkout repo' 
         uses: actions/checkout@v2    
 
@@ -40,14 +40,13 @@ jobs:
       - name: 'Create changelog'
         id: Changelog
         run: |
-          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 --reverse)
+          changelog="${{github.event.pull_request.body}}"
           changelog="${changelog//'%'/'%25'}"
           changelog="${changelog//$'\n'/'%0A'}"
           changelog="${changelog//$'\r'/'%0D'}"
           echo "::set-output name=changelog::$changelog"
   build:
-    runs-on: windows-latest
+    runs-on: windows-2019
     needs: version
     steps:
       - name: setup-msbuild
@@ -99,12 +98,12 @@ jobs:
         uses: actions/download-artifact@master
         with:
           name: TBS-release
-          path: TravBotSharp/bin/Release
+          path: TBS-${{needs.version.outputs.version}}
 
       - name: Archive Release
         uses: montudor/action-zip@v1
         with:
-            args: zip -qq -r TBS-${{needs.version.outputs.version}}.zip TravBotSharp/bin/Release
+            args: zip -qq -r TBS-${{needs.version.outputs.version}}.zip TBS-${{needs.version.outputs.version}}
 
 
       - name: Create release

TbsCore/Assets/ChromeExtension/DisableWebRTCLeak.crx

@@ -228,7 +228,7 @@ public static List<Action> GetPostLoadTasks(Account acc)
                     // Update adventures
                     if(homeVill == null)
                     {
-                        acc.Tasks.Add( new HeroUpdateInfo() { ExecuteAt = DateTime.Now });
+                        acc.Tasks.Add( new HeroUpdateInfo() { ExecuteAt = DateTime.Now }, true);
                     }
                     else if (heroReady &&
                         (homeVill.Build.Buildings.Any(x => x.Type == Classificator.BuildingEnum.RallyPoint && 0 < x.Level)) &&
@@ -289,12 +289,12 @@ private static void AutoExpandStorage(Account acc, Village vill)
                 warehouse_delta <= vill.Res.Stored.Resources.Clay ||
                 warehouse_delta <= vill.Res.Stored.Resources.Iron)
             {
-                BuildingHelper.UpgradeBuildingForOneLvl(acc, vill, Classificator.BuildingEnum.Warehouse, false);
+                UpgradeBuildingHelper.UpgradeBuildingForOneLvl(acc, vill, Classificator.BuildingEnum.Warehouse, false);
                 return;
             }
 
             if (granary_delta <= vill.Res.Stored.Resources.Crop)
-                BuildingHelper.UpgradeBuildingForOneLvl(acc, vill, Classificator.BuildingEnum.Granary, false);
+                UpgradeBuildingHelper.UpgradeBuildingForOneLvl(acc, vill, Classificator.BuildingEnum.Granary, false);
         }
 
         private static void DonateToAlly(Account acc, Village vill)