From 686dcde61dcb365195a8dbac2620f9e99acbc7ea Mon Sep 17 00:00:00 2001 From: Ignose Date: Tue, 10 Feb 2026 12:48:21 -0500 Subject: [PATCH] one familiar cleanup, and one maxlevel check --- src/args.ts | 4 ++++ src/engine/resources.ts | 11 +---------- src/tasks/leveling.ts | 4 +++- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/args.ts b/src/args.ts index 05450b5..57fbc36 100644 --- a/src/args.ts +++ b/src/args.ts @@ -28,6 +28,10 @@ export const args = Args.create( help: "Use one familiar over the course of the run, rather than using different familiars", default: $familiar.none, }), + maxlevel: Args.number({ + help: "Set a number to level to by default", + default: 20 + }), stickknifeoutfit: Args.string({ help: `Name of the outfit that contains stick-knife, for stick-knife trick`, default: "", diff --git a/src/engine/resources.ts b/src/engine/resources.ts index 2ac113b..562a0d0 100644 --- a/src/engine/resources.ts +++ b/src/engine/resources.ts @@ -1,7 +1,6 @@ import { CombatResource as BaseCombatResource, OutfitSpec } from "grimoire-kolmafia"; -import { Effect, getFuel, Item, Skill } from "kolmafia"; +import { Effect, Item, Skill } from "kolmafia"; import { $effect, $item, $items, $monster, $skill, get, have } from "libram"; -import { fuelUp } from "../lib"; import { baseOutfit } from "./outfit"; import Macro from "../combat"; import { useCinch } from "../tasks/leveling"; @@ -49,14 +48,6 @@ export const freekillSources: FreekillSource[] = [ do: $skill`Fire the Jokester's Gun`, equip: $item`The Jokester's gun`, }, - { - name: "Asdon Martin: Missile Launcher", - available: () => !get("_missileLauncherUsed"), - prepare: () => { - if (getFuel() < 100) fuelUp(); - }, - do: $skill`Asdon Martin: Missile Launcher`, - }, { name: "Seal Clubbing Club of Legend", available: () => have($item`legendary seal-clubbing club`) && get("_clubEmTimeUsed", 0) < 5, diff --git a/src/tasks/leveling.ts b/src/tasks/leveling.ts index 614d45b..736f2d0 100644 --- a/src/tasks/leveling.ts +++ b/src/tasks/leveling.ts @@ -288,7 +288,9 @@ export const LevelingQuest: Quest = { name: "Leveling", completed: () => get("csServicesPerformed").split(",").length > 1 || - (have($effect`Spit Upon`) && have($item`short stack of pancakes`) && myLevel() >= 20) || + (have($effect`Spit Upon`) + && (have($item`short stack of pancakes`) || args.useonefam !== $familiar.none) + && myLevel() >= args.maxlevel) || (get("_feelPrideUsed", 3) >= 3 && camelFightsLeft() === 0 && !haveFreeKill()), tasks: [ {