diff --git a/packages/garbo/src/familiar/freeFightFamiliar.ts b/packages/garbo/src/familiar/freeFightFamiliar.ts index b8ed486c3..67c2ea576 100644 --- a/packages/garbo/src/familiar/freeFightFamiliar.ts +++ b/packages/garbo/src/familiar/freeFightFamiliar.ts @@ -14,6 +14,7 @@ import { get, getModifier, have, + Snapper, } from "libram"; import { canOpenRedPresent } from "."; import { garboValue } from "../garboValue"; @@ -91,6 +92,26 @@ export function menu(options: MenuOptions = {}): GeneralFamiliar[] { limit: "experience", }); } + + if (mode === "target") { + const item = Snapper.phylumItem.get(globalOptions.target.phylum); + + familiarMenu.push({ + familiar: $familiar`Red-Nosed Snapper`, + expectedValue: + item && + copyTargetCount() > + 11 - + (Snapper.getTrackedPhylum() === globalOptions.target.phylum + ? Snapper.getProgress() + : 0) + ? garboValue(item) / 11 + : 0, + leprechaunMultiplier: 0, + limit: "special", + }); + } + if (canOpenRedPresent()) { familiarMenu.push({ familiar: $familiar`Crimbo Shrub`, diff --git a/packages/garbo/src/fights.ts b/packages/garbo/src/fights.ts index 8ce9e6758..935f70ab2 100644 --- a/packages/garbo/src/fights.ts +++ b/packages/garbo/src/fights.ts @@ -102,6 +102,7 @@ import { Requirement, Robortender, set, + Snapper, SourceTerminal, sum, undelay, @@ -528,6 +529,13 @@ export function dailyFights(): void { const famSpec = familiarSpec(underwater, nextFight.name); + if ( + famSpec === $familiar`Red-Nosed Snapper` && + Snapper.getTrackedPhylum() !== globalOptions.target.phylum + ) { + Snapper.trackPhylum(globalOptions.target.phylum); + } + setLocation(location); meatTargetOutfit({ ...nextFight.spec, ...famSpec }, location).dress();