Merge branch 'Skua' of https://github.com/auqw/Scripts into Skua

wtffidy · wtffidy · commit e6d84073fe60 · 2026-02-23T09:46:05.000-05:00
diff --git a/Seasonal/AkibaNewYear/YearoftheHorseBlessingsMerge.cs b/Seasonal/AkibaNewYear/YearoftheHorseBlessingsMerge.cs
@@ -1,7 +1,7 @@
 /*
 name: Year of the Horse Blessings Merge
 description: This bot will farm the items belonging to the selected mode for the Year of the Horse Blessings Merge [2679] in /yokaihunt
-tags: year, of, the, horse, blessings, merge, yokaihunt, passionate, qipao, royal, equine, vanguard, ancestral, dao, stallions, passion, fan, propserity, bamboo, ink, painting, lady, suzhens, bridge
+tags: year, of, the, horse, blessings, merge, yokaihunt, passionate, qipao, royal, equine, vanguard, ancestral, dao, stallions, passion, fan, propserity, bamboo, ink, painting, lady, suzhens, bridge, prosperity
 */
 //cs_include Scripts/CoreBots.cs
 //cs_include Scripts/CoreFarms.cs
@@ -136,5 +136,6 @@ void findIngredients()
         new Option<bool>("99178", "Stallion's Propserity Fan", "Mode: [select] only\nShould the bot buy \"Stallion's Propserity Fan\" ?", false),
         new Option<bool>("99185", "Bamboo Ink Painting", "Mode: [select] only\nShould the bot buy \"Bamboo Ink Painting\" ?", false),
         new Option<bool>("99186", "Lady Suzhen's Bridge", "Mode: [select] only\nShould the bot buy \"Lady Suzhen's Bridge\" ?", false),
+        new Option<bool>("99179", "Prosperity Qipao", "Mode: [select] only\nShould the bot buy \"Prosperity Qipao\" ?", false),
    };
 }
diff --git a/Seasonal/Carnaval/SambasFlagMerge.cs b/Seasonal/Carnaval/SambasFlagMerge.cs
@@ -1,7 +1,7 @@
 /*
-name: SambasFlagMerge
-description: Farms the requirements & buys the items from Sambaflag merge
-tags: sambaflag, merge
+name: Sambas Flag Merge
+description: This bot will farm the items belonging to the selected mode for the Sambas Flag Merge [2237] in /sambaflag
+tags: sambas, flag, merge, sambaflag, sambista, dorival, moglin, jorge, zeca, encanto, encantado, cavaquinho, pandeiro, tantan, dança, das, sombras, dançarina, circlet, diadem, de, ouro, escuro
 */
 //cs_include Scripts/CoreBots.cs
 //cs_include Scripts/CoreFarms.cs
