libram 0.4.0 → 0.4.4

package/dist/maximize.js

@@ -1,105 +1,16 @@
-"use strict";
-
-require("core-js/modules/es.array.slice.js");
-
-require("core-js/modules/es.symbol.js");
-
-require("core-js/modules/es.symbol.description.js");
-
-require("core-js/modules/es.object.get-own-property-descriptors.js");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.setDefaultMaximizeOptions = setDefaultMaximizeOptions;
-exports.maximizeCached = maximizeCached;
-exports.Requirement = void 0;
-
-require("core-js/modules/es.array.iterator.js");
-
-require("core-js/modules/es.object.to-string.js");
-
-require("core-js/modules/es.object.assign.js");
-
-require("core-js/modules/es.array.sort.js");
-
-require("core-js/modules/es.array.concat.js");
-
-require("core-js/modules/es.array.filter.js");
-
-require("core-js/modules/es.array.splice.js");
-
-require("core-js/modules/es.array.map.js");
-
-require("core-js/modules/es.array.includes.js");
-
-require("core-js/modules/es.string.includes.js");
-
-var _kolmafia = require("kolmafia");
-
-var _templateString = require("./template-string");
-
-var _logger = _interopRequireDefault(require("./logger"));
-
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29, _templateObject30, _templateObject31, _templateObject32, _templateObject33, _templateObject34, _templateObject35, _templateObject36, _templateObject37, _templateObject38;
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
-
-function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
-
-function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
-
-function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
-
-function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-var defaultMaximizeOptions = {
-  updateOnFamiliarChange: true,
-  updateOnCanEquipChanged: true,
-  useOutfitCaching: true,
-  forceEquip: [],
-  preventEquip: [],
-  bonusEquip: new Map(),
-  onlySlot: [],
-  preventSlot: []
+import { availableAmount, bjornifyFamiliar, canEquip, cliExecute, enthroneFamiliar, equip, equippedAmount, equippedItem, isWearingOutfit, maximize, myBasestat, myBjornedFamiliar, myEnthronedFamiliar, myFamiliar, outfit, } from "kolmafia";
+import { $familiar, $item, $slot, $slots, $stats } from "./template-string";
+import logger from "./logger";
+import { setEqual } from "./utils";
+const defaultMaximizeOptions = {
+    updateOnFamiliarChange: true,
+    updateOnCanEquipChanged: true,
+    useOutfitCaching: true,
+    forceEquip: [],
+    preventEquip: [],
+    bonusEquip: new Map(),
+    onlySlot: [],
+    preventSlot: [],
 };
 /**
  *
@@ -110,148 +21,96 @@ var defaultMaximizeOptions = {
  * @param options.preventEquip Equipment to prevent equipping ("-equip X").
  * @param options.bonusEquip Equipment to apply a bonus to ("200 bonus X").
  */
-
-function setDefaultMaximizeOptions(options) {
-  Object.assign(defaultMaximizeOptions, options);
-} // Subset of slots that are valid for caching.
-
-
-var cachedSlots = (0, _templateString.$slots)(_templateObject || (_templateObject = _taggedTemplateLiteral(["hat, weapon, off-hand, back, shirt, pants, acc1, acc2, acc3, familiar"])));
-
-var CacheEntry = function CacheEntry(equipment, rider, familiar, canEquipItemCount) {
-  _classCallCheck(this, CacheEntry);
-
-  _defineProperty(this, "equipment", void 0);
-
-  _defineProperty(this, "rider", void 0);
-
-  _defineProperty(this, "familiar", void 0);
-
-  _defineProperty(this, "canEquipItemCount", void 0);
-
-  this.equipment = equipment;
-  this.rider = rider;
-  this.familiar = familiar;
-  this.canEquipItemCount = canEquipItemCount;
-};
-
-var _outfitSlots = /*#__PURE__*/new WeakMap();
-
-var _useHistory = /*#__PURE__*/new WeakMap();
-
-var _maxSize = /*#__PURE__*/new WeakMap();
-
-var OutfitLRUCache = /*#__PURE__*/function () {
-  // Current outfits allocated
-  // Array of indices into #outfitSlots in order of use. Most recent at the front.
-  function OutfitLRUCache(maxSize) {
-    _classCallCheck(this, OutfitLRUCache);
-
-    _outfitSlots.set(this, {
-      writable: true,
-      value: []
-    });
-
-    _useHistory.set(this, {
-      writable: true,
-      value: []
-    });
-
-    _maxSize.set(this, {
-      writable: true,
-      value: void 0
-    });
-
-    _classPrivateFieldSet(this, _maxSize, maxSize);
-  }
-
-  _createClass(OutfitLRUCache, [{
-    key: "checkConsistent",
-    value: function checkConsistent() {
-      if (_classPrivateFieldGet(this, _useHistory).length !== _classPrivateFieldGet(this, _outfitSlots).length || !_toConsumableArray(_classPrivateFieldGet(this, _useHistory)).sort().every((value, index) => value === index)) {
-        throw new Error("Outfit cache consistency failed.");
-      }
-    }
-  }, {
-    key: "promote",
-    value: function promote(index) {
-      _classPrivateFieldSet(this, _useHistory, [index].concat(_toConsumableArray(_classPrivateFieldGet(this, _useHistory).filter(i => i !== index))));
-
-      this.checkConsistent();
-    }
-  }, {
-    key: "get",
-    value: function get(key) {
-      var index = _classPrivateFieldGet(this, _outfitSlots).indexOf(key);
-
-      if (index < 0) return undefined;
-      this.promote(index);
-      return "".concat(OutfitLRUCache.OUTFIT_PREFIX, " ").concat(index);
-    }
-  }, {
-    key: "insert",
-    value: function insert(key) {
-      var lastUseIndex = undefined;
-
-      if (_classPrivateFieldGet(this, _outfitSlots).length >= _classPrivateFieldGet(this, _maxSize)) {
-        lastUseIndex = _classPrivateFieldGet(this, _useHistory).pop();
-
-        if (lastUseIndex === undefined) {
-          throw new Error("Outfit cache consistency failed.");
+export function setDefaultMaximizeOptions(options) {
+    Object.assign(defaultMaximizeOptions, options);
+}
+// Subset of slots that are valid for caching.
+const cachedSlots = $slots `hat, weapon, off-hand, back, shirt, pants, acc1, acc2, acc3, familiar`;
+class CacheEntry {
+    constructor(equipment, rider, familiar, canEquipItemCount) {
+        this.equipment = equipment;
+        this.rider = rider;
+        this.familiar = familiar;
+        this.canEquipItemCount = canEquipItemCount;
+    }
+}
+class OutfitLRUCache {
+    constructor(maxSize) {
+        // Current outfits allocated
+        this.#outfitSlots = [];
+        // Array of indices into #outfitSlots in order of use. Most recent at the front.
+        this.#useHistory = [];
+        this.#maxSize = maxSize;
+    }
+    // Current outfits allocated
+    #outfitSlots;
+    // Array of indices into #outfitSlots in order of use. Most recent at the front.
+    #useHistory;
+    #maxSize;
+    checkConsistent() {
+        if (this.#useHistory.length !== this.#outfitSlots.length ||
+            ![...this.#useHistory].sort().every((value, index) => value === index)) {
+            throw new Error("Outfit cache consistency failed.");
         }
-
-        _classPrivateFieldGet(this, _useHistory).splice(0, 0, lastUseIndex);
-
-        _classPrivateFieldGet(this, _outfitSlots)[lastUseIndex] = key;
-        this.checkConsistent();
-        return "".concat(OutfitLRUCache.OUTFIT_PREFIX, " ").concat(lastUseIndex);
-      } else {
-        var index = _classPrivateFieldGet(this, _outfitSlots).push(key) - 1;
-
-        _classPrivateFieldGet(this, _useHistory).splice(0, 0, index);
-
+    }
+    promote(index) {
+        this.#useHistory = [index, ...this.#useHistory.filter((i) => i !== index)];
         this.checkConsistent();
-        return "".concat(OutfitLRUCache.OUTFIT_PREFIX, " ").concat(index);
-      }
     }
-  }]);
-
-  return OutfitLRUCache;
-}();
+    get(key) {
+        const index = this.#outfitSlots.indexOf(key);
+        if (index < 0)
+            return undefined;
+        this.promote(index);
+        return `${OutfitLRUCache.OUTFIT_PREFIX} ${index}`;
+    }
+    insert(key) {
+        let lastUseIndex = undefined;
+        if (this.#outfitSlots.length >= this.#maxSize) {
+            lastUseIndex = this.#useHistory.pop();
+            if (lastUseIndex === undefined) {
+                throw new Error("Outfit cache consistency failed.");
+            }
+            this.#useHistory.splice(0, 0, lastUseIndex);
+            this.#outfitSlots[lastUseIndex] = key;
+            this.checkConsistent();
+            return `${OutfitLRUCache.OUTFIT_PREFIX} ${lastUseIndex}`;
+        }
+        else {
+            const index = this.#outfitSlots.push(key) - 1;
+            this.#useHistory.splice(0, 0, index);
+            this.checkConsistent();
+            return `${OutfitLRUCache.OUTFIT_PREFIX} ${index}`;
+        }
+    }
+}
+OutfitLRUCache.OUTFIT_PREFIX = "Script Outfit";
 /**
  * Save current equipment as KoL-native outfit.
  * @param name Name of new outfit.
  */
-
-
-_defineProperty(OutfitLRUCache, "OUTFIT_PREFIX", "Script Outfit");
-
 function saveOutfit(name) {
-  (0, _kolmafia.cliExecute)("outfit save ".concat(name));
-} // Objective cache entries.
-
-
-var cachedObjectives = {}; // Outfit cache entries. Keep 6 by default to avoid cluttering list.
-
-var outfitCache = new OutfitLRUCache(6); // Cache to prevent rescanning all items unnecessarily
-
-var cachedStats = [0, 0, 0];
-var cachedCanEquipItemCount = 0;
+    cliExecute(`outfit save ${name}`);
+}
+// Objective cache entries.
+const cachedObjectives = {};
+// Outfit cache entries. Keep 6 by default to avoid cluttering list.
+const outfitCache = new OutfitLRUCache(6);
+// Cache to prevent rescanning all items unnecessarily
+let cachedStats = [0, 0, 0];
+let cachedCanEquipItemCount = 0;
 /**
  * Count the number of unique items that can be equipped.
  * @returns The count of unique items.
  */
-
 function canEquipItemCount() {
-  var stats = (0, _templateString.$stats)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["Muscle, Mysticality, Moxie"]))).map(stat => Math.min((0, _kolmafia.myBasestat)(stat), 300));
-
-  if (stats.every((value, index) => value === cachedStats[index])) {
+    const stats = $stats `Muscle, Mysticality, Moxie`.map((stat) => Math.min(myBasestat(stat), 300));
+    if (stats.every((value, index) => value === cachedStats[index])) {
+        return cachedCanEquipItemCount;
+    }
+    cachedStats = stats;
+    cachedCanEquipItemCount = Item.all().filter((item) => canEquip(item)).length;
     return cachedCanEquipItemCount;
-  }
-
-  cachedStats = stats;
-  cachedCanEquipItemCount = Item.all().filter(item => (0, _kolmafia.canEquip)(item)).length;
-  return cachedCanEquipItemCount;
 }
 /**
  * Checks the objective cache for a valid entry.
@@ -260,229 +119,149 @@ function canEquipItemCount() {
  * @param updateOnCanEquipChanged Ignore cache if stats have changed what can be equipped.
  * @returns A valid CacheEntry or null.
  */
