Embezzler lucky

packages/garbo/src/fights.ts

@@ -179,7 +179,7 @@ import { garboValue } from "./garboValue";
 import { wanderer } from "./garboWanderer";
 import { runTargetFight } from "./target/execution";
 import { TargetFightRunOptions } from "./target/staging";
-import { FreeFightQuest, runGarboQuests } from "./tasks";
+import { EmbezzlerFightsQuest, FreeFightQuest, runGarboQuests } from "./tasks";
 import {
   expectedFreeFightQuestFights,
   possibleFreeFightQuestTentacleFights,
@@ -412,6 +412,7 @@ export function dailyFights(): void {
       // check if user wants to wish for the copy target before doing setup
       if (!getNextCopyTargetFight()) return;
       meatTargetSetup();
+      if (targetingMeat()) runGarboQuests([EmbezzlerFightsQuest]);
 
       // PROFESSOR COPIES
       if (have($familiar`Pocket Professor`)) {

packages/garbo/src/index.ts

@@ -75,6 +75,7 @@ import {
   propertyManager,
   questStep,
   safeRestore,
+  targetingMeat,
   userConfirmDialog,
   valueDrops,
 } from "./lib";
@@ -88,6 +89,7 @@ import {
   BarfTurnQuests,
   CockroachSetup,
   DailyFamiliarsQuest,
+  EmbezzlerFightsQuest,
   PostQuest,
   runGarboQuests,
   runSafeGarboQuests,
@@ -610,6 +612,7 @@ export function main(argString = ""): void {
           maximize("MP", false);
           meatMood().execute(estimatedGarboTurns());
           runGarboQuests([BuffExtensionQuest, PostBuffExtensionQuest]);
+          if (!targetingMeat()) runGarboQuests([EmbezzlerFightsQuest]);
           try {
             runGarboQuests([PostQuest(), ...BarfTurnQuests]);
 

packages/garbo/src/lib.ts

@@ -81,6 +81,7 @@ import {
   ClosedCircuitPayphone,
   CombatLoversLocket,
   Counter,
+  Delayed,
   ensureFreeRun,
   FindActionSourceConstraints,
   get,
@@ -107,6 +108,9 @@ import { acquire } from "./acquire";
 import { globalOptions } from "./config";
 import { garboAverageValue, garboValue } from "./garboValue";
 import { Outfit, OutfitSpec } from "grimoire-kolmafia";
+import { GarboTask } from "./tasks/engine";
+
+export type AlternateTask = GarboTask & { turns: Delayed<number> };
 
 export const eventLog: {
   initialCopyTargetsFought: number;
@@ -1084,6 +1088,14 @@ const luckyAdventures: LuckyAdventure[] = [
           get("valueOfAdventure")
         : 0,
   },
+  {
+    location: $location`Cobb's Knob Treasury`,
+    phase: "target",
+    value: () =>
+      canAdventure($location`Cobb's Knob Treasury`)
+        ? 3 * get("valueOfAdventure") // Rough estimation, they have 4x the basemeat of barf
+        : 0,
+  },
 ];
 
 function determineBestLuckyAdventure(): LuckyAdventure {

packages/garbo/src/outfit/target.ts

@@ -44,6 +44,12 @@ export function meatTargetOutfit(
   if (target === $location`Crab Island`) {
     const meat = meatDrop($monster`giant giant crab`) + songboomMeat();
     outfit.modifier.push(`${meat / 100} Meat Drop`, "-tie");
+  } else if (
+    target === $location`Cobb's Knob Treasury` &&
+    have($effect`Lucky!`)
+  ) {
+    const meat = meatDrop($monster`Knob Goblin Embezzler`) + songboomMeat();
+    outfit.modifier.push(`${meat / 100} Meat Drop`, "-tie");
   } else if (targetingMeat()) {
     outfit.modifier.push(
       `${modeValueOfMeat(BonusEquipMode.MEAT_TARGET)} Meat Drop`,

packages/garbo/src/target/fights.ts

@@ -1,7 +1,6 @@
 import {
   abort,
   canAdventure,
-  cliExecute,
   getClanLounge,
   haveEquipped,
   isBanished,
@@ -17,7 +16,6 @@ import {
   runCombat,
   use,
   userConfirm,
-  useSkill,
   visitUrl,
 } from "kolmafia";
 import { DraggableFight } from "garbo-lib";
@@ -31,7 +29,6 @@ import {
   $locations,
   $monster,
   $skill,
-  AprilingBandHelmet,
   ChateauMantegna,
   ChestMimic,
   clamp,
@@ -59,7 +56,6 @@ import {
 } from "../combat";
 import {
   averageTargetNet,
-  getBestLuckyAdventure,
   getUsingFreeBunnyBanish,
   HIGHLIGHT,
   ltbRun,
@@ -72,7 +68,6 @@ import {
   equipOrbIfDesired,
   gregReady,
   possibleGregCrystalBall,
-  shouldAugustCast,
   totalGregCharges,
 } from "../resources";
 import { acquire } from "../acquire";
@@ -83,6 +78,7 @@ import {
   TargetFightConfigOptions as CopyTargetFightConfigOptions,
   RunOptions,
 } from "./lib";
+import { embezzlerFights } from "../tasks/embezzler";
 
 export class CopyTargetFight implements CopyTargetFightConfigOptions {
   name: string;
@@ -233,85 +229,6 @@ export const chainStarters = [
       );
     },
   ),
-  new CopyTargetFight(
-    "Scepter Semirare",
-    () =>
-      canAdventure($location`Cobb's Knob Treasury`) &&
-      shouldAugustCast($skill`Aug. 2nd: Find an Eleven-Leaf Clover Day`) &&
-      globalOptions.target === $monster`Knob Goblin Embezzler`,
-    () => 0, // prevent circular reference
-    (options: RunOptions) => {
-      retrieveItem($item`august scepter`);
-      useSkill($skill`Aug. 2nd: Find an Eleven-Leaf Clover Day`);
-      if (!have($effect`Lucky!`)) {
-        set("_aug2Cast", true);
-        return;
-      }
-      const adventureFunction = options.useAuto
-        ? garboAdventureAuto
-        : garboAdventure;
-      adventureFunction(
-        $location`Cobb's Knob Treasury`,
-        options.macro,
-        options.macro,
-      );
-    },
-  ),
-  new CopyTargetFight(
-    "Saxophone semirare",
-    () =>
-      getBestLuckyAdventure().phase === "target" &&
-      getBestLuckyAdventure().value() > 0 &&
-      canAdventure($location`Cobb's Knob Treasury`) &&
-      AprilingBandHelmet.canPlay($item`Apriling band saxophone`) &&
-      globalOptions.target === $monster`Knob Goblin Embezzler`,
-    () => 0,
-    (options: RunOptions) => {
-      AprilingBandHelmet.play($item`Apriling band saxophone`);
-      if (!have($effect`Lucky!`)) return;
-      const adventureFunction = options.useAuto
-        ? garboAdventureAuto
-        : garboAdventure;
-      adventureFunction(
-        $location`Cobb's Knob Treasury`,
-        options.macro,
-        options.macro,
-      );
-    },
-  ),
-  new CopyTargetFight(
-    "Pillkeeper Semirare",
-    () =>
-      have($item`Eight Days a Week Pill Keeper`) &&
-      canAdventure($location`Cobb's Knob Treasury`) &&
-      !get("_freePillKeeperUsed") &&
-      !have($effect`Lucky!`) &&
-      globalOptions.target === $monster`Knob Goblin Embezzler`,
-    () =>
-      have($item`Eight Days a Week Pill Keeper`) &&
-      canAdventure($location`Cobb's Knob Treasury`) &&
-      !get("_freePillKeeperUsed") &&
-      !have($effect`Lucky!`) &&
-      globalOptions.target === $monster`Knob Goblin Embezzler`
-        ? 1
-        : 0,
-    (options: RunOptions) => {
-      retrieveItem($item`Eight Days a Week Pill Keeper`);
-      cliExecute("pillkeeper semirare");
-      if (!have($effect`Lucky!`)) {
-        set("_freePillKeeperUsed", true);
-        return;
-      }
-      const adventureFunction = options.useAuto
-        ? garboAdventureAuto
-        : garboAdventure;
-      adventureFunction(
-        $location`Cobb's Knob Treasury`,
-        options.macro,
-        options.macro,
-      );
-    },
-  ),
   new CopyTargetFight(
     "Mimic Eggs",
     () => ChestMimic.differentiableQuantity(globalOptions.target) >= 1,
@@ -1098,8 +1015,9 @@ export const copyTargetSources = [
 ];
 
 export function copyTargetCount(): number {
-  return sum(copyTargetSources, (source: CopyTargetFight) =>
-    source.potential(),
+  return (
+    sum(copyTargetSources, (source: CopyTargetFight) => source.potential()) +
+    embezzlerFights()
   );
 }