@@ -52,9 +52,8 @@ private static CoreAdvanced sAdv
 
     public void ScriptMain(IScriptInterface Bot)
     {
-        Core.BankingBlackList.AddRange(
-            new[] { "Costume Piece", "Ceremonial Standard", "Cavaquinho", "Pandeiro", "Tantan" }
-        );
+        Core.BankingBlackList.AddRange(new[] { "Costume Piece", "Ceremonial Standard", "Cavaquinho", "Pandeiro", "Tantan", "Dança das Sombras Hair", "Dança das Sombras Locks" });
+
         Core.SetOptions();
 
         BuyAllMerge();
@@ -77,9 +76,7 @@ void findIngredients()
         {
             ItemBase req = Adv.externalItem;
             int quant = Adv.externalQuant;
-            int currentQuant = req.Temp
-                ? Bot.TempInv.GetQuantity(req.Name)
-                : Bot.Inventory.GetQuantity(req.Name);
+            int currentQuant = req.Temp ? Bot.TempInv.GetQuantity(req.Name) : Bot.Inventory.GetQuantity(req.Name);
             if (req == null)
             {
                 Core.Logger("req is NULL");
@@ -90,14 +87,9 @@ void findIngredients()
             {
                 default:
                     bool shouldStop = !Adv.matsOnly || !dontStopMissingIng;
-                    Core.Logger(
-                        $"The bot hasn't been taught how to get {req.Name}."
-                            + (shouldStop ? " Please report the issue." : " Skipping"),
-                        messageBox: shouldStop,
-                        stopBot: shouldStop
-                    );
+                    Core.Logger($"The bot hasn't been taught how to get {req.Name}." + (shouldStop ? " Please report the issue." : " Skipping"), messageBox: shouldStop, stopBot: shouldStop);
                     break;
-        #endregion
+                #endregion
 
                 case "Ceremonial Standard":
                     Core.FarmingLogger(req.Name, quant);
@@ -135,71 +127,43 @@ void findIngredients()
                     Core.HuntMonster("sambaflag", "Master Of Ceremonies", req.Name, quant);
                     Bot.Wait.ForPickup(req.Name);
                     break;
+
+                case "Dança das Sombras Hair":
+                case "Dança das Sombras Locks":
+                    if (req.Upgrade && !Core.IsMember)
+                    {
+                        Core.Logger($"{req.Name} requires membership to farm, skipping.");
+                        return;
+                    }
+
+                    Core.FarmingLogger(req.Name, quant);
+                    Core.EquipClass(ClassType.Solo);
+                    Core.AddDrop(req.ID);
+                    Core.HuntMonster("sambaflag", "Flag Bearer", req.Name, quant, req.Temp, false);
+                    break;
             }
         }
     }
 
     public List<IOption> Select = new()
     {
-        new Option<bool>(
-            "76366",
-            "Sambista Armor",
-            "Mode: [select] only\nShould the bot buy \"Sambista Armor\" ?",
-            false
-        ),
-        new Option<bool>(
-            "76367",
-            "Sambista Helm",
-            "Mode: [select] only\nShould the bot buy \"Sambista Helm\" ?",
-            false
-        ),
-        new Option<bool>(
-            "76371",
-            "Dorival The Moglin",
-            "Mode: [select] only\nShould the bot buy \"Dorival The Moglin\" ?",
-            false
-        ),
-        new Option<bool>(
-            "76372",
-            "Jorge The Moglin",
-            "Mode: [select] only\nShould the bot buy \"Jorge The Moglin\" ?",
-            false
-        ),
-        new Option<bool>(
-            "76373",
-            "Zeca The Moglin",
-            "Mode: [select] only\nShould the bot buy \"Zeca The Moglin\" ?",
-            false
-        ),
-        new Option<bool>(
-            "76375",
-            "Encanto Sambista Armor",
-            "Mode: [select] only\nShould the bot buy \"Encanto Sambista Armor\" ?",
-            false
-        ),
-        new Option<bool>(
-            "76376",
-            "Encanto Sambista Hat",
-            "Mode: [select] only\nShould the bot buy \"Encanto Sambista Hat\" ?",
-            false
-        ),
-        new Option<bool>(
-            "76377",
-            "Encanto Cavaquinho",
-            "Mode: [select] only\nShould the bot buy \"Encanto Cavaquinho\" ?",
-            false
-        ),
-        new Option<bool>(
-            "76378",
-            "Encanto Pandeiro",
-            "Mode: [select] only\nShould the bot buy \"Encanto Pandeiro\" ?",
-            false
-        ),
-        new Option<bool>(
-            "76379",
-            "Encanto Tantan",
-            "Mode: [select] only\nShould the bot buy \"Encanto Tantan\" ?",
-            false
-        ),
-    };
+        new Option<bool>("76366", "Sambista Armor", "Mode: [select] only\nShould the bot buy \"Sambista Armor\" ?", false),
+        new Option<bool>("76367", "Sambista Helm", "Mode: [select] only\nShould the bot buy \"Sambista Helm\" ?", false),
+        new Option<bool>("76371", "Dorival The Moglin", "Mode: [select] only\nShould the bot buy \"Dorival The Moglin\" ?", false),
+        new Option<bool>("76372", "Jorge The Moglin", "Mode: [select] only\nShould the bot buy \"Jorge The Moglin\" ?", false),
+        new Option<bool>("76373", "Zeca The Moglin", "Mode: [select] only\nShould the bot buy \"Zeca The Moglin\" ?", false),
+        new Option<bool>("76375", "Encanto Sambista Armor", "Mode: [select] only\nShould the bot buy \"Encanto Sambista Armor\" ?", false),
+        new Option<bool>("76376", "Encantado Sambista Hat", "Mode: [select] only\nShould the bot buy \"Encantado Sambista Hat\" ?", false),
+        new Option<bool>("76377", "Encantado Cavaquinho", "Mode: [select] only\nShould the bot buy \"Encantado Cavaquinho\" ?", false),
+        new Option<bool>("76378", "Encantado Pandeiro", "Mode: [select] only\nShould the bot buy \"Encantado Pandeiro\" ?", false),
+        new Option<bool>("76379", "Encantado Tantan", "Mode: [select] only\nShould the bot buy \"Encantado Tantan\" ?", false),
+        new Option<bool>("99284", "Dança das Sombras", "Mode: [select] only\nShould the bot buy \"Dança das Sombras\" ?", false),
+        new Option<bool>("99287", "Dança das Sombras Mask", "Mode: [select] only\nShould the bot buy \"Dança das Sombras Mask\" ?", false),
+        new Option<bool>("99288", "Dançarina das Sombras Mask", "Mode: [select] only\nShould the bot buy \"Dançarina das Sombras Mask\" ?", false),
+        new Option<bool>("99289", "Dança das Sombras Circlet", "Mode: [select] only\nShould the bot buy \"Dança das Sombras Circlet\" ?", false),
+        new Option<bool>("99290", "Dança das Sombras Diadem", "Mode: [select] only\nShould the bot buy \"Dança das Sombras Diadem\" ?", false),
+        new Option<bool>("99291", "Dança das Sombras Visage", "Mode: [select] only\nShould the bot buy \"Dança das Sombras Visage\" ?", false),
+        new Option<bool>("99389", "Tantan de Ouro Encantado", "Mode: [select] only\nShould the bot buy \"Tantan de Ouro Encantado\" ?", false),
+        new Option<bool>("99463", "Tantan Escuro", "Mode: [select] only\nShould the bot buy \"Tantan Escuro\" ?", false),
+   };
 }