-
-
 function checkCache(cacheKey, options) {
-  var entry = cachedObjectives[cacheKey];
-
-  if (!entry) {
-    return null;
-  }
-
-  if (options.updateOnFamiliarChange && (0, _kolmafia.myFamiliar)() !== entry.familiar) {
-    _logger.default.warning("Equipment found in maximize cache but familiar is different.");
-
-    return null;
-  }
-
-  if (options.updateOnCanEquipChanged && entry.canEquipItemCount !== canEquipItemCount()) {
-    _logger.default.warning("Equipment found in maximize cache but equippable item list is out of date.");
-
-    return null;
-  }
-
-  return entry;
+    const entry = cachedObjectives[cacheKey];
+    if (!entry) {
+        return null;
+    }
+    if (options.updateOnFamiliarChange && myFamiliar() !== entry.familiar) {
+        logger.warning("Equipment found in maximize cache but familiar is different.");
+        return null;
+    }
+    if (options.updateOnCanEquipChanged &&
+        entry.canEquipItemCount !== canEquipItemCount()) {
+        logger.warning("Equipment found in maximize cache but equippable item list is out of date.");
+        return null;
+    }
+    return entry;
 }
 /**
  * Applies equipment that was found in the cache.
  * @param entry The CacheEntry to apply
  */
