Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/args.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: "",
Expand Down
11 changes: 1 addition & 10 deletions src/engine/resources.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion src/tasks/leveling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
{
Expand Down