sparrows blood shenanigans

BrenoHenrike · Feb 14, 2025 · b7ceca6 · b7ceca6
1 parent 47b5ef9
commit b7ceca6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/CoreDailies.cs b/CoreDailies.cs
@@ -83,15 +83,17 @@ public void DailyRoutine(int quest, string map, string monster, string item, int
     /// </param>
     /// <param name="items">The list of item names to verify or add to the drop list.</param>
     /// <returns>
-    /// True if the quest is incomplete and relevant items are added to the drop list; 
-    /// false if the quest is already complete or all items are at max stack (when <paramref name="any"/> is true).
+    /// True (dont use !) if the quest is incomplete and relevant items are added to the drop list;<br/>
+    /// false (use !) if the quest is already complete or all items are at max stack (when <paramref name="any"/> is true).
     /// </returns>
+
     public bool CheckDailyv2(int quest, bool any = true, bool shouldUnBank = true, params string[] items)
     {
+        Quest Quest = Core.InitializeWithRetries(() => Core.EnsureLoad(quest));
         // Check if the daily quest is complete
         if (Bot.Quests.IsDailyComplete(quest))
         {
-            Core.Logger("Daily/Weekly/Monthly quest not available right now");
+            Core.Logger($"Daily/Weekly/Monthly \"{Quest.Name} [{Quest.ID}]\" is not available right now");
             return false;
         }
 
@@ -566,18 +568,27 @@ public void EldersBlood()
         Bot.Wait.ForPickup("Elders' Blood");
     }
 
-    public void SparrowsBlood()
+    public void SparrowsBlood(int quant = 3)
     {
-        Core.Logger("Daily: Sparrow's Blood");
-        if (!CheckDailyv2(803, true, true, "Sparrow's Blood") || Core.CheckInventory("Sparrow's Blood", 3))
+        if (!CheckDailyv2(803, false, true, "Sparrow's Blood"))
+            return;
+
+        if (Core.CheckInventory("Sparrow's Blood", quant))
+        {
+            Core.Logger($"You already have enough Sparrow's Blood ({Bot.Inventory.GetQuantity("Sparrow's Blood")}/{quant}). Skipped");
             return;
-        Core.AddDrop("Sparrow's Blood");
+        }
+
+        Core.Logger("Daily: Sparrow's Blood");
+
+        Core.AddDrop(5584);
         Core.EquipClass(ClassType.Farm);
         Core.EnsureAccept(803);
         Core.KillMonster("arcangrove", "LeftBack", "Left", "*", "Blood Lily", 30);
         Core.KillMonster("arcangrove", "RightBack", "Left", "*", "Snapdrake", 17);
         Core.KillMonster("arcangrove", "Back", "Left", "*", "DOOM Dirt", 12);
         Core.EnsureComplete(803);
+        Bot.Wait.ForDrop("Sparrow's Blood");
         Bot.Wait.ForPickup("Sparrow's Blood");
     }
 

diff --git a/Nation/AssistingCragAndBamboozle[Mem].cs b/Nation/AssistingCragAndBamboozle[Mem].cs
@@ -62,7 +62,7 @@ public void ScriptMain(IScriptInterface bot)
 
         if (Item != null)
         {
-            Core.AddDrop("Nulgath Larvae",
+            Core.AddDrop("Nulgath Larvae", "Sparrow's Blood",
                          "Sword of Nulgath", "Gem of Nulgath", "Tainted Gem", "Dark Crystal Shard", "Diamond of Nulgath",
                          "Totem of Nulgath", "Blood Gem of the Archfiend", "Unidentified 19", "Elders' Blood", "Voucher of Nulgath", "Voucher of Nulgath (non-mem)");
 
@@ -79,7 +79,9 @@ public void ScriptMain(IScriptInterface bot)
             if (!Core.CheckInventory("Tendurrr The Assistant"))
                 Core.KillMonster("tercessuinotlim", "m2", "Left", "*", "Tendurrr The Assistant", isTemp: false);
 
-            Daily.SparrowsBlood();
+            Daily.SparrowsBlood(1);
+
+            // ReCheck Sparrow's Blood
             if (!Core.CheckInventory("Sparrow's Blood"))
                 Core.Logger("This bot requires you to have at least 1 Sparrow's Blood", stopBot: true);
 

diff --git a/Story/QueenofMonsters/Extra/BrightOak.cs b/Story/QueenofMonsters/Extra/BrightOak.cs
@@ -339,8 +339,7 @@ void QuestLogic()
                     break;
 
                 case 4806: // Outside Assistance [Lapis Token II]
-                    if (!Core.CheckInventory("Sparrow's Blood"))
-                        Daily.SparrowsBlood();
+                    Daily.SparrowsBlood(1);
                     Bot.Wait.ForPickup("Lapis Token II");
                     break;