-
-
 function applyCached(entry, options) {
-  var outfitName = options.useOutfitCaching ? outfitCache.get(entry) : undefined;
-
-  if (outfitName) {
-    if (!(0, _kolmafia.isWearingOutfit)(outfitName)) {
-      (0, _kolmafia.outfit)(outfitName);
-    }
-
-    var familiarEquip = entry.equipment.get((0, _templateString.$slot)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["familiar"]))));
-    if (familiarEquip) (0, _kolmafia.equip)(familiarEquip);
-    verifyCached(entry);
-  } else {
-    var _iterator = _createForOfIteratorHelper(entry.equipment),
-        _step;
-
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _step$value = _slicedToArray(_step.value, 2),
-            slot = _step$value[0],
-            item = _step$value[1];
-
-        if ((0, _kolmafia.equippedItem)(slot) !== item && (0, _kolmafia.availableAmount)(item) > 0) {
-          (0, _kolmafia.equip)(slot, item);
+    const outfitName = options.useOutfitCaching
+        ? outfitCache.get(entry)
+        : undefined;
+    if (outfitName) {
+        if (!isWearingOutfit(outfitName)) {
+            outfit(outfitName);
+        }
+        const familiarEquip = entry.equipment.get($slot `familiar`);
+        if (familiarEquip)
+            equip(familiarEquip);
+    }
+    else {
+        for (const [slot, item] of entry.equipment) {
+            if (equippedItem(slot) !== item && availableAmount(item) > 0) {
+                equip(slot, item);
+            }
         }
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-
-    if (verifyCached(entry) && options.useOutfitCaching) {
-      var _outfitName = outfitCache.insert(entry);
-
-      _logger.default.info("Saving equipment to outfit ".concat(_outfitName, "."));
-
-      saveOutfit(_outfitName);
-    }
-  }
-
-  if ((0, _kolmafia.equippedAmount)((0, _templateString.$item)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["Crown of Thrones"])))) > 0 && entry.rider.get((0, _templateString.$item)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["Crown of Thrones"]))))) {
-    (0, _kolmafia.enthroneFamiliar)(entry.rider.get((0, _templateString.$item)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["Crown of Thrones"])))) || (0, _templateString.$familiar)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["none"]))));
-  }
-
-  if ((0, _kolmafia.equippedAmount)((0, _templateString.$item)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["Buddy Bjorn"])))) > 0 && entry.rider.get((0, _templateString.$item)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["Buddy Bjorn"]))))) {
-    (0, _kolmafia.bjornifyFamiliar)(entry.rider.get((0, _templateString.$item)(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["Buddy Bjorn"])))) || (0, _templateString.$familiar)(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["none"]))));
-  }
+        if (verifyCached(entry) && options.useOutfitCaching) {
+            const outfitName = outfitCache.insert(entry);
+            logger.info(`Saving equipment to outfit ${outfitName}.`);
+            saveOutfit(outfitName);
+        }
+    }
+    if (equippedAmount($item `Crown of Thrones`) > 0 &&
+        entry.rider.get($item `Crown of Thrones`)) {
+        enthroneFamiliar(entry.rider.get($item `Crown of Thrones`) || $familiar `none`);
+    }
+    if (equippedAmount($item `Buddy Bjorn`) > 0 &&
+        entry.rider.get($item `Buddy Bjorn`)) {
+        bjornifyFamiliar(entry.rider.get($item `Buddy Bjorn`) || $familiar `none`);
+    }
 }
