v1.2.0.1 changed disabled command

Jukkales · Apr 12, 2024 · ff288d3 · ff288d3
1 parent 2e15788
commit ff288d3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml
@@ -3,6 +3,8 @@ on:
   push:
     branches: 
       - 'main'
+    tags:
+        - 'v[0-9]+.[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
   build:
@@ -14,9 +16,10 @@ jobs:
             submodules: true
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3.0.3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.x.x'
+          cache: true
 
       - name: Restore
         run: dotnet restore

diff --git a/HoardFarm/HoardFarm.cs b/HoardFarm/HoardFarm.cs
@@ -110,7 +110,10 @@ public void OnCommand(string? args = null)
                 return;
             case "d":
             case "disable":
-                HoardService.HoardMode = false;
+                if (HoardService.HoardMode)
+                {
+                    HoardService.FinishRun = true;
+                }
                 return;
             case "t":
             case "toggle":

diff --git a/HoardFarm/HoardFarm.csproj b/HoardFarm/HoardFarm.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Authors>Jukkales</Authors>
-        <Version>1.2.0.0</Version>
+        <Version>1.2.0.1</Version>
         <Description>HoardFarm Dalamud Plugin</Description>
         <PackageProjectUrl>https://github.com/Jukkales/HoardFarm</PackageProjectUrl>
     </PropertyGroup>

diff --git a/HoardFarm/Service/HoardFarmService.cs b/HoardFarm/Service/HoardFarmService.cs
@@ -22,13 +22,13 @@ public class HoardFarmService : IDisposable
     public int SessionRuns;
     public int SessionFoundHoards;
     public int SessionTime;
+    public bool FinishRun;
 
     private bool hoardFound;
     private bool hoardAvailable;
     private bool intuitionUsed;
     private bool movingToHoard;
     private bool searchMode;
-    private bool finishRun;
     private Vector3 hoardPosition = Vector3.Zero;
     private readonly List<uint> chestIds = [];
     private readonly List<uint> visitedChestIds = [];
@@ -96,7 +96,7 @@ private void Reset()
         movingToHoard = false;
         hoardAvailable = false;
         searchMode = false;
-        finishRun = false;
+        FinishRun = false;
     }
 
     private unsafe bool SearchLogic()
@@ -156,9 +156,9 @@ private void OnTimerUpdate(object? sender, ElapsedEventArgs e)
 
         if (!TaskManager.IsBusy && hoardModeActive)
         {
-            if (CheckDone() && !finishRun)
+            if (CheckDone() && !FinishRun)
             {
-                finishRun = true;
+                FinishRun = true;
                 return;
             }
             if (!InHoH && !InRubySea && NotBusy() && !KyuseiInteractable())
@@ -169,7 +169,7 @@ private void OnTimerUpdate(object? sender, ElapsedEventArgs e)
 
             if (InRubySea && NotBusy() && KyuseiInteractable())
             {
-                if (finishRun)
+                if (FinishRun)
                 {
                     HoardModeStatus = "Finished";
                     HoardMode = false;