Grimoirize-more-fights (#1764)

* grimoirize kramco fight

* route exports though index for resources

* don't make them default exports anymore

* fix imports more

* final linting problems

packages/garbo/src/diet.ts

@@ -71,7 +71,7 @@ import { acquire, priceCaps } from "./acquire";
 import { withVIPClan } from "./clan";
 import { globalOptions } from "./config";
 import { embezzlerCount } from "./embezzler";
-import { expectedGregs } from "./resources/extrovermectin";
+import { expectedGregs, shouldAugustCast, synthesize } from "./resources";
 import {
   arrayEquals,
   baseMeat,
@@ -81,10 +81,8 @@ import {
 } from "./lib";
 import { shrugBadEffects } from "./mood";
 import { Potion, PotionTier } from "./potions";
-import synthesize from "./resources/synthesis";
 import { estimatedGarboTurns } from "./turns";
 import { garboValue } from "./garboValue";
-import { shouldAugustCast } from "./resources";
 
 const MPA = get("valueOfAdventure");
 print(`Using adventure value ${MPA}.`, HIGHLIGHT);

packages/garbo/src/embezzler/fights.ts

@@ -51,7 +51,6 @@ import {
   Macro,
   withMacro,
 } from "../combat";
-import { shouldAugustCast } from "../resources";
 import {
   averageEmbezzlerNet,
   embezzler,
@@ -67,7 +66,8 @@ import {
   equipOrbIfDesired,
   gregReady,
   possibleGregCrystalBall,
-} from "../resources/extrovermectin";
+  shouldAugustCast,
+} from "../resources";
 import { acquire } from "../acquire";
 import { globalOptions } from "../config";
 

packages/garbo/src/fights.ts

@@ -120,12 +120,14 @@ import {
   getNextEmbezzlerFight,
 } from "./embezzler";
 import {
+  bestMidnightAvailable,
   crateStrategy,
   doingGregFight,
+  faxMonster,
   gregReady,
   initializeExtrovermectinZones,
   saberCrateIfSafe,
-} from "./resources/extrovermectin";
+} from "./resources";
 import {
   bestFairy,
   freeFightFamiliar,
@@ -174,10 +176,8 @@ import { garboValue } from "./garboValue";
 import { wanderer } from "./garboWanderer";
 import { runEmbezzlerFight } from "./embezzler/execution";
 import { EmbezzlerFightRunOptions } from "./embezzler/staging";
-import { faxMonster } from "./resources/fax";
 import { FreeFightQuest, runGarboQuests } from "./tasks";
 import { expectedFreeFights, possibleTentacleFights } from "./tasks/freeFight";
-import { bestMidnightAvailable } from "./resources";
 import { PostQuest } from "./tasks/post";
 
 const firstChainMacro = () =>
@@ -1035,19 +1035,6 @@ const freeFightSources = [
     pygmyOptions(),
   ),
 
-  new FreeFight(
-    () => get("_sausageFights") === 0 && have($item`Kramco Sausage-o-Matic™`),
-    () => {
-      propertyManager.setChoices(wanderer().getChoices("wanderer"));
-      adv1(wanderer().getTarget("wanderer"), -1, "");
-    },
-    true,
-    {
-      spec: { offhand: $item`Kramco Sausage-o-Matic™` },
-      wandererOptions: "wanderer",
-    },
-  ),
-
   new FreeFight(
     () =>
       get("questL11Ron") === "finished"

packages/garbo/src/resources/autumnaton.ts

@@ -22,9 +22,7 @@ import { globalOptions } from "../config";
 const locationBanlist = $locations`The Daily Dungeon`; // The Daily Dungeon has no native monsters
 const badAttributes = ["LUCKY", "ULTRARARE", "BOSS"];
 
-export default function bestAutumnatonLocation(
-  locations: Location[],
-): Location {
+export function bestAutumnatonLocation(locations: Location[]): Location {
   return maxBy(bestLocationsByUpgrade(locations), averageAutumnatonValue);
 }
 

packages/garbo/src/resources/index.ts

@@ -2,3 +2,8 @@ export * from "./scepter";
 export * from "./candyMap";
 export * from "./gingerbread";
 export * from "./worksheds";
+export * from "./autumnaton";
+export * from "./extrovermectin";
+export * from "./fax";
+export * from "./realm";
+export * from "./synthesis";

packages/garbo/src/resources/synthesis.ts

@@ -31,7 +31,7 @@ const blockList = new Set([
   $item`vitachoconutriment capsule`,
 ]);
 
-export default function synthesize(casts: number, effect: Effect): void {
+export function synthesize(casts: number, effect: Effect): void {
   const saveLimit = 1;
   const buyableCandies = $items
     .all()

packages/garbo/src/tasks/barfTurn.ts

@@ -68,9 +68,8 @@ import { deliverThesisIfAble } from "../fights";
 import { computeDiet, consumeDiet } from "../diet";
 
 import { GarboTask } from "./engine";
-import { completeBarfQuest } from "../resources/realm";
 import { garboValue } from "../garboValue";
-import { bestMidnightAvailable } from "../resources";
+import { bestMidnightAvailable, completeBarfQuest } from "../resources";
 import { acquire } from "../acquire";
 
 const steveAdventures: Map<Location, number[]> = new Map([

packages/garbo/src/tasks/daily.ts

@@ -79,7 +79,7 @@ import {
   attemptCompletingBarfQuest,
   checkBarfQuest,
   checkVolcanoQuest,
-} from "../resources/realm";
+} from "../resources";
 
 const closetItems = $items`4-d camera, sand dollar, unfinished ice sculpture`;
 const retrieveItems = $items`Half a Purse, seal tooth, The Jokester's gun`;

packages/garbo/src/tasks/dailyItems.ts

@@ -47,8 +47,11 @@ import { coinmasterPrice } from "../lib";
 import { rufusPotion } from "../potions";
 import { garboAverageValue, garboValue } from "../garboValue";
 import { GarboTask } from "./engine";
-import { augustSummonTasks, candyMapDailyTasks } from "../resources";
-import { doingGregFight } from "../resources/extrovermectin";
+import {
+  augustSummonTasks,
+  candyMapDailyTasks,
+  doingGregFight,
+} from "../resources";
 
 const SummonTomes = $skills`Summon Snowcones, Summon Stickers, Summon Sugar Sheets, Summon Rad Libs, Summon Smithsness`;
 const Wads = $items`twinkly wad, cold wad, stench wad, hot wad, sleaze wad, spooky wad`;

packages/garbo/src/tasks/embezzler.ts

@@ -3,7 +3,7 @@ import { $item, $items, $location, CrystalBall, get, set } from "libram";
 import { GarboTask } from "./engine";
 import { GarboStrategy, Macro } from "../combat";
 import { getChangeLastAdvLocationMethod } from "../embezzler/lib";
-import { doingGregFight } from "../resources/extrovermectin";
+import { doingGregFight } from "../resources";
 import { freeFightOutfit } from "../outfit";
 
 export const SetupEmbezzlerQuest: Quest<GarboTask> = {

packages/garbo/src/tasks/freeFight.ts

@@ -59,6 +59,8 @@ import { garboValue } from "../garboValue";
 import { freeFightOutfit } from "../outfit";
 import { GarboTask } from "./engine";
 import { doCandyTrick, shouldAugustCast } from "../resources";
+import { kramcoGuaranteed } from "../lib";
+import { wanderer } from "../garboWanderer";
 
 type GarboFreeFightTask = Extract<GarboTask, { combat: GarboStrategy }> & {
   combatCount: () => number;
@@ -440,7 +442,19 @@ const FreeFightTasks: GarboFreeFightTask[] = [
     combatCount: () => clamp(10 - get("_brickoFights"), 0, 10),
     tentacle: false,
   },
-  // First kramco (wanderer)
+  {
+    name: "Kramco",
+    ready: () => have($item`Kramco Sausage-o-Matic™`),
+    completed: () => !kramcoGuaranteed(),
+    do: () =>
+      wanderer().getTarget({ wanderer: "freefight", allowEquipment: false }),
+    outfit: () => freeFightOutfit({ offhand: $item`Kramco Sausage-o-Matic™` }),
+    choices: () =>
+      wanderer().getChoices({ wanderer: "freefight", allowEquipment: false }),
+    combat: new GarboStrategy(() => Macro.basicCombat()),
+    combatCount: () => clamp(1 - get("_sausageFights"), 0, 1),
+    tentacle: true,
+  },
   // Grimacia
   // Saber
   // Pygmys

packages/garbo/src/tasks/post/index.ts

@@ -44,7 +44,7 @@ import {
 } from "../../lib";
 import { teleportEffects } from "../../mood";
 import { Quest } from "grimoire-kolmafia";
-import bestAutumnatonLocation from "../../resources/autumnaton";
+import { bestAutumnatonLocation } from "../../resources";
 import { estimatedGarboTurns, remainingUserTurns } from "../../turns";
 import { acquire } from "../../acquire";
 import { garboAverageValue } from "../../garboValue";

packages/garbo/src/yachtzee/diet.ts

@@ -38,10 +38,13 @@ import {
 } from "libram";
 import { acquire } from "../acquire";
 import { globalOptions } from "../config";
-import { hasMonsterReplacers } from "../resources/extrovermectin";
+import {
+  hasMonsterReplacers,
+  shouldAugustCast,
+  synthesize,
+} from "../resources";
 import { Potion } from "../potions";
 import { garboValue } from "../garboValue";
-import synthesize from "../resources/synthesis";
 import { estimatedGarboTurns } from "../turns";
 import { yachtzeePotionProfits, yachtzeePotionSetup } from "./buffs";
 import { optimizeForFishy } from "./fishy";
@@ -53,7 +56,6 @@ import {
   useSpikolodonSpikes,
 } from "./lib";
 import { freeRest } from "../lib";
-import { shouldAugustCast } from "../resources";
 
 class YachtzeeDietEntry<T> {
   name: string;