+const slotStructure = [
+    $slots `hat`,
+    $slots `back`,
+    $slots `shirt`,
+    $slots `weapon, off-hand`,
+    $slots `pants`,
+    $slots `acc1, acc2, acc3`,
+    $slots `familiar`,
+];
 /**
  * Verifies that a CacheEntry was applied successfully.
  * @param entry The CacheEntry to verify
  * @returns If all desired equipment was appliedn in the correct slots.
  */
-
-
 function verifyCached(entry) {
-  var success = true;
-
-  var _iterator2 = _createForOfIteratorHelper(entry.equipment),
-      _step2;
-
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var _step2$value = _slicedToArray(_step2.value, 2),
-          slot = _step2$value[0],
-          item = _step2$value[1];
-
-      if ((0, _kolmafia.equippedItem)(slot) !== item) {
-        _logger.default.warning("Failed to apply cached ".concat(item, " in ").concat(slot, "."));
-
-        success = false;
-      }
-    }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
-  }
-
-  if ((0, _kolmafia.equippedAmount)((0, _templateString.$item)(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["Crown of Thrones"])))) > 0 && entry.rider.get((0, _templateString.$item)(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["Crown of Thrones"]))))) {
-    if (entry.rider.get((0, _templateString.$item)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["Crown of Thrones"])))) !== (0, _kolmafia.myEnthronedFamiliar)()) {
-      _logger.default.warning("Failed to apply ".concat(entry.rider.get((0, _templateString.$item)(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["Crown of Thrones"])))), " in ").concat((0, _templateString.$item)(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["Crown of Thrones"]))), "."));
-
-      success = false;
-    }
-  }
-
-  if ((0, _kolmafia.equippedAmount)((0, _templateString.$item)(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["Buddy Bjorn"])))) > 0 && entry.rider.get((0, _templateString.$item)(_templateObject18 || (_templateObject18 = _taggedTemplateLiteral(["Buddy Bjorn"]))))) {
-    if (entry.rider.get((0, _templateString.$item)(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["Buddy Bjorn"])))) !== (0, _kolmafia.myBjornedFamiliar)()) {
-      _logger.default.warning("Failed to apply".concat(entry.rider.get((0, _templateString.$item)(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["Buddy Bjorn"])))), " in ").concat((0, _templateString.$item)(_templateObject21 || (_templateObject21 = _taggedTemplateLiteral(["Buddy Bjorn"]))), "."));
-
-      success = false;
-    }
-  }
-
-  return success;
+    let success = true;
+    for (const slotGroup of slotStructure) {
+        const desiredSet = slotGroup.map((slot) => entry.equipment.get(slot) ?? $item `none`);
+        const equippedSet = slotGroup.map((slot) => equippedItem(slot));
+        if (!setEqual(desiredSet, equippedSet)) {
+            logger.warning(`Failed to apply cached ${desiredSet.join(", ")} in ${slotGroup.join(", ")}.`);
+            success = false;
+        }
+    }
+    if (equippedAmount($item `Crown of Thrones`) > 0 &&
+        entry.rider.get($item `Crown of Thrones`)) {
+        if (entry.rider.get($item `Crown of Thrones`) !== myEnthronedFamiliar()) {
+            logger.warning(`Failed to apply ${entry.rider.get($item `Crown of Thrones`)} in ${$item `Crown of Thrones`}.`);
+            success = false;
+        }
+    }
+    if (equippedAmount($item `Buddy Bjorn`) > 0 &&
+        entry.rider.get($item `Buddy Bjorn`)) {
+        if (entry.rider.get($item `Buddy Bjorn`) !== myBjornedFamiliar()) {
+            logger.warning(`Failed to apply${entry.rider.get($item `Buddy Bjorn`)} in ${$item `Buddy Bjorn`}.`);
+            success = false;
+        }
+    }
+    return success;
 }
 /**
  * Save current equipment to the objective cache.
  * @param cacheKey The cache key to save.
  */