diff --git a/Seasonal/HerosHeartDay/UndeadSnugglegramsMerge.cs b/Seasonal/HerosHeartDay/UndeadSnugglegramsMerge.cs
@@ -1,11 +1,12 @@
 /*
 name: Undead Snugglegrams Merge
 description: This bot will farm the items belonging to the selected mode for the Undead Snugglegrams Merge [2682] in /heartsdaygrave
-tags: undead, snugglegrams, merge, heartsdaygrave, swordhaven, pendragon, noble, saber, pure, nobility, emblem, shield, promised, victory, knighthood, conferment, shadowscythe, visionary, plume, tarnished, unwavering, spite, condemnation, doomknight, tyrant, plate, collar, oppression, darkness, doomed, tyrannical
+tags: undead, snugglegrams, merge, heartsdaygrave, swordhaven, pendragon, noble, saber, pure, nobility, emblem, shield, promised, victory, knighthood, conferment, shadowscythe, visionary, plume, tarnished, unwavering, spite, condemnation, doomknight, tyrant, plate, collar, oppression, darkness, doomed, tyrannical, royal, valiant, guard, silver, ehangwen, forsaken, crimson, halberd, horns, barbute, tyrants, gaze, devastation, destruction
 */
 //cs_include Scripts/CoreBots.cs
 //cs_include Scripts/CoreFarms.cs
 //cs_include Scripts/CoreAdvanced.cs
+//cs_include Scripts/CoreStory.cs
 //cs_include Scripts/Seasonal/HerosHeartDay/heartsdaygrave.cs
 using Skua.Core.Interfaces;
 using Skua.Core.Models.Items;
diff --git a/Tools/ForDevelopers/CaseStorage.cs b/Tools/ForDevelopers/CaseStorage.cs
@@ -31468,6 +31468,118 @@ public void ScriptMain(IScriptInterface bot)
                     break;
     "
 },
