libram 0.9.6 → 0.9.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/Clan.js CHANGED
@@ -92,7 +92,7 @@ export class Clan {
92
92
  startingClan.join();
93
93
  }
94
94
  }
95
- static withStash(clanIdOrName, items, // eslint-disable-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
95
+ static withStash(clanIdOrName, items, // eslint-disable-line @typescript-eslint/no-explicit-any
96
96
  callback) {
97
97
  return Clan._withStash(() => Clan.with(clanIdOrName, (clan) => clan.take(items)), (borrowed) => Clan.with(clanIdOrName, (clan) => clan.put(borrowed)), callback);
98
98
  }
@@ -22,6 +22,8 @@ export declare class MenuItem<T> {
22
22
  priceOverride?: number;
23
23
  mayo?: Item;
24
24
  data?: T;
25
+ private priceCached?;
26
+ private itemTypeCached?;
25
27
  static defaultPriceFunction: (item: Item) => number;
26
28
  static defaultOptions<T>(): Map<Item, MenuItemOptions<T>>;
27
29
  /**
@@ -41,6 +43,7 @@ export declare class MenuItem<T> {
41
43
  equals(other: MenuItem<T>): boolean;
42
44
  toString(): string;
43
45
  price(): number;
46
+ itemType(): string;
44
47
  }
45
48
  declare const organs: readonly ["food", "booze", "spleen item"];
46
49
  type Organ = (typeof organs)[number];
@@ -1,5 +1,5 @@
1
1
  import { canEquip, fullnessLimit, historicalAge, historicalPrice, inebrietyLimit, itemType, mallPrice, mallPrices, myFullness, myInebriety, myLevel, myPrimestat, mySpleenUse, npcPrice, spleenLimit, } from "kolmafia";
2
- import { have } from "../lib.js";
2
+ import { getRange, have } from "../lib.js";
3
3
  import { get as getModifier } from "../modifier.js";
4
4
  import { get } from "../property.js";
5
5
  import { Mayo, installed as mayoInstalled, } from "../resources/2015/MayoClinic.js";
@@ -10,27 +10,29 @@ function isMonday() {
10
10
  // Checking Tuesday's ruby is a hack to see if it's Monday in Arizona.
11
11
  return getModifier("Muscle Percent", $item `Tuesday's ruby`) > 0;
12
12
  }
13
+ function seasoningAdventures(item) {
14
+ const [min, max] = getRange(item.adventures);
15
+ return max - min <= 1 ? 1 : 0.5;
16
+ }
17
+ /**
13
18
  /**
14
19
  * Expected adventures from an item given a specified state
15
20
  *
16
21
  * @todo Include Salty Mouth and potentially other modifiers.
17
- * @param item Item to consider
22
+ * @param menuItem Menu item to consider
18
23
  * @param modifiers Consumption modifiers to consider
19
24
  * @returns Adventures expected
20
25
  */
21
- function expectedAdventures(item, modifiers) {
26
+ function expectedAdventures(menuItem, modifiers) {
27
+ const item = menuItem.item;
22
28
  if (item.adventures === "")
23
29
  return 0;
24
- const [min, recordedMax] = item.adventures
25
- .split(/[-]/)
26
- .map((s) => parseInt(s));
27
- const max = recordedMax ?? min;
30
+ const [min, max] = getRange(item.adventures);
28
31
  const interpolated = [...new Array(max - min + 1).keys()].map((n) => n + min);
29
- const forkMugMultiplier = (itemType(item) === "food" && item.notes?.includes("SALAD")) ||
30
- (itemType(item) === "booze" && item.notes?.includes("BEER"))
32
+ const forkMugMultiplier = (menuItem.itemType() === "food" && item.notes?.includes("SALAD")) ||
33
+ (menuItem.itemType() === "booze" && item.notes?.includes("BEER"))
31
34
  ? 1.5
32
35
  : 1.3;
33
- const seasoningAdventures = max - min <= 1 ? 1 : 0.5;
34
36
  const aioliAdventures = item.fullness;
35
37
  const garish = modifiers.garish && item.notes?.includes("LASAGNA") && !isMonday();
36
38
  const refinedPalate = modifiers.refinedPalate && item.notes?.includes("WINE");
@@ -52,13 +54,15 @@ function expectedAdventures(item, modifiers) {
52
54
  if (item.notes?.includes("MARTINI") && modifiers.tuxedoShirt) {
53
55
  adventures += 2;
54
56
  }
55
- if (itemType(item) === "food" && modifiers.mayoflex)
57
+ if (menuItem.itemType() === "food" && modifiers.mayoflex)
56
58
  adventures++;
57
- if (itemType(item) === "food" && modifiers.seasoning)
58
- adventures += seasoningAdventures;
59
- if (itemType(item) === "food" && modifiers.aioli)
59
+ if (menuItem.itemType() === "food" && modifiers.seasoning) {
60
+ adventures += seasoningAdventures(item);
61
+ }
62
+ if (menuItem.itemType() === "food" && modifiers.aioli) {
60
63
  adventures += aioliAdventures;
61
- if (itemType(item) === "food" && modifiers.whetStone)
64
+ }
65
+ if (menuItem.itemType() === "food" && modifiers.whetStone)
62
66
  adventures++;
63
67
  return adventures;
64
68
  }) / interpolated.length);
@@ -73,6 +77,8 @@ export class MenuItem {
73
77
  priceOverride;
74
78
  mayo;
75
79
  data;
80
+ priceCached;
81
+ itemTypeCached;
76
82
  static defaultPriceFunction = (item) => npcPrice(item) > 0 ? npcPrice(item) : mallPrice(item);
77
83
  static defaultOptions() {
78
84
  return new Map([
@@ -218,7 +224,17 @@ export class MenuItem {
218
224
  return this.item.toString();
219
225
  }
220
226
  price() {
221
- return this.priceOverride ?? MenuItem.defaultPriceFunction?.(this.item);
227
+ if (!this.priceCached) {
228
+ this.priceCached =
229
+ this.priceOverride ?? MenuItem.defaultPriceFunction(this.item);
230
+ }
231
+ return this.priceCached;
232
+ }
233
+ itemType() {
234
+ if (!this.itemTypeCached) {
235
+ this.itemTypeCached = itemType(this.item);
236
+ }
237
+ return this.itemTypeCached;
222
238
  }
223
239
  }
224
240
  const organs = ["food", "booze", "spleen item"];
@@ -239,6 +255,18 @@ class DietPlanner {
239
255
  whetStone;
240
256
  aioli;
241
257
  spleenValue = 0;
258
+ baseDefaultModifiers = {
259
+ forkMug: false,
260
+ seasoning: false,
261
+ whetStone: false,
262
+ aioli: false,
263
+ mayoflex: false,
264
+ refinedPalate: have($effect `Refined Palate`),
265
+ garish: have($effect `Gar-ish`),
266
+ saucemaven: have($skill `Saucemaven`),
267
+ pinkyRing: have($item `mafia pinky ring`) && canEquip($item `mafia pinky ring`),
268
+ tuxedoShirt: have($item `tuxedo shirt`) && canEquip($item `tuxedo shirt`),
269
+ };
242
270
  constructor(mpa, menu) {
243
271
  this.mpa = mpa;
244
272
  const fork = menu.find((item) => item.item === $item `Ol' Scratch's salad fork`);
@@ -301,7 +329,7 @@ class DietPlanner {
301
329
  */
302
330
  consumptionHelpersAndValue(menuItem, overrideModifiers) {
303
331
  const helpers = [];
304
- if (itemType(menuItem.item) === "food" && this.mayoLookup.size) {
332
+ if (menuItem.itemType() === "food" && this.mayoLookup.size) {
305
333
  const mayo = menuItem.mayo
306
334
  ? this.mayoLookup.get(menuItem.mayo)
307
335
  : this.mayoLookup.get(Mayo.flex);
@@ -309,55 +337,38 @@ class DietPlanner {
309
337
  helpers.push(mayo);
310
338
  }
311
339
  const defaultModifiers = {
312
- forkMug: false,
313
- seasoning: this.seasoning ? helpers.includes(this.seasoning) : false,
314
- whetStone: this.whetStone ? helpers.includes(this.whetStone) : false,
315
- aioli: this.aioli ? helpers.includes(this.aioli) : false,
340
+ ...this.baseDefaultModifiers,
316
341
  mayoflex: this.mayoLookup.size
317
342
  ? helpers.some((item) => item.item === Mayo.flex)
318
343
  : false,
319
- refinedPalate: have($effect `Refined Palate`),
320
- garish: have($effect `Gar-ish`),
321
- saucemaven: have($skill `Saucemaven`),
322
- pinkyRing: have($item `mafia pinky ring`) && canEquip($item `mafia pinky ring`),
323
- tuxedoShirt: have($item `tuxedo shirt`) && canEquip($item `tuxedo shirt`),
324
344
  ...overrideModifiers,
325
345
  };
326
346
  if (this.seasoning &&
327
- itemType(menuItem.item) === "food" &&
328
- this.mpa *
329
- (expectedAdventures(menuItem.item, {
330
- ...defaultModifiers,
331
- seasoning: true,
332
- }) -
333
- expectedAdventures(menuItem.item, {
334
- ...defaultModifiers,
335
- seasoning: false,
336
- })) >
337
- this.seasoning.price()) {
347
+ menuItem.itemType() === "food" &&
348
+ this.mpa * seasoningAdventures(menuItem.item) > this.seasoning.price()) {
338
349
  helpers.push(this.seasoning);
339
350
  }
340
351
  if (this.whetStone &&
341
- itemType(menuItem.item) === "food" &&
352
+ menuItem.itemType() === "food" &&
342
353
  this.mpa > this.whetStone.price()) {
343
354
  helpers.push(this.whetStone);
344
355
  }
345
356
  if (this.aioli &&
346
- itemType(menuItem.item) === "food" &&
357
+ menuItem.itemType() === "food" &&
347
358
  this.mpa * menuItem.item.fullness > this.aioli.price()) {
348
359
  helpers.push(this.aioli);
349
360
  }
350
- const forkMug = itemType(menuItem.item) === "food"
361
+ const forkMug = menuItem.itemType() === "food"
351
362
  ? this.fork
352
- : itemType(menuItem.item) === "booze"
363
+ : menuItem.itemType() === "booze"
353
364
  ? this.mug
354
365
  : null;
355
366
  const forkMugPrice = forkMug ? forkMug.price() : Infinity;
356
367
  const baseCost = menuItem.price() + sum(helpers, (item) => item.price());
357
- const valueRaw = expectedAdventures(menuItem.item, defaultModifiers) * this.mpa -
368
+ const valueRaw = expectedAdventures(menuItem, defaultModifiers) * this.mpa -
358
369
  baseCost +
359
370
  (menuItem.additionalValue ?? 0);
360
- const valueForkMug = expectedAdventures(menuItem.item, {
371
+ const valueForkMug = expectedAdventures(menuItem, {
361
372
  ...defaultModifiers,
362
373
  forkMug: true,
363
374
  }) *
@@ -599,7 +610,7 @@ class DietEntry {
599
610
  const mug = itemType(targetItem) === "booze" &&
600
611
  items.includes($item `Frosty's frosty mug`);
601
612
  return (this.quantity *
602
- expectedAdventures(this.menuItems[this.menuItems.length - 1].item, {
613
+ expectedAdventures(this.menuItems[this.menuItems.length - 1], {
603
614
  forkMug: fork || mug,
604
615
  seasoning: items.includes($item `Special Seasoning`),
605
616
  whetStone: items.includes($item `whet stone`),
package/dist/lib.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /** @module GeneralLibrary */
2
- import { Effect, Element, Familiar, Item, Location, Monster, runCombat, Servant, Skill, Slot, Stat, Thrall, Coinmaster } from "kolmafia";
2
+ import { Effect, Element, Familiar, Item, Location, Monster, runCombat, Servant, Skill, Slot, Stat, Thrall, Coinmaster, MafiaClass } from "kolmafia";
3
3
  /**
4
4
  * Determines the current maximum Accordion Thief songs the player can have in their head
5
5
  *
@@ -220,12 +220,18 @@ export declare function canUse(item: Item): boolean;
220
220
  * @param thing Thing that can have a mafia "none" value
221
221
  * @returns The thing specified or `null`
222
222
  */
223
- export declare function noneToNull<T>(thing: T): T | null;
223
+ export declare function noneToNull<T extends MafiaClass>(thing: T): T | null;
224
+ /**
225
+ * Parse the sort of range that KoLmafia encodes as a string
226
+ * @param range KoLmafia-style range string
227
+ * @returns Tuple of integers representing range
228
+ */
229
+ export declare function getRange(range: string): [number, number];
224
230
  /**
225
231
  * Determine the average value from the sort of range that KoLmafia encodes as a string
226
232
  *
227
233
  * @param range KoLmafia-style range string
228
- * @returns Average value fo range
234
+ * @returns Average value for range
229
235
  */
230
236
  export declare function getAverage(range: string): number;
231
237
  /**
package/dist/lib.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /** @module GeneralLibrary */
2
- import { appearanceRates, autosellPrice, availableAmount, booleanModifier, choiceFollowsFight, cliExecute, currentRound, Effect, elementalResistance, equip, equippedItem, extractItems as kolmafiaExtractItems, Familiar, fullnessLimit, getCampground, getCounters, getPlayerId, getPlayerName, getRelated, handlingChoice, haveEffect, haveFamiliar, haveServant, haveSkill, holiday, inebrietyLimit, inMultiFight, Item, Location, mallPrice, Monster, myClass, myEffects, myFamiliar, myFullness, myInebriety, myPath, myPrimestat, mySpleenUse, myThrall, myTurncount, numericModifier, Path, Servant, Skill, Slot, spleenLimit, Thrall, todayToString, toItem, toSkill, totalTurnsPlayed, visitUrl, xpath, monsterEval, batchOpen, batchClose, autosell, putCloset, putDisplay, putShop, putStash, sell, takeCloset, takeDisplay, takeShop, takeStash, takeStorage, repriceShop, familiarWeight, weightAdjustment, } from "kolmafia";
2
+ import { appearanceRates, autosellPrice, availableAmount, booleanModifier, choiceFollowsFight, cliExecute, currentRound, Effect, elementalResistance, equip, equippedItem, extractItems as kolmafiaExtractItems, Familiar, fullnessLimit, getCampground, getCounters, getPlayerId, getPlayerName, getRelated, handlingChoice, haveEffect, haveFamiliar, haveServant, haveSkill, holiday, inebrietyLimit, inMultiFight, Item, Location, mallPrice, Monster, myClass, myEffects, myFamiliar, myFullness, myInebriety, myPath, myPrimestat, mySpleenUse, myThrall, myTurncount, numericModifier, Path, Servant, Skill, Slot, spleenLimit, Thrall, todayToString, toItem, toSkill, totalTurnsPlayed, visitUrl, xpath, monsterEval, batchOpen, batchClose, autosell, putCloset, putDisplay, putShop, putStash, sell, takeCloset, takeDisplay, takeShop, takeStash, takeStorage, repriceShop, familiarWeight, weightAdjustment, MafiaClasses, } from "kolmafia";
3
3
  import logger from "./logger.js";
4
4
  import { get } from "./property.js";
5
5
  import { $class, $effect, $element, $familiar, $item, $items, $monsters, $skill, $stat, } from "./template-string.js";
@@ -362,12 +362,10 @@ export function getBanishedMonsters() {
362
362
  Item.get(`tomayohawk-style reflex hammer`),
363
363
  null,
364
364
  ].includes(banisherItem)) {
365
- if (Skill.get(banisher) === $skill.none) {
366
- break;
367
- }
368
- else {
369
- result.set(Skill.get(banisher), Monster.get(foe));
370
- }
365
+ const skill = $skill.get(banisher);
366
+ if (!skill)
367
+ continue;
368
+ result.set(skill, Monster.get(foe));
371
369
  }
372
370
  else {
373
371
  result.set(banisherItem, Monster.get(foe));
@@ -407,32 +405,30 @@ export function canUse(item) {
407
405
  * @returns The thing specified or `null`
408
406
  */
409
407
  export function noneToNull(thing) {
410
- if (thing instanceof Effect) {
411
- return thing === Effect.none ? null : thing;
412
- }
413
- if (thing instanceof Familiar) {
414
- return thing === Familiar.none ? null : thing;
415
- }
416
- if (thing instanceof Item) {
417
- return thing === Item.none ? null : thing;
418
- }
419
- return thing;
408
+ const type = MafiaClasses.find((t) => thing instanceof t);
409
+ return type && thing === type.none ? null : thing;
410
+ }
411
+ /**
412
+ * Parse the sort of range that KoLmafia encodes as a string
413
+ * @param range KoLmafia-style range string
414
+ * @returns Tuple of integers representing range
415
+ */
416
+ export function getRange(range) {
417
+ const [lower, upper] = range
418
+ .match(/^(-?\d+)(?:-(-?\d+))?$/)
419
+ ?.slice(1, 3)
420
+ .map((v) => parseInt(v)) ?? [0];
421
+ return [lower, Number.isNaN(upper) || upper === undefined ? lower : upper];
420
422
  }
421
423
  /**
422
424
  * Determine the average value from the sort of range that KoLmafia encodes as a string
423
425
  *
424
426
  * @param range KoLmafia-style range string
425
- * @returns Average value fo range
427
+ * @returns Average value for range
426
428
  */
427
429
  export function getAverage(range) {
428
- if (range.indexOf("-") < 0)
429
- return Number(range);
430
- const [, lower, upper] = range.match(/(-?[0-9]+)-(-?[0-9]+)/) ?? [
431
- "0",
432
- "0",
433
- "0",
434
- ];
435
- return (Number(lower) + Number(upper)) / 2;
430
+ const [min, max] = getRange(range);
431
+ return (min + max) / 2;
436
432
  }
437
433
  /**
438
434
  * Deternube tge average adventures expected from consuming an Item
@@ -836,7 +832,6 @@ export function freeCrafts(type = "all") {
836
832
  : 0) +
837
833
  effectCrafts($effect `Inigo's Incantation of Inspiration`) +
838
834
  effectCrafts($effect `Craft Tea`) +
839
- // eslint-disable-next-line libram/verify-constants
840
835
  effectCrafts($effect `Cooking Concentrate`);
841
836
  const food = type === "food" ? 5 - get("_cookbookbatCrafting") : 0;
842
837
  const smith = type === "smith" ? 5 - get("_thorsPliersCrafting") : 0;
@@ -1066,9 +1061,12 @@ export const bulkTakeStorage = makeBulkFunction(takeStorage);
1066
1061
  export const bulkPutShop = (items) => {
1067
1062
  batchOpen();
1068
1063
  for (const [item, { quantity, limit, price }] of items.entries()) {
1069
- quantity
1070
- ? putShop(price, limit ?? 0, quantity, item)
1071
- : putShop(price, limit ?? 0, item);
1064
+ if (quantity) {
1065
+ putShop(price, limit ?? 0, quantity, item);
1066
+ }
1067
+ else {
1068
+ putShop(price, limit ?? 0, item);
1069
+ }
1072
1070
  }
1073
1071
  return batchClose();
1074
1072
  };
@@ -1087,7 +1085,12 @@ export const bulkSell = (coinmaster, items) => {
1087
1085
  export const bulkRepriceShop = (items) => {
1088
1086
  batchOpen();
1089
1087
  for (const [item, { limit, price }] of items.entries()) {
1090
- limit ? repriceShop(price, limit, item) : repriceShop(price, item);
1088
+ if (limit) {
1089
+ repriceShop(price, limit, item);
1090
+ }
1091
+ else {
1092
+ repriceShop(price, item);
1093
+ }
1091
1094
  }
1092
1095
  return batchClose();
1093
1096
  };
package/dist/lib.test.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { getPlayerId, getPlayerName } from "kolmafia";
2
2
  import { describe, it, expect, vi } from "vitest";
3
- import { getPlayerFromIdOrName, getPlayerIdFromName, getPlayerNameFromId, } from "./lib.js";
3
+ import { getPlayerFromIdOrName, getPlayerIdFromName, getPlayerNameFromId, getRange, } from "./lib.js";
4
4
  vi.mocked(getPlayerName).mockImplementation((id) => {
5
5
  switch (id) {
6
6
  case 1:
@@ -140,3 +140,23 @@ describe(getPlayerFromIdOrName, () => {
140
140
  });
141
141
  });
142
142
  });
143
+ describe("getRange", () => {
144
+ it.each([
145
+ // Normal range
146
+ ["1-2", [1, 2]],
147
+ // Single number
148
+ ["1", [1, 1]],
149
+ // Negative single number
150
+ ["-1", [-1, -1]],
151
+ // Invalid
152
+ ["1-", [0, 0]],
153
+ // Negative upper bound
154
+ ["-5--1", [-5, -1]],
155
+ // Unusual order (let this slide)
156
+ ["10--1", [10, -1]],
157
+ // Ending in zero
158
+ ["-5-0", [-5, 0]],
159
+ ])("should return the range for %p", (input, expected) => {
160
+ expect(getRange(input)).toEqual(expected);
161
+ });
162
+ });
@@ -2,6 +2,7 @@ import { Item, Slot } from "kolmafia";
2
2
  export type MaximizeOptions = {
3
3
  updateOnFamiliarChange: boolean;
4
4
  updateOnCanEquipChanged: boolean;
5
+ updateOnLocationChange: boolean;
5
6
  useOutfitCaching: boolean;
6
7
  forceEquip: Item[];
7
8
  preventEquip: Item[];
package/dist/maximize.js CHANGED
@@ -1,4 +1,4 @@
1
- import { availableAmount, bjornifyFamiliar, canEquip, cliExecute, enthroneFamiliar, equip, equippedAmount, equippedItem, getProperty, haveEquipped, isWearingOutfit, Item, maximize, myBasestat, myBjornedFamiliar, myEnthronedFamiliar, myFamiliar, outfit, Slot, } from "kolmafia";
1
+ import { availableAmount, bjornifyFamiliar, canEquip, cliExecute, enthroneFamiliar, equip, equippedAmount, equippedItem, getProperty, haveEquipped, isWearingOutfit, Item, maximize, myBasestat, myBjornedFamiliar, myEnthronedFamiliar, myFamiliar, myLocation, outfit, Slot, } from "kolmafia";
2
2
  import { have } from "./lib.js";
3
3
  import logger from "./logger.js";
4
4
  import { $effect, $familiar, $item, $slot, $slots, $stats, } from "./template-string.js";
@@ -18,6 +18,7 @@ export function mergeMaximizeOptions(defaultOptions, addendums) {
18
18
  updateOnFamiliarChange: addendums.updateOnFamiliarChange ?? defaultOptions.updateOnFamiliarChange,
19
19
  updateOnCanEquipChanged: addendums.updateOnCanEquipChanged ??
20
20
  defaultOptions.updateOnCanEquipChanged,
21
+ updateOnLocationChange: addendums.updateOnLocationChange ?? defaultOptions.updateOnLocationChange,
21
22
  useOutfitCaching: addendums.useOutfitCaching ?? defaultOptions.useOutfitCaching,
22
23
  forceEquip: [...defaultOptions.forceEquip, ...(addendums.forceEquip ?? [])],
23
24
  preventEquip: [
@@ -41,6 +42,7 @@ export function mergeMaximizeOptions(defaultOptions, addendums) {
41
42
  const defaultMaximizeOptions = {
42
43
  updateOnFamiliarChange: true,
43
44
  updateOnCanEquipChanged: true,
45
+ updateOnLocationChange: false,
44
46
  useOutfitCaching: true,
45
47
  forceEquip: [],
46
48
  preventEquip: [],
@@ -420,6 +422,7 @@ export function maximizeCached(objectives, options = {}) {
420
422
  .map((slot) => `${slot}:${equippedItem(slot)}`)
421
423
  .sort(),
422
424
  have($effect `Offhand Remarkable`),
425
+ options.updateOnLocationChange && myLocation(),
423
426
  ].join("; ");
424
427
  const cacheEntry = checkCache(cacheKey, fullOptions);
425
428
  if (cacheEntry && !forceUpdate) {
@@ -473,7 +476,7 @@ export class Requirement {
473
476
  merge(other) {
474
477
  const optionsA = this.maximizeOptions;
475
478
  const optionsB = other.maximizeOptions;
476
- const optionalBooleans = mergeOptionalOptions(optionsA, optionsB, "updateOnFamiliarChange", "updateOnCanEquipChanged", "forceUpdate");
479
+ const optionalBooleans = mergeOptionalOptions(optionsA, optionsB, "updateOnFamiliarChange", "updateOnCanEquipChanged", "updateOnLocationChange", "forceUpdate");
477
480
  return new Requirement([...this.maximizeParameters, ...other.maximizeParameters], {
478
481
  ...optionalBooleans,
479
482
  forceEquip: [
@@ -2,5 +2,5 @@ export declare const stringModifiers: readonly ["Class", "Intrinsic Effect", "Eq
2
2
  export type StringModifier = typeof stringModifiers[number];
3
3
  export declare const booleanModifiers: readonly ["Softcore Only", "Single Equip", "Never Fumble", "Weakens Monster", "Free Pull", "Variable", "Nonstackable Watch", "Cold Immunity", "Hot Immunity", "Sleaze Immunity", "Spooky Immunity", "Stench Immunity", "Cold Vulnerability", "Hot Vulnerability", "Sleaze Vulnerability", "Spooky Vulnerability", "Stench Vulnerability", "Moxie Controls MP", "Moxie May Control MP", "Four Songs", "Adventure Underwater", "Underwater Familiar", "Generic", "Unarmed", "No Pull", "Lasts Until Rollover", "Attacks Can't Miss", "Pirate", "Breakable", "Drops Items", "Drops Meat", "Volleyball or Sombrero", "Extra Pickpocket", "Negative Status Resist"];
4
4
  export type BooleanModifier = typeof booleanModifiers[number];
5
- export declare const numericModifiers: readonly ["Familiar Weight", "Monster Level", "Combat Rate", "Initiative", "Experience", "Item Drop", "Meat Drop", "Damage Absorption", "Damage Reduction", "Cold Resistance", "Hot Resistance", "Sleaze Resistance", "Spooky Resistance", "Stench Resistance", "Mana Cost", "Moxie", "Moxie Percent", "Muscle", "Muscle Percent", "Mysticality", "Mysticality Percent", "Maximum HP", "Maximum HP Percent", "Maximum MP", "Maximum MP Percent", "Weapon Damage", "Ranged Damage", "Spell Damage", "Spell Damage Percent", "Cold Damage", "Hot Damage", "Sleaze Damage", "Spooky Damage", "Stench Damage", "Cold Spell Damage", "Hot Spell Damage", "Sleaze Spell Damage", "Spooky Spell Damage", "Stench Spell Damage", "Underwater Combat Rate", "Fumble", "HP Regen Min", "HP Regen Max", "MP Regen Min", "MP Regen Max", "Adventures", "Familiar Weight Percent", "Weapon Damage Percent", "Ranged Damage Percent", "Stackable Mana Cost", "Hobo Power", "Base Resting HP", "Resting HP Percent", "Bonus Resting HP", "Base Resting MP", "Resting MP Percent", "Bonus Resting MP", "Critical Hit Percent", "PvP Fights", "Volleyball", "Sombrero", "Leprechaun", "Fairy", "Meat Drop Penalty", "Hidden Familiar Weight", "Item Drop Penalty", "Initiative Penalty", "Food Drop", "Booze Drop", "Hat Drop", "Weapon Drop", "Offhand Drop", "Shirt Drop", "Pants Drop", "Accessory Drop", "Volleyball Effectiveness", "Sombrero Effectiveness", "Leprechaun Effectiveness", "Fairy Effectiveness", "Familiar Weight Cap", "Slime Resistance", "Slime Hates It", "Spell Critical Percent", "Muscle Experience", "Mysticality Experience", "Moxie Experience", "Effect Duration", "Candy Drop", "DB Combat Damage", "Sombrero Bonus", "Familiar Experience", "Sporadic Meat Drop", "Sporadic Item Drop", "Meat Bonus", "Pickpocket Chance", "Combat Mana Cost", "Muscle Experience Percent", "Mysticality Experience Percent", "Moxie Experience Percent", "Minstrel Level", "Muscle Limit", "Mysticality Limit", "Moxie Limit", "Song Duration", "Prismatic Damage", "Smithsness", "Supercold Resistance", "Reduce Enemy Defense", "Pool Skill", "Familiar Damage", "Gear Drop", "Maximum Hooch", "Water Level", "Crimbot Outfit Power", "Familiar Tuning Muscle", "Familiar Tuning Mysticality", "Familiar Tuning Moxie", "Random Monster Modifiers", "Luck", "Othello Skill", "Disco Style", "Rollover Effect Duration", "Sixgun Damage", "Fishing Skill", "Additional Song", "Sprinkle Drop", "Absorb Adventures", "Absorb Stats", "Rubee Drop", "Kruegerand Drop", "WarBear Armor Penetration", "Maximum PP", "Plumber Power", "Drippy Damage", "Drippy Resistance", "Energy", "Scrap", "Familiar Action Bonus", "Water", "Spleen Drop", "Potion Drop", "Sauce Spell Damage", "Monster Level Percent", "Food Fairy", "Booze Fairy", "Candy Fairy", "Food Fairy Effectiveness", "Booze Fairy Effectiveness", "Candy Fairy Effectiveness", "Damage Aura", "Sporadic Damage Aura", "Thorns", "Sporadic Thorns", "Stomach Capacity", "Liver Capacity", "Spleen Capacity", "Free Rests", "Leaves", "Elf Warfare Effectiveness", "Pirate Warfare Effectiveness", "MPC Drop", "Piece of Twelve Drop"];
5
+ export declare const numericModifiers: readonly ["Familiar Weight", "Monster Level", "Combat Rate", "Initiative", "Experience", "Item Drop", "Meat Drop", "Damage Absorption", "Damage Reduction", "Cold Resistance", "Hot Resistance", "Sleaze Resistance", "Spooky Resistance", "Stench Resistance", "Mana Cost", "Moxie", "Moxie Percent", "Muscle", "Muscle Percent", "Mysticality", "Mysticality Percent", "Maximum HP", "Maximum HP Percent", "Maximum MP", "Maximum MP Percent", "Weapon Damage", "Ranged Damage", "Spell Damage", "Spell Damage Percent", "Cold Damage", "Hot Damage", "Sleaze Damage", "Spooky Damage", "Stench Damage", "Cold Spell Damage", "Hot Spell Damage", "Sleaze Spell Damage", "Spooky Spell Damage", "Stench Spell Damage", "Underwater Combat Rate", "Fumble", "HP Regen Min", "HP Regen Max", "MP Regen Min", "MP Regen Max", "Adventures", "Familiar Weight Percent", "Weapon Damage Percent", "Ranged Damage Percent", "Stackable Mana Cost", "Hobo Power", "Base Resting HP", "Resting HP Percent", "Bonus Resting HP", "Base Resting MP", "Resting MP Percent", "Bonus Resting MP", "Critical Hit Percent", "PvP Fights", "Volleyball", "Sombrero", "Leprechaun", "Fairy", "Meat Drop Penalty", "Hidden Familiar Weight", "Item Drop Penalty", "Initiative Penalty", "Food Drop", "Booze Drop", "Hat Drop", "Weapon Drop", "Offhand Drop", "Shirt Drop", "Pants Drop", "Accessory Drop", "Volleyball Effectiveness", "Sombrero Effectiveness", "Leprechaun Effectiveness", "Fairy Effectiveness", "Familiar Weight Cap", "Slime Resistance", "Slime Hates It", "Spell Critical Percent", "Muscle Experience", "Mysticality Experience", "Moxie Experience", "Effect Duration", "Candy Drop", "DB Combat Damage", "Sombrero Bonus", "Familiar Experience", "Sporadic Meat Drop", "Sporadic Item Drop", "Meat Bonus", "Pickpocket Chance", "Combat Mana Cost", "Muscle Experience Percent", "Mysticality Experience Percent", "Moxie Experience Percent", "Minstrel Level", "Muscle Limit", "Mysticality Limit", "Moxie Limit", "Song Duration", "Prismatic Damage", "Smithsness", "Supercold Resistance", "Reduce Enemy Defense", "Pool Skill", "Familiar Damage", "Gear Drop", "Maximum Hooch", "Water Level", "Crimbot Outfit Power", "Familiar Tuning Muscle", "Familiar Tuning Mysticality", "Familiar Tuning Moxie", "Random Monster Modifiers", "Luck", "Othello Skill", "Disco Style", "Rollover Effect Duration", "Sixgun Damage", "Fishing Skill", "Additional Song", "Sprinkle Drop", "Absorb Adventures", "Absorb Stats", "Rubee Drop", "Kruegerand Drop", "WarBear Armor Penetration", "Maximum PP", "Plumber Power", "Drippy Damage", "Drippy Resistance", "Energy", "Scrap", "Familiar Action Bonus", "Water", "Spleen Drop", "Potion Drop", "Sauce Spell Damage", "Monster Level Percent", "Food Fairy", "Booze Fairy", "Candy Fairy", "Food Fairy Effectiveness", "Booze Fairy Effectiveness", "Candy Fairy Effectiveness", "Damage Aura", "Sporadic Damage Aura", "Thorns", "Sporadic Thorns", "Stomach Capacity", "Liver Capacity", "Spleen Capacity", "Free Rests", "Leaves", "Elf Warfare Effectiveness", "Pirate Warfare Effectiveness", "MPC Drop", "Piece of Twelve Drop", "Combat Item Damage Percent"];
6
6
  export type NumericModifier = typeof numericModifiers[number];
@@ -1,4 +1,4 @@
1
1
  // THIS FILE IS AUTOMATICALLY GENERATED. See tools/parseModifiers.ts for more information
2
2
  export const stringModifiers = ["Class", "Intrinsic Effect", "Equalize", "Wiki Name", "Modifiers", "Outfit", "Stat Tuning", "Effect", "Equips On", "Familiar Effect", "Jiggle", "Equalize Muscle", "Equalize Mysticality", "Equalize Moxie", "Avatar", "Rollover Effect", "Skill", "Floor Buffed Muscle", "Floor Buffed Mysticality", "Floor Buffed Moxie", "Plumber Stat", "Recipe", "Evaluated Modifiers"];
3
3
  export const booleanModifiers = ["Softcore Only", "Single Equip", "Never Fumble", "Weakens Monster", "Free Pull", "Variable", "Nonstackable Watch", "Cold Immunity", "Hot Immunity", "Sleaze Immunity", "Spooky Immunity", "Stench Immunity", "Cold Vulnerability", "Hot Vulnerability", "Sleaze Vulnerability", "Spooky Vulnerability", "Stench Vulnerability", "Moxie Controls MP", "Moxie May Control MP", "Four Songs", "Adventure Underwater", "Underwater Familiar", "Generic", "Unarmed", "No Pull", "Lasts Until Rollover", "Attacks Can't Miss", "Pirate", "Breakable", "Drops Items", "Drops Meat", "Volleyball or Sombrero", "Extra Pickpocket", "Negative Status Resist"];
4
- export const numericModifiers = ["Familiar Weight", "Monster Level", "Combat Rate", "Initiative", "Experience", "Item Drop", "Meat Drop", "Damage Absorption", "Damage Reduction", "Cold Resistance", "Hot Resistance", "Sleaze Resistance", "Spooky Resistance", "Stench Resistance", "Mana Cost", "Moxie", "Moxie Percent", "Muscle", "Muscle Percent", "Mysticality", "Mysticality Percent", "Maximum HP", "Maximum HP Percent", "Maximum MP", "Maximum MP Percent", "Weapon Damage", "Ranged Damage", "Spell Damage", "Spell Damage Percent", "Cold Damage", "Hot Damage", "Sleaze Damage", "Spooky Damage", "Stench Damage", "Cold Spell Damage", "Hot Spell Damage", "Sleaze Spell Damage", "Spooky Spell Damage", "Stench Spell Damage", "Underwater Combat Rate", "Fumble", "HP Regen Min", "HP Regen Max", "MP Regen Min", "MP Regen Max", "Adventures", "Familiar Weight Percent", "Weapon Damage Percent", "Ranged Damage Percent", "Stackable Mana Cost", "Hobo Power", "Base Resting HP", "Resting HP Percent", "Bonus Resting HP", "Base Resting MP", "Resting MP Percent", "Bonus Resting MP", "Critical Hit Percent", "PvP Fights", "Volleyball", "Sombrero", "Leprechaun", "Fairy", "Meat Drop Penalty", "Hidden Familiar Weight", "Item Drop Penalty", "Initiative Penalty", "Food Drop", "Booze Drop", "Hat Drop", "Weapon Drop", "Offhand Drop", "Shirt Drop", "Pants Drop", "Accessory Drop", "Volleyball Effectiveness", "Sombrero Effectiveness", "Leprechaun Effectiveness", "Fairy Effectiveness", "Familiar Weight Cap", "Slime Resistance", "Slime Hates It", "Spell Critical Percent", "Muscle Experience", "Mysticality Experience", "Moxie Experience", "Effect Duration", "Candy Drop", "DB Combat Damage", "Sombrero Bonus", "Familiar Experience", "Sporadic Meat Drop", "Sporadic Item Drop", "Meat Bonus", "Pickpocket Chance", "Combat Mana Cost", "Muscle Experience Percent", "Mysticality Experience Percent", "Moxie Experience Percent", "Minstrel Level", "Muscle Limit", "Mysticality Limit", "Moxie Limit", "Song Duration", "Prismatic Damage", "Smithsness", "Supercold Resistance", "Reduce Enemy Defense", "Pool Skill", "Familiar Damage", "Gear Drop", "Maximum Hooch", "Water Level", "Crimbot Outfit Power", "Familiar Tuning Muscle", "Familiar Tuning Mysticality", "Familiar Tuning Moxie", "Random Monster Modifiers", "Luck", "Othello Skill", "Disco Style", "Rollover Effect Duration", "Sixgun Damage", "Fishing Skill", "Additional Song", "Sprinkle Drop", "Absorb Adventures", "Absorb Stats", "Rubee Drop", "Kruegerand Drop", "WarBear Armor Penetration", "Maximum PP", "Plumber Power", "Drippy Damage", "Drippy Resistance", "Energy", "Scrap", "Familiar Action Bonus", "Water", "Spleen Drop", "Potion Drop", "Sauce Spell Damage", "Monster Level Percent", "Food Fairy", "Booze Fairy", "Candy Fairy", "Food Fairy Effectiveness", "Booze Fairy Effectiveness", "Candy Fairy Effectiveness", "Damage Aura", "Sporadic Damage Aura", "Thorns", "Sporadic Thorns", "Stomach Capacity", "Liver Capacity", "Spleen Capacity", "Free Rests", "Leaves", "Elf Warfare Effectiveness", "Pirate Warfare Effectiveness", "MPC Drop", "Piece of Twelve Drop"];
4
+ export const numericModifiers = ["Familiar Weight", "Monster Level", "Combat Rate", "Initiative", "Experience", "Item Drop", "Meat Drop", "Damage Absorption", "Damage Reduction", "Cold Resistance", "Hot Resistance", "Sleaze Resistance", "Spooky Resistance", "Stench Resistance", "Mana Cost", "Moxie", "Moxie Percent", "Muscle", "Muscle Percent", "Mysticality", "Mysticality Percent", "Maximum HP", "Maximum HP Percent", "Maximum MP", "Maximum MP Percent", "Weapon Damage", "Ranged Damage", "Spell Damage", "Spell Damage Percent", "Cold Damage", "Hot Damage", "Sleaze Damage", "Spooky Damage", "Stench Damage", "Cold Spell Damage", "Hot Spell Damage", "Sleaze Spell Damage", "Spooky Spell Damage", "Stench Spell Damage", "Underwater Combat Rate", "Fumble", "HP Regen Min", "HP Regen Max", "MP Regen Min", "MP Regen Max", "Adventures", "Familiar Weight Percent", "Weapon Damage Percent", "Ranged Damage Percent", "Stackable Mana Cost", "Hobo Power", "Base Resting HP", "Resting HP Percent", "Bonus Resting HP", "Base Resting MP", "Resting MP Percent", "Bonus Resting MP", "Critical Hit Percent", "PvP Fights", "Volleyball", "Sombrero", "Leprechaun", "Fairy", "Meat Drop Penalty", "Hidden Familiar Weight", "Item Drop Penalty", "Initiative Penalty", "Food Drop", "Booze Drop", "Hat Drop", "Weapon Drop", "Offhand Drop", "Shirt Drop", "Pants Drop", "Accessory Drop", "Volleyball Effectiveness", "Sombrero Effectiveness", "Leprechaun Effectiveness", "Fairy Effectiveness", "Familiar Weight Cap", "Slime Resistance", "Slime Hates It", "Spell Critical Percent", "Muscle Experience", "Mysticality Experience", "Moxie Experience", "Effect Duration", "Candy Drop", "DB Combat Damage", "Sombrero Bonus", "Familiar Experience", "Sporadic Meat Drop", "Sporadic Item Drop", "Meat Bonus", "Pickpocket Chance", "Combat Mana Cost", "Muscle Experience Percent", "Mysticality Experience Percent", "Moxie Experience Percent", "Minstrel Level", "Muscle Limit", "Mysticality Limit", "Moxie Limit", "Song Duration", "Prismatic Damage", "Smithsness", "Supercold Resistance", "Reduce Enemy Defense", "Pool Skill", "Familiar Damage", "Gear Drop", "Maximum Hooch", "Water Level", "Crimbot Outfit Power", "Familiar Tuning Muscle", "Familiar Tuning Mysticality", "Familiar Tuning Moxie", "Random Monster Modifiers", "Luck", "Othello Skill", "Disco Style", "Rollover Effect Duration", "Sixgun Damage", "Fishing Skill", "Additional Song", "Sprinkle Drop", "Absorb Adventures", "Absorb Stats", "Rubee Drop", "Kruegerand Drop", "WarBear Armor Penetration", "Maximum PP", "Plumber Power", "Drippy Damage", "Drippy Resistance", "Energy", "Scrap", "Familiar Action Bonus", "Water", "Spleen Drop", "Potion Drop", "Sauce Spell Damage", "Monster Level Percent", "Food Fairy", "Booze Fairy", "Candy Fairy", "Food Fairy Effectiveness", "Booze Fairy Effectiveness", "Candy Fairy Effectiveness", "Damage Aura", "Sporadic Damage Aura", "Thorns", "Sporadic Thorns", "Stomach Capacity", "Liver Capacity", "Spleen Capacity", "Free Rests", "Leaves", "Elf Warfare Effectiveness", "Pirate Warfare Effectiveness", "MPC Drop", "Piece of Twelve Drop", "Combat Item Damage Percent"];