-
-
 function saveCached(cacheKey, options) {
-  var equipment = new Map();
-  var rider = new Map();
-
-  var _iterator3 = _createForOfIteratorHelper(cachedSlots),
-      _step3;
-
-  try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var _slot2 = _step3.value;
-      equipment.set(_slot2, (0, _kolmafia.equippedItem)(_slot2));
-    }
-  } catch (err) {
-    _iterator3.e(err);
-  } finally {
-    _iterator3.f();
-  }
-
-  if ((0, _kolmafia.equippedAmount)((0, _templateString.$item)(_templateObject22 || (_templateObject22 = _taggedTemplateLiteral(["card sleeve"])))) > 0) {
-    equipment.set((0, _templateString.$slot)(_templateObject23 || (_templateObject23 = _taggedTemplateLiteral(["card-sleeve"]))), (0, _kolmafia.equippedItem)((0, _templateString.$slot)(_templateObject24 || (_templateObject24 = _taggedTemplateLiteral(["card-sleeve"])))));
-  }
-
-  if ((0, _kolmafia.equippedAmount)((0, _templateString.$item)(_templateObject25 || (_templateObject25 = _taggedTemplateLiteral(["Crown of Thrones"])))) > 0) {
-    rider.set((0, _templateString.$item)(_templateObject26 || (_templateObject26 = _taggedTemplateLiteral(["Crown of Thrones"]))), (0, _kolmafia.myEnthronedFamiliar)());
-  }
-
-  if ((0, _kolmafia.equippedAmount)((0, _templateString.$item)(_templateObject27 || (_templateObject27 = _taggedTemplateLiteral(["Buddy Bjorn"])))) > 0) {
-    rider.set((0, _templateString.$item)(_templateObject28 || (_templateObject28 = _taggedTemplateLiteral(["Buddy Bjorn"]))), (0, _kolmafia.myBjornedFamiliar)());
-  }
-
-  if (options.preventSlot && options.preventSlot.length > 0) {
-    var _iterator4 = _createForOfIteratorHelper(options.preventSlot),
-        _step4;
-
-    try {
-      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-        var slot = _step4.value;
-        equipment.delete(slot);
-      }
-    } catch (err) {
-      _iterator4.e(err);
-    } finally {
-      _iterator4.f();
-    }
-
-    if (options.preventSlot.includes((0, _templateString.$slot)(_templateObject29 || (_templateObject29 = _taggedTemplateLiteral(["buddy-bjorn"]))))) {
-      rider.delete((0, _templateString.$item)(_templateObject30 || (_templateObject30 = _taggedTemplateLiteral(["Buddy Bjorn"]))));
-    }
-
-    if (options.preventSlot.includes((0, _templateString.$slot)(_templateObject31 || (_templateObject31 = _taggedTemplateLiteral(["crown-of-thrones"]))))) {
-      rider.delete((0, _templateString.$item)(_templateObject32 || (_templateObject32 = _taggedTemplateLiteral(["Crown of Thrones"]))));
-    }
-  }
-
-  if (options.onlySlot && options.onlySlot.length > 0) {
-    var _iterator5 = _createForOfIteratorHelper(Slot.all()),
-        _step5;
-
-    try {
-      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-        var _slot = _step5.value;
-
-        if (!options.onlySlot.includes(_slot)) {
-          equipment.delete(_slot);
+    const equipment = new Map();
+    const rider = new Map();
+    for (const slot of cachedSlots) {
+        equipment.set(slot, equippedItem(slot));
+    }
+    if (equippedAmount($item `card sleeve`) > 0) {
+        equipment.set($slot `card-sleeve`, equippedItem($slot `card-sleeve`));
+    }
+    if (equippedAmount($item `Crown of Thrones`) > 0) {
+        rider.set($item `Crown of Thrones`, myEnthronedFamiliar());
+    }
+    if (equippedAmount($item `Buddy Bjorn`) > 0) {
+        rider.set($item `Buddy Bjorn`, myBjornedFamiliar());
+    }
+    if (options.preventSlot && options.preventSlot.length > 0) {
+        for (const slot of options.preventSlot) {
+            equipment.delete(slot);
+        }
+        if (options.preventSlot.includes($slot `buddy-bjorn`)) {
+            rider.delete($item `Buddy Bjorn`);
+        }
+        if (options.preventSlot.includes($slot `crown-of-thrones`)) {
+            rider.delete($item `Crown of Thrones`);
+        }
+    }
+    if (options.onlySlot && options.onlySlot.length > 0) {
+        for (const slot of Slot.all()) {
+            if (!options.onlySlot.includes(slot)) {
+                equipment.delete(slot);
+            }
+        }
+        if (!options.onlySlot.includes($slot `buddy-bjorn`)) {
+            rider.delete($item `Buddy Bjorn`);
         }
-      }
-    } catch (err) {
-      _iterator5.e(err);
-    } finally {
-      _iterator5.f();
-    }
-
-    if (!options.onlySlot.includes((0, _templateString.$slot)(_templateObject33 || (_templateObject33 = _taggedTemplateLiteral(["buddy-bjorn"]))))) {
-      rider.delete((0, _templateString.$item)(_templateObject34 || (_templateObject34 = _taggedTemplateLiteral(["Buddy Bjorn"]))));
-    }
-
-    if (!options.onlySlot.includes((0, _templateString.$slot)(_templateObject35 || (_templateObject35 = _taggedTemplateLiteral(["crown-of-thrones"]))))) {
-      rider.delete((0, _templateString.$item)(_templateObject36 || (_templateObject36 = _taggedTemplateLiteral(["Crown of Thrones"]))));
-    }
-  }
-
-  var entry = new CacheEntry(equipment, rider, (0, _kolmafia.myFamiliar)(), canEquipItemCount());
-  cachedObjectives[cacheKey] = entry;
-
-  if (options.useOutfitCaching) {
-    var outfitName = outfitCache.insert(entry);
-
-    _logger.default.info("Saving equipment to outfit ".concat(outfitName, "."));
-
-    saveOutfit(outfitName);
-  }
+        if (!options.onlySlot.includes($slot `crown-of-thrones`)) {
+            rider.delete($item `Crown of Thrones`);
+        }
+    }
+    const entry = new CacheEntry(equipment, rider, myFamiliar(), canEquipItemCount());
+    cachedObjectives[cacheKey] = entry;
+    if (options.useOutfitCaching) {
+        const outfitName = outfitCache.insert(entry);
+        logger.info(`Saving equipment to outfit ${outfitName}.`);
+        saveOutfit(outfitName);
+    }
 }
 /**
  * Run the maximizer, but only if the objective and certain pieces of game state haven't changed since it was last run.
@@ -494,147 +273,101 @@ function saveCached(cacheKey, options) {
  * @param options.preventEquip Equipment to prevent equipping ("-equip X").
  * @param options.bonusEquip Equipment to apply a bonus to ("200 bonus X").
  */