+{
+    "Dança das Sombras Hair",
+    @"
+case ""Dança das Sombras Hair"":
+                    if (req.Upgrade && !Core.IsMember)
+                    {
+                        Core.Logger($""{req.Name} requires membership to farm, skipping."");
+                        return;
+                    }
+
+                    Core.FarmingLogger(req.Name, quant);
+                    Core.EquipClass(ClassType.Solo);
+                    Core.AddDrop(req.ID);
+                    Core.HuntMonster(""sambaflag"", ""Flag Bearer"", req.Name, quant, req.Temp, false);
+                    break;
+    "
+},
+{
+    "Dança das Sombras Locks",
+    @"
+case ""Dança das Sombras Locks"":
+                    if (req.Upgrade && !Core.IsMember)
+                    {
+                        Core.Logger($""{req.Name} requires membership to farm, skipping."");
+                        return;
+                    }
+
+                    Core.FarmingLogger(req.Name, quant);
+                    Core.EquipClass(ClassType.Solo);
+                    Core.AddDrop(req.ID);
+                    Core.HuntMonster(""sambaflag"", ""Flag Bearer"", req.Name, quant, req.Temp, false);
+                    break;
+    "
+},
+{
+    "Heart of Steel",
+    @"
+case ""Heart of Steel"":
+                    if (req.Upgrade && !Core.IsMember)
+                    {
+                        Core.Logger($""{req.Name} requires membership to farm, skipping."");
+                        return;
+                    }
+
+                    Core.FarmingLogger(req.Name, quant);
+                    Core.EquipClass(ClassType.Solo);
+                    Core.AddDrop(req.ID);
+                    Core.RegisterQuests(!Core.IsMember ? 10602 : 10603);
+                    while (!Bot.ShouldExit && !Core.CheckInventory(req.ID, quant))
+                    {
+                        Core.HuntMonster(""heartsdaygrave"", ""Illusionist Zio"", ""Zio's Discount Chocolates"");
+                        Core.HuntMonster(""heartsdaygrave"", ""Warlord Vaioh"", ""Vaioh's Snugglegram"");
+                        Bot.Wait.ForPickup(req.Name);
+                    }
+                    Core.CancelRegisteredQuests();
+                    break;
+    "
+},
+{
+    "Doomknight Tyrant Skull",
+    @"
+case ""Doomknight Tyrant Skull"":
+                    if (req.Upgrade && !Core.IsMember)
+                    {
+                        Core.Logger($""{req.Name} requires membership to farm, skipping."");
+                        return;
+                    }
+
+                    Core.FarmingLogger(req.Name, quant);
+                    Core.EquipClass(ClassType.Solo);
+                    Core.AddDrop(req.ID);
+                    Core.HuntMonster(""heartsdaygrave"", ""Warlord Vaioh"", req.Name, req.Quantity, req.Temp);
+                    Core.CancelRegisteredQuests();
+                    break;
+    "
+},
+{
+    "Doomknight Tyrant Helm",
+    @"
+case ""Doomknight Tyrant Helm"":
+                    if (req.Upgrade && !Core.IsMember)
+                    {
+                        Core.Logger($""{req.Name} requires membership to farm, skipping."");
+                        return;
+                    }
+
+                    Core.FarmingLogger(req.Name, quant);
+                    Core.EquipClass(ClassType.Solo);
+                    Core.AddDrop(req.ID);
+                    Core.HuntMonster(""heartsdaygrave"", ""Warlord Vaioh"", req.Name, req.Quantity, req.Temp);
+                    Core.CancelRegisteredQuests();
+                    break;
+    "
+},
+{
+    "Ether of Darkness",
+    @"
+case ""Ether of Darkness"":
+                    if (req.Upgrade && !Core.IsMember)
+                    {
+                        Core.Logger($""{req.Name} requires membership to farm, skipping."");
+                        return;
+                    }
+
+                    Core.FarmingLogger(req.Name, quant);
+                    Core.EquipClass(ClassType.Solo);
+                    Core.AddDrop(req.ID);
+                    Core.HuntMonster(""heartsdaygrave"", ""Warlord Vaioh"", req.Name, req.Quantity, req.Temp);
+                    Core.CancelRegisteredQuests();
+                    break;
+    "
+},
 };
 
     public static bool TryGetCase(string itemName, out string? logic) =>
diff --git a/scripts.json b/scripts.json