-
-
-function maximizeCached(objectives) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-  var fullOptions = _objectSpread(_objectSpread({}, defaultMaximizeOptions), options);
-
-  var forceEquip = fullOptions.forceEquip,
-      preventEquip = fullOptions.preventEquip,
-      bonusEquip = fullOptions.bonusEquip,
-      onlySlot = fullOptions.onlySlot,
-      preventSlot = fullOptions.preventSlot; // Sort each group in objective to ensure consistent ordering in string
-
-  var objective = [].concat(_toConsumableArray(objectives.sort()), _toConsumableArray(forceEquip.map(item => "equip ".concat(item)).sort()), _toConsumableArray(preventEquip.map(item => "-equip ".concat(item)).sort()), _toConsumableArray(onlySlot.filter(slot => !(0, _templateString.$slots)(_templateObject37 || (_templateObject37 = _taggedTemplateLiteral(["buddy-bjorn, crown-of-thrones"]))).includes(slot)).map(slot => "".concat(slot)).sort()), _toConsumableArray(preventSlot.filter(slot => !(0, _templateString.$slots)(_templateObject38 || (_templateObject38 = _taggedTemplateLiteral(["buddy-bjorn, crown-of-thrones"]))).includes(slot)).map(slot => "-".concat(slot)).sort()), _toConsumableArray(Array.from(bonusEquip.entries()).filter(_ref => {
-    var _ref2 = _slicedToArray(_ref, 2),
-        bonus = _ref2[1];
-
-    return bonus !== 0;
-  }).map(_ref3 => {
-    var _ref4 = _slicedToArray(_ref3, 2),
-        item = _ref4[0],
-        bonus = _ref4[1];
-
-    return "".concat(Math.round(bonus * 100) / 100, " bonus ").concat(item);
-  }).sort())).join(", ");
-  var cacheEntry = checkCache(objective, fullOptions);
-
-  if (cacheEntry) {
-    _logger.default.info("Equipment found in maximize cache, equipping...");
-
-    applyCached(cacheEntry, fullOptions);
-
-    if (verifyCached(cacheEntry)) {
-      _logger.default.info("Equipped cached ".concat(objective));
-
-      return;
-    }
-
-    _logger.default.warning("Maximize cache application failed, maximizing...");
-  }
-
-  (0, _kolmafia.maximize)(objective, false);
-  saveCached(objective, fullOptions);
+export function maximizeCached(objectives, options = {}) {
+    const fullOptions = { ...defaultMaximizeOptions, ...options };
+    const { forceEquip, preventEquip, bonusEquip, onlySlot, preventSlot, } = fullOptions;
+    // Sort each group in objective to ensure consistent ordering in string
+    const objective = [
+        ...objectives.sort(),
+        ...forceEquip.map((item) => `equip ${item}`).sort(),
+        ...preventEquip.map((item) => `-equip ${item}`).sort(),
+        ...onlySlot.map((slot) => `${slot}`).sort(),
+        ...preventSlot.map((slot) => `-${slot}`).sort(),
+        ...Array.from(bonusEquip.entries())
+            .filter(([, bonus]) => bonus !== 0)
+            .map(([item, bonus]) => `${Math.round(bonus * 100) / 100} bonus ${item}`)
+            .sort(),
+    ].join(", ");
+    const cacheEntry = checkCache(objective, fullOptions);
+    if (cacheEntry) {
+        logger.info("Equipment found in maximize cache, equipping...");
+        applyCached(cacheEntry, fullOptions);
+        if (verifyCached(cacheEntry)) {
+            logger.info(`Equipped cached ${objective}`);
+            return;
+        }
+        logger.warning("Maximize cache application failed, maximizing...");
+    }
+    maximize(objective, false);
+    saveCached(objective, fullOptions);
 }
-
-var _maximizeParameters = /*#__PURE__*/new WeakMap();
-
-var _maximizeOptions = /*#__PURE__*/new WeakMap();
-
-var Requirement = /*#__PURE__*/function () {
-  /**
-   * A convenient way of combining maximization parameters and options
-   * @param maximizeParameters Parameters you're attempting to maximize
-   * @param maximizeOptions Object potentially containing forceEquips, bonusEquips, preventEquips, and preventSlots
-   */
-  function Requirement(maximizeParameters, maximizeOptions) {
-    _classCallCheck(this, Requirement);
-
-    _maximizeParameters.set(this, {
-      writable: true,
-      value: void 0
-    });
-
-    _maximizeOptions.set(this, {
-      writable: true,
-      value: void 0
-    });
-
-    _classPrivateFieldSet(this, _maximizeParameters, maximizeParameters);
-
-    _classPrivateFieldSet(this, _maximizeOptions, maximizeOptions);
-  }
-
-  _createClass(Requirement, [{
-    key: "maximizeParameters",
-    get: function get() {
-      return _classPrivateFieldGet(this, _maximizeParameters);
-    }
-  }, {
-    key: "maximizeOptions",
-    get: function get() {
-      return _classPrivateFieldGet(this, _maximizeOptions);
+export class Requirement {
+    /**
+     * A convenient way of combining maximization parameters and options
+     * @param maximizeParameters Parameters you're attempting to maximize
+     * @param maximizeOptions Object potentially containing forceEquips, bonusEquips, preventEquips, and preventSlots
+     */
+    constructor(maximizeParameters, maximizeOptions) {
+        this.#maximizeParameters = maximizeParameters;
+        this.#maximizeOptions = maximizeOptions;
+    }
+    #maximizeParameters;
+    #maximizeOptions;
+    get maximizeParameters() {
+        return this.#maximizeParameters;
+    }
+    get maximizeOptions() {
+        return this.#maximizeOptions;
     }
     /**
      * Merges two requirements, concanating relevant arrays. Typically used in static form.
      * @param other Requirement to merge with.
      */
-
-  }, {
-    key: "merge",
-    value: function merge(other) {
-      var _optionsA$forceEquip, _other$maximizeOption, _optionsA$preventEqui, _other$maximizeOption2, _optionsA$bonusEquip$, _optionsA$bonusEquip, _optionsB$bonusEquip$, _optionsB$bonusEquip, _optionsA$onlySlot, _optionsB$onlySlot, _optionsA$preventSlot, _optionsB$preventSlot;
-
-      var optionsA = this.maximizeOptions;
-      var optionsB = other.maximizeOptions;
-      return new Requirement([].concat(_toConsumableArray(this.maximizeParameters), _toConsumableArray(other.maximizeParameters)), {
-        updateOnFamiliarChange: optionsA.updateOnFamiliarChange || other.maximizeOptions.updateOnFamiliarChange,
-        updateOnCanEquipChanged: optionsA.updateOnCanEquipChanged || other.maximizeOptions.updateOnCanEquipChanged,
-        forceEquip: [].concat(_toConsumableArray((_optionsA$forceEquip = optionsA.forceEquip) !== null && _optionsA$forceEquip !== void 0 ? _optionsA$forceEquip : []), _toConsumableArray((_other$maximizeOption = other.maximizeOptions.forceEquip) !== null && _other$maximizeOption !== void 0 ? _other$maximizeOption : [])),
-        preventEquip: [].concat(_toConsumableArray((_optionsA$preventEqui = optionsA.preventEquip) !== null && _optionsA$preventEqui !== void 0 ? _optionsA$preventEqui : []), _toConsumableArray((_other$maximizeOption2 = other.maximizeOptions.preventEquip) !== null && _other$maximizeOption2 !== void 0 ? _other$maximizeOption2 : [])),
-        bonusEquip: new Map([].concat(_toConsumableArray((_optionsA$bonusEquip$ = (_optionsA$bonusEquip = optionsA.bonusEquip) === null || _optionsA$bonusEquip === void 0 ? void 0 : _optionsA$bonusEquip.entries()) !== null && _optionsA$bonusEquip$ !== void 0 ? _optionsA$bonusEquip$ : []), _toConsumableArray((_optionsB$bonusEquip$ = (_optionsB$bonusEquip = optionsB.bonusEquip) === null || _optionsB$bonusEquip === void 0 ? void 0 : _optionsB$bonusEquip.entries()) !== null && _optionsB$bonusEquip$ !== void 0 ? _optionsB$bonusEquip$ : []))),
-        onlySlot: [].concat(_toConsumableArray((_optionsA$onlySlot = optionsA.onlySlot) !== null && _optionsA$onlySlot !== void 0 ? _optionsA$onlySlot : []), _toConsumableArray((_optionsB$onlySlot = optionsB.onlySlot) !== null && _optionsB$onlySlot !== void 0 ? _optionsB$onlySlot : [])),
-        preventSlot: [].concat(_toConsumableArray((_optionsA$preventSlot = optionsA.preventSlot) !== null && _optionsA$preventSlot !== void 0 ? _optionsA$preventSlot : []), _toConsumableArray((_optionsB$preventSlot = optionsB.preventSlot) !== null && _optionsB$preventSlot !== void 0 ? _optionsB$preventSlot : []))
-      });
+    merge(other) {
+        const optionsA = this.maximizeOptions;
+        const optionsB = other.maximizeOptions;
+        return new Requirement([...this.maximizeParameters, ...other.maximizeParameters], {
+            updateOnFamiliarChange: optionsA.updateOnFamiliarChange ||
+                other.maximizeOptions.updateOnFamiliarChange,
+            updateOnCanEquipChanged: optionsA.updateOnCanEquipChanged ||
+                other.maximizeOptions.updateOnCanEquipChanged,
+            forceEquip: [
+                ...(optionsA.forceEquip ?? []),
+                ...(other.maximizeOptions.forceEquip ?? []),
+            ],
+            preventEquip: [
+                ...(optionsA.preventEquip ?? []),
+                ...(other.maximizeOptions.preventEquip ?? []),
+            ],
+            bonusEquip: new Map([
+                ...(optionsA.bonusEquip?.entries() ?? []),
+                ...(optionsB.bonusEquip?.entries() ?? []),
+            ]),
+            onlySlot: [...(optionsA.onlySlot ?? []), ...(optionsB.onlySlot ?? [])],
+            preventSlot: [
+                ...(optionsA.preventSlot ?? []),
+                ...(optionsB.preventSlot ?? []),
+            ],
+        });
     }
     /**
      * Merges a set of requirements together, starting with an empty requirement.
      * @param allRequirements Requirements to merge
      */
-
-  }, {
-    key: "maximize",
-    value:
+    static merge(allRequirements) {
+        return allRequirements.reduce((x, y) => x.merge(y), new Requirement([], {}));
+    }
     /**
      * Runs maximizeCached, using the maximizeParameters and maximizeOptions contained by this requirement.
      */
-    function maximize() {
-      maximizeCached(this.maximizeParameters, this.maximizeOptions);
+    maximize() {
+        maximizeCached(this.maximizeParameters, this.maximizeOptions);
     }
     /**
      * Merges requirements, and then runs maximizeCached on the combined requirement.
      * @param requirements Requirements to maximize on
      */
-
-  }], [{
-    key: "merge",
-    value: function merge(allRequirements) {
-      return allRequirements.reduce((x, y) => x.merge(y), new Requirement([], {}));
-    }
-  }, {
-    key: "maximize",
-    value: function maximize() {
-      for (var _len = arguments.length, requirements = new Array(_len), _key = 0; _key < _len; _key++) {
-        requirements[_key] = arguments[_key];
-      }
-
-      Requirement.merge(requirements).maximize();
-    }
-  }]);
-
-  return Requirement;
-}();
-
-exports.Requirement = Requirement;
+    static maximize(...requirements) {
+        Requirement.merge(requirements).maximize();
+    }
+}