libram 0.4.1 → 0.4.5

package/dist/combat.js

@@ -1,128 +1,66 @@
-"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.array.iterator.js");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getMacroId = getMacroId;
-exports.adventureMacro = adventureMacro;
-exports.adventureMacroAuto = adventureMacroAuto;
-exports.Macro = void 0;
-
-require("core-js/modules/es.array.map.js");
-
-require("core-js/modules/es.array.includes.js");
-
-require("core-js/modules/es.string.includes.js");
-
-require("core-js/modules/es.object.to-string.js");
-
-require("core-js/modules/es.regexp.to-string.js");
-
-require("core-js/modules/es.regexp.exec.js");
-
-require("core-js/modules/es.string.match.js");
-
-require("core-js/modules/es.array.concat.js");
-
-require("core-js/modules/es.array.filter.js");
-
-require("core-js/modules/es.string.split.js");
-
-var _kolmafia = require("kolmafia");
-
-var _templateString = require("./template-string");
-
-var _property = require("./property");
-
-var _templateObject, _templateObject2;
-
-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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-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 _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 MACRO_NAME = "Script Autoattack Macro";
+import { adv1, choiceFollowsFight, getAutoAttack, inMultiFight, removeProperty, runCombat, setAutoAttack, toInt, urlEncode, visitUrl, xpath, } from "kolmafia";
+import { $items, $skills } from "./template-string";
+import { get, set } from "./property";
+import { getTodaysHolidayWanderers } from "./lib";
+const MACRO_NAME = "Script Autoattack Macro";
 /**
  * Get the KoL native ID of the macro with name Script Autoattack Macro.
  *
  * @category Combat
  * @returns {number} The macro ID.
  */
-
-function getMacroId() {
-  var macroMatches = (0, _kolmafia.xpath)((0, _kolmafia.visitUrl)("account_combatmacros.php"), "//select[@name=\"macroid\"]/option[text()=\"".concat(MACRO_NAME, "\"]/@value"));
-
-  if (macroMatches.length === 0) {
-    (0, _kolmafia.visitUrl)("account_combatmacros.php?action=new");
-    var newMacroText = (0, _kolmafia.visitUrl)("account_combatmacros.php?macroid=0&name=".concat(MACRO_NAME, "&macrotext=abort&action=save"));
-    return parseInt((0, _kolmafia.xpath)(newMacroText, "//input[@name=macroid]/@value")[0], 10);
-  } else {
-    return parseInt(macroMatches[0], 10);
-  }
+export function getMacroId() {
+    const macroMatches = xpath(visitUrl("account_combatmacros.php"), `//select[@name="macroid"]/option[text()="${MACRO_NAME}"]/@value`);
+    if (macroMatches.length === 0) {
+        visitUrl("account_combatmacros.php?action=new");
+        const newMacroText = visitUrl(`account_combatmacros.php?macroid=0&name=${MACRO_NAME}&macrotext=abort&action=save`);
+        return parseInt(xpath(newMacroText, "//input[@name=macroid]/@value")[0], 10);
+    }
+    else {
+        return parseInt(macroMatches[0], 10);
+    }
 }
-
 function itemOrNameToItem(itemOrName) {
-  return typeof itemOrName === "string" ? Item.get(itemOrName) : itemOrName;
+    return typeof itemOrName === "string" ? Item.get(itemOrName) : itemOrName;
 }
-
-var substringCombatItems = (0, _templateString.$items)(_templateObject || (_templateObject = _taggedTemplateLiteral(["spider web, really sticky spider web, dictionary, NG, Cloaca-Cola, yo-yo, top, ball, kite, yo, red potion, blue potion, adder, red button, pile of sand, mushroom, deluxe mushroom"])));
-var substringCombatSkills = (0, _templateString.$skills)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["Shoot, Thrust-Smack, Headbutt, Toss, Sing, Disarm, LIGHT, BURN, Extract, Meteor Shower, Cleave, Boil, Slice, Rainbow"])));
-
+const substringCombatItems = $items `spider web, really sticky spider web, dictionary, NG, Cloaca-Cola, yo-yo, top, ball, kite, yo, red potion, blue potion, adder, red button, pile of sand, mushroom, deluxe mushroom`;
+const substringCombatSkills = $skills `Shoot, Thrust-Smack, Headbutt, Toss, Sing, Disarm, LIGHT, BURN, Extract, Meteor Shower, Cleave, Boil, Slice, Rainbow`;
 function itemOrItemsBallsMacroName(itemOrItems) {
-  if (Array.isArray(itemOrItems)) {
-    return itemOrItems.map(itemOrItemsBallsMacroName).join(", ");
-  } else {
-    var item = itemOrNameToItem(itemOrItems);
-    return !substringCombatItems.includes(item) ? item.name : (0, _kolmafia.toInt)(item).toString();
-  }
+    if (Array.isArray(itemOrItems)) {
+        return itemOrItems.map(itemOrItemsBallsMacroName).join(", ");
+    }
+    else {
+        const item = itemOrNameToItem(itemOrItems);
+        return !substringCombatItems.includes(item)
+            ? item.name
+            : toInt(item).toString();
+    }
 }
-
 function itemOrItemsBallsMacroPredicate(itemOrItems) {
-  if (Array.isArray(itemOrItems)) {
-    return itemOrItems.map(itemOrItemsBallsMacroPredicate).join(" && ");
-  } else {
-    return "hascombatitem ".concat(itemOrItems);
-  }
+    if (Array.isArray(itemOrItems)) {
+        return itemOrItems.map(itemOrItemsBallsMacroPredicate).join(" && ");
+    }
+    else {
+        return `hascombatitem ${itemOrItems}`;
+    }
 }
-
 function skillOrNameToSkill(skillOrName) {
-  if (typeof skillOrName === "string") {
-    return Skill.get(skillOrName);
-  } else {
-    return skillOrName;
-  }
+    if (typeof skillOrName === "string") {
+        return Skill.get(skillOrName);
+    }
+    else {
+        return skillOrName;
+    }
 }
-
 function skillBallsMacroName(skillOrName) {
-  var skill = skillOrNameToSkill(skillOrName);
-  return skill.name.match(/^[A-Za-z ]+$/) && !substringCombatSkills.includes(skill) ? skill.name : (0, _kolmafia.toInt)(skill);
+    const skill = skillOrNameToSkill(skillOrName);
+    return skill.name.match(/^[A-Za-z ]+$/) &&
+        !substringCombatSkills.includes(skill)
+        ? skill.name
+        : toInt(skill);
+}
+export class InvalidMacroError extends Error {
 }
-
 /**
  * BALLS macro builder for direct submission to KoL.
  * Create a new macro with `new Macro()` and add steps using the instance methods.
@@ -130,115 +68,149 @@ function skillBallsMacroName(skillOrName) {
  * Each method is also defined as a static method that creates a new Macro with only that step.
  * For example, you can do `Macro.skill('Saucestorm').attack()`.
  */
-var Macro = /*#__PURE__*/function () {
-  function Macro() {
-    _classCallCheck(this, Macro);
-
-    _defineProperty(this, "components", []);
-  }
-
-  _createClass(Macro, [{
-    key: "toString",
-    value:
+export class Macro {
+    static SAVED_MACRO_PROPERTY = "libram_savedMacro";
+    static cachedMacroId = null;
+    static cachedAutoAttack = null;
+    components = [];
     /**
      * Convert macro to string.
      */
-    function toString() {
-      return this.components.join(";");
+    toString() {
+        return this.components.join(";");
     }
     /**
      * Save a macro to a Mafia property for use in a consult script.
      */
-
-  }, {
-    key: "save",
-    value: function save() {
-      (0, _property.set)(Macro.SAVED_MACRO_PROPERTY, this.toString());
+    save() {
+        set(Macro.SAVED_MACRO_PROPERTY, this.toString());
     }
     /**
      * Load a saved macro from the Mafia property.
      */
-
-  }, {
-    key: "step",
-    value:
+    static load() {
+        return new this().step(...get(Macro.SAVED_MACRO_PROPERTY).split(";"));
+    }
+    /**
+     * Clear the saved macro in the Mafia property.
+     */
+    static clearSaved() {
+        removeProperty(Macro.SAVED_MACRO_PROPERTY);
+    }
     /**
      * Statefully add one or several steps to a macro.
      * @param nextSteps The steps to add to the macro.
      * @returns {Macro} This object itself.
      */
-    function step() {
-      var _ref;
-
-      for (var _len = arguments.length, nextSteps = new Array(_len), _key = 0; _key < _len; _key++) {
-        nextSteps[_key] = arguments[_key];
-      }
-
-      var nextStepsStrings = (_ref = []).concat.apply(_ref, _toConsumableArray(nextSteps.map(x => x instanceof Macro ? x.components : [x])));
-
-      this.components = [].concat(_toConsumableArray(this.components), _toConsumableArray(nextStepsStrings.filter(s => s.length > 0)));
-      return this;
+    step(...nextSteps) {
+        const nextStepsStrings = [].concat(...nextSteps.map((x) => (x instanceof Macro ? x.components : [x])));
+        this.components = [
+            ...this.components,
+            ...nextStepsStrings.filter((s) => s.length > 0),
+        ];
+        return this;
     }
     /**
      * Statefully add one or several steps to a macro.
      * @param nextSteps The steps to add to the macro.
      * @returns {Macro} This object itself.
      */
-
-  }, {
-    key: "submit",
-    value:
+    static step(...nextSteps) {
+        return new this().step(...nextSteps);
+    }
     /**
      * Submit the built macro to KoL. Only works inside combat.
      */
-    function submit() {
-      var final = this.toString();
-      return (0, _kolmafia.visitUrl)("fight.php?action=macro&macrotext=".concat((0, _kolmafia.urlEncode)(final)), true, true);
+    submit() {
+        const final = this.toString();
+        return visitUrl(`fight.php?action=macro&macrotext=${urlEncode(final)}`, true, true);
     }
     /**
      * Set this macro as a KoL native autoattack.
      */
-
-  }, {
-    key: "setAutoAttack",
-    value: function setAutoAttack() {
-      if (Macro.cachedMacroId === null) Macro.cachedMacroId = getMacroId();
-
-      if ((0, _kolmafia.getAutoAttack)() === 99000000 + Macro.cachedMacroId && this.toString() === Macro.cachedAutoAttack) {
-        // This macro is already set. Don"t make the server request.
-        return;
-      }
-
-      (0, _kolmafia.visitUrl)("account_combatmacros.php?macroid=".concat(Macro.cachedMacroId, "&name=").concat((0, _kolmafia.urlEncode)(MACRO_NAME), "&macrotext=").concat((0, _kolmafia.urlEncode)(this.toString()), "&action=save"), true, true);
-      (0, _kolmafia.visitUrl)("account.php?am=1&action=autoattack&value=".concat(99000000 + Macro.cachedMacroId, "&ajax=1"));
-      Macro.cachedAutoAttack = this.toString();
+    setAutoAttack() {
+        if (Macro.cachedMacroId === null)
+            Macro.cachedMacroId = getMacroId();
+        if (getAutoAttack() === 99000000 + Macro.cachedMacroId &&
+            this.toString() === Macro.cachedAutoAttack) {
+            // This macro is already set. Don"t make the server request.
+            return;
+        }
+        visitUrl(`account_combatmacros.php?macroid=${Macro.cachedMacroId}&name=${urlEncode(MACRO_NAME)}&macrotext=${urlEncode(this.toString())}&action=save`, true, true);
+        visitUrl(`account.php?am=1&action=autoattack&value=${99000000 + Macro.cachedMacroId}&ajax=1`);
+        Macro.cachedAutoAttack = this.toString();
     }
     /**
      * Add an "abort" step to this macro.
      * @returns {Macro} This object itself.
      */
-
-  }, {
-    key: "abort",
-    value: function abort() {
-      return this.step("abort");
+    abort() {
+        return this.step("abort");
     }
     /**
      * Create a new macro with an "abort" step.
      * @returns {Macro} This object itself.
      */
-
-  }, {
-    key: "if_",
-    value:
+    static abort() {
+        return new this().abort();
+    }
+    /**
+     * Add a "runaway" step to this macro.
+     * @returns {Macro} This object itself.
+     */
+    runaway() {
+        return this.step("runaway");
+    }
+    /**
+     * Create a new macro with an "runaway" step.
+     * @returns {Macro} This object itself.
+     */
+    static runaway() {
+        return new this().runaway();
+    }
     /**
      * Add an "if" statement to this macro.
      * @param condition The BALLS condition for the if statement.
      * @param ifTrue Continuation if the condition is true.
      * @returns {Macro} This object itself.
      */
-    function if_(condition, ifTrue) {
-      return this.step("if ".concat(condition)).step(ifTrue).step("endif");
+    if_(condition, ifTrue) {
+        let ballsCondition = "";
+        if (condition instanceof Monster) {
+            ballsCondition = `monsterid ${condition.id}`;
+        }
+        else if (condition instanceof Effect) {
+            ballsCondition = `haseffect ${toInt(condition)}`;
+        }
+        else if (condition instanceof Skill) {
+            ballsCondition = `hasskill ${skillBallsMacroName(condition)}`;
+        }
+        else if (condition instanceof Item) {
+            if (!condition.combat) {
+                throw new InvalidMacroError(`Item ${condition} cannot be made a valid BALLS predicate (it is not combat-usable)`);
+            }
+            ballsCondition = `hascombatitem ${itemOrItemsBallsMacroName(condition)}`;
+        }
+        else if (condition instanceof Location) {
+            const snarfblat = condition.id;
+            if (snarfblat < 1) {
+                throw new InvalidMacroError(`Location ${condition} cannot be made a valid BALLS predicate (it has no location id)`);
+            }
+            ballsCondition = `snarfblat ${snarfblat}`;
+        }
+        else if (condition instanceof Class) {
+            if (toInt(condition) > 6) {
+                throw new InvalidMacroError(`Class ${condition} cannot be made a valid BALLS predicate (it is not a standard class)`);
+            }
+            ballsCondition = condition.toString().replaceAll(" ", "").toLowerCase();
+        }
+        else if (condition instanceof Stat) {
+            ballsCondition = `${condition.toString().toLowerCase()}class`;
+        }
+        else {
+            ballsCondition = condition;
+        }
+        return this.step(`if ${ballsCondition}`).step(ifTrue).step("endif");
     }
     /**
      * Create a new macro with an "if" statement.
@@ -246,18 +218,17 @@ var Macro = /*#__PURE__*/function () {
      * @param ifTrue Continuation if the condition is true.
      * @returns {Macro} This object itself.
      */
-
-  }, {
-    key: "while_",
-    value:
+    static if_(condition, ifTrue) {
+        return new this().if_(condition, ifTrue);
+    }
     /**
      * Add a "while" statement to this macro.
      * @param condition The BALLS condition for the if statement.
      * @param contents Loop to repeat while the condition is true.
      * @returns {Macro} This object itself.
      */
-    function while_(condition, contents) {
-      return this.step("while ".concat(condition)).step(contents).step("endwhile");
+    while_(condition, contents) {
+        return this.step(`while ${condition}`).step(contents).step("endwhile");
     }
     /**
      * Create a new macro with a "while" statement.
@@ -265,10 +236,9 @@ var Macro = /*#__PURE__*/function () {
      * @param contents Loop to repeat while the condition is true.
      * @returns {Macro} This object itself.
      */
-
-  }, {
-    key: "externalIf",
-    value:
+    static while_(condition, contents) {
+        return new this().while_(condition, contents);
+    }
     /**
      * Conditionally add a step to a macro based on a condition evaluated at the time of building the macro.
      * @param condition The JS condition.
@@ -276,243 +246,170 @@ var Macro = /*#__PURE__*/function () {
      * @param ifFalse Optional input to turn this into an if...else statement.
      * @returns {Macro} This object itself.
      */
-    function externalIf(condition, ifTrue, ifFalse) {
-      if (condition) return this.step(ifTrue);else if (ifFalse) return this.step(ifFalse);else return this;
+    externalIf(condition, ifTrue, ifFalse) {
+        if (condition)
+            return this.step(ifTrue);
+        else if (ifFalse)
+            return this.step(ifFalse);
+        else
+            return this;
     }
     /**
      * Create a new macro with a condition evaluated at the time of building the macro.
      * @param condition The JS condition.
      * @param ifTrue Continuation to add if the condition is true.
+     * @param ifFalse Optional input to turn this into an if...else statement.
      * @returns {Macro} This object itself.
      */
-
-  }, {
-    key: "repeat",
-    value:
+    static externalIf(condition, ifTrue, ifFalse) {
+        return new this().externalIf(condition, ifTrue, ifFalse);
+    }
     /**
      * Add a repeat step to the macro.
      * @returns {Macro} This object itself.
      */
-    function repeat() {
-      return this.step("repeat");
+    repeat() {
+        return this.step("repeat");
     }
     /**
      * Add one or more skill cast steps to the macro.
      * @param skills Skills to cast.
      * @returns {Macro} This object itself.
      */
-
-  }, {
-    key: "skill",
-    value: function skill() {
-      for (var _len2 = arguments.length, skills = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-        skills[_key2] = arguments[_key2];
-      }
-
-      return this.step.apply(this, _toConsumableArray(skills.map(skill => {
-        return "skill ".concat(skillBallsMacroName(skill));
-      })));
+    skill(...skills) {
+        return this.step(...skills.map((skill) => {
+            return `skill ${skillBallsMacroName(skill)}`;
+        }));
     }
     /**
      * Create a new macro with one or more skill cast steps.
      * @param skills Skills to cast.
      * @returns {Macro} This object itself.
      */
-
-  }, {
-    key: "trySkill",
-    value:
+    static skill(...skills) {
+        return new this().skill(...skills);
+    }
     /**
      * Add one or more skill cast steps to the macro, where each step checks if you have the skill first.
      * @param skills Skills to try casting.
      * @returns {Macro} This object itself.
      */
-    function trySkill() {
-      for (var _len3 = arguments.length, skills = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-        skills[_key3] = arguments[_key3];
-      }
-
-      return this.step.apply(this, _toConsumableArray(skills.map(skill => {
-        return Macro.if_("hasskill ".concat(skillBallsMacroName(skill)), Macro.skill(skill));
-      })));
+    trySkill(...skills) {
+        return this.step(...skills.map((skill) => {
+            return Macro.if_(`hasskill ${skillBallsMacroName(skill)}`, Macro.skill(skill));
+        }));
     }
     /**
      * Create a new macro with one or more skill cast steps, where each step checks if you have the skill first.
      * @param skills Skills to try casting.
      * @returns {Macro} This object itself.
      */
-
-  }, {
-    key: "trySkillRepeat",
-    value:
+    static trySkill(...skills) {
+        return new this().trySkill(...skills);
+    }
     /**
      * Add one or more skill-cast-and-repeat steps to the macro, where each step checks if you have the skill first.
      * @param skills Skills to try repeatedly casting.
      * @returns {Macro} This object itself.
      */
-    function trySkillRepeat() {
-      for (var _len4 = arguments.length, skills = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-        skills[_key4] = arguments[_key4];
-      }
-
-      return this.step.apply(this, _toConsumableArray(skills.map(skill => {
-        return Macro.if_("hasskill ".concat(skillBallsMacroName(skill)), Macro.skill(skill).repeat());
-      })));
+    trySkillRepeat(...skills) {
+        return this.step(...skills.map((skill) => {
+            return Macro.if_(`hasskill ${skillBallsMacroName(skill)}`, Macro.skill(skill).repeat());
+        }));
     }
     /**
      * Create a new macro with one or more skill-cast-and-repeat steps, where each step checks if you have the skill first.
      * @param skills Skills to try repeatedly casting.
      * @returns {Macro} This object itself.
      */
-
-  }, {
-    key: "item",
-    value:
+    static trySkillRepeat(...skills) {
+        return new this().trySkillRepeat(...skills);
+    }
     /**
      * Add one or more item steps to the macro.
      * @param items Items to use. Pass a tuple [item1, item2] to funksling.
      * @returns {Macro} This object itself.
      */
-    function item() {
-      for (var _len5 = arguments.length, items = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-        items[_key5] = arguments[_key5];
-      }
-
-      return this.step.apply(this, _toConsumableArray(items.map(itemOrItems => {
-        return "use ".concat(itemOrItemsBallsMacroName(itemOrItems));
-      })));
+    item(...items) {
+        return this.step(...items.map((itemOrItems) => {
+            return `use ${itemOrItemsBallsMacroName(itemOrItems)}`;
+        }));
     }
     /**
      * Create a new macro with one or more item steps.
      * @param items Items to use. Pass a tuple [item1, item2] to funksling.
      * @returns {Macro} This object itself.
      */
-
-  }, {
-    key: "tryItem",
-    value:
+    static item(...items) {
+        return new this().item(...items);
+    }
     /**
      * Add one or more item steps to the macro, where each step checks to see if you have the item first.
      * @param items Items to try using. Pass a tuple [item1, item2] to funksling.
      * @returns {Macro} This object itself.
      */
-    function tryItem() {
-      for (var _len6 = arguments.length, items = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
-        items[_key6] = arguments[_key6];
-      }
-
-      return this.step.apply(this, _toConsumableArray(items.map(item => {
-        return Macro.if_(itemOrItemsBallsMacroPredicate(item), "use ".concat(itemOrItemsBallsMacroName(item)));
-      })));
+    tryItem(...items) {
+        return this.step(...items.map((item) => {
+            return Macro.if_(itemOrItemsBallsMacroPredicate(item), `use ${itemOrItemsBallsMacroName(item)}`);
+        }));
     }
     /**
      * Create a new macro with one or more item steps, where each step checks to see if you have the item first.
      * @param items Items to try using. Pass a tuple [item1, item2] to funksling.
      * @returns {Macro} This object itself.
      */
-
-  }, {
-    key: "attack",
-    value:
+    static tryItem(...items) {
+        return new this().tryItem(...items);
+    }
     /**
      * Add an attack step to the macro.
      * @returns {Macro} This object itself.
      */
-    function attack() {
-      return this.step("attack");
+    attack() {
+        return this.step("attack");
     }
     /**
      * Create a new macro with an attack step.
      * @returns {Macro} This object itself.
      */
-
-  }], [{
-    key: "load",
-    value: function load() {
-      var _this;
-
-      return (_this = new this()).step.apply(_this, _toConsumableArray((0, _property.get)(Macro.SAVED_MACRO_PROPERTY).split(";")));
+    static attack() {
+        return new this().attack();
     }
     /**
-     * Clear the saved macro in the Mafia property.
+     * Create an if_ statement based on what holiday of loathing it currently is. On non-holidays, returns the original macro, unmutated.
+     * @param macro The macro to place in the if_ statement
+     */
+    ifHolidayWanderer(macro) {
+        const todaysWanderers = getTodaysHolidayWanderers();
+        if (todaysWanderers.length === 0)
+            return this;
+        return this.if_(todaysWanderers.map((monster) => `monsterid ${monster.id}`).join(" || "), macro);
+    }
+    /**
+     * Create a new macro starting with an ifHolidayWanderer step.
+     * @param macro The macro to place inside the if_ statement
      */
-
-  }, {
-    key: "clearSaved",
-    value: function clearSaved() {
-      (0, _kolmafia.removeProperty)(Macro.SAVED_MACRO_PROPERTY);
-    }
-  }, {
-    key: "step",
-    value: function step() {
-      var _this2;
-
-      return (_this2 = new this()).step.apply(_this2, arguments);
-    }
-  }, {
-    key: "abort",
-    value: function abort() {
-      return new this().abort();
-    }
-  }, {
-    key: "if_",
-    value: function if_(condition, ifTrue) {
-      return new this().if_(condition, ifTrue);
-    }
-  }, {
-    key: "while_",
-    value: function while_(condition, contents) {
-      return new this().while_(condition, contents);
-    }
-  }, {
-    key: "externalIf",
-    value: function externalIf(condition, ifTrue) {
-      return new this().externalIf(condition, ifTrue);
-    }
-  }, {
-    key: "skill",
-    value: function skill() {
-      var _this3;
-
-      return (_this3 = new this()).skill.apply(_this3, arguments);
-    }
-  }, {
-    key: "trySkill",
-    value: function trySkill() {
-      var _this4;
-
-      return (_this4 = new this()).trySkill.apply(_this4, arguments);
-    }
-  }, {
-    key: "trySkillRepeat",
-    value: function trySkillRepeat() {
-      var _this5;
-
-      return (_this5 = new this()).trySkillRepeat.apply(_this5, arguments);
-    }
-  }, {
-    key: "item",
-    value: function item() {
-      var _this6;
-
-      return (_this6 = new this()).item.apply(_this6, arguments);
-    }
-  }, {
-    key: "tryItem",
-    value: function tryItem() {
-      var _this7;
-
-      return (_this7 = new this()).tryItem.apply(_this7, arguments);
-    }
-  }, {
-    key: "attack",
-    value: function attack() {
-      return new this().attack();
-    }
-  }]);
-
-  return Macro;
-}();
+    static ifHolidayWanderer(macro) {
+        return new this().ifHolidayWanderer(macro);
+    }
+    /**
+     * Create an if_ statement based on what holiday of loathing it currently is. On non-holidays, returns the original macro, with the input macro appended.
+     * @param macro The macro to place in the if_ statement.
+     */
+    ifNotHolidayWanderer(macro) {
+        const todaysWanderers = getTodaysHolidayWanderers();
+        if (todaysWanderers.length === 0)
+            return this.step(macro);
+        return this.if_(todaysWanderers.map((monster) => `!monsterid ${monster.id}`).join(" && "), macro);
+    }
+    /**
+     * Create a new macro starting with an ifNotHolidayWanderer step.
+     * @param macro The macro to place inside the if_ statement
+     */
+    static ifNotHolidayWanderer(macro) {
+        return new this().ifNotHolidayWanderer(macro);
+    }
+}
 /**
  * Adventure in a location and handle all combats with a given macro.
  * To use this function you will need to create a consult script that runs Macro.load().submit() and a CCS that calls that consult script.
@@ -522,31 +419,19 @@ var Macro = /*#__PURE__*/function () {
  * @param loc Location to adventure in.
  * @param macro Macro to execute.
  */
-
-
-exports.Macro = Macro;
-
-_defineProperty(Macro, "SAVED_MACRO_PROPERTY", "libram_savedMacro");
-
-_defineProperty(Macro, "cachedMacroId", null);
-
-_defineProperty(Macro, "cachedAutoAttack", null);
-
-function adventureMacro(loc, macro) {
-  macro.save();
-  (0, _kolmafia.setAutoAttack)(0);
-
-  try {
-    (0, _kolmafia.adv1)(loc, 0, "");
-
-    while ((0, _kolmafia.inMultiFight)()) {
-      (0, _kolmafia.runCombat)();
-    }
-
-    if ((0, _kolmafia.choiceFollowsFight)()) (0, _kolmafia.visitUrl)("choice.php");
-  } finally {
-    Macro.clearSaved();
-  }
+export function adventureMacro(loc, macro) {
+    macro.save();
+    setAutoAttack(0);
+    try {
+        adv1(loc, 0, "");
+        while (inMultiFight())
+            runCombat();
+        if (choiceFollowsFight())
+            visitUrl("choice.php");
+    }
+    finally {
+        Macro.clearSaved();
+    }
 }
 /**
  * Adventure in a location and handle all combats with a given autoattack and manual macro.
@@ -558,25 +443,102 @@ function adventureMacro(loc, macro) {
  * @param autoMacro Macro to execute via KoL autoattack.
  * @param nextMacro Macro to execute manually after autoattack completes.
  */
-
-
-function adventureMacroAuto(loc, autoMacro) {
-  var _nextMacro;
-
-  var nextMacro = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-  nextMacro = (_nextMacro = nextMacro) !== null && _nextMacro !== void 0 ? _nextMacro : Macro.abort();
-  autoMacro.setAutoAttack();
-  nextMacro.save();
-
-  try {
-    (0, _kolmafia.adv1)(loc, 0, "");
-
-    while ((0, _kolmafia.inMultiFight)()) {
-      (0, _kolmafia.runCombat)();
-    }
-
-    if ((0, _kolmafia.choiceFollowsFight)()) (0, _kolmafia.visitUrl)("choice.php");
-  } finally {
-    Macro.clearSaved();
-  }
-}
+export function adventureMacroAuto(loc, autoMacro, nextMacro = null) {
+    nextMacro = nextMacro ?? Macro.abort();
+    autoMacro.setAutoAttack();
+    nextMacro.save();
+    try {
+        adv1(loc, 0, "");
+        while (inMultiFight())
+            runCombat();
+        if (choiceFollowsFight())
+            visitUrl("choice.php");
+    }
+    finally {
+        Macro.clearSaved();
+    }
+}
+export class StrictMacro extends Macro {
+    /**
+     * Add one or more skill cast steps to the macro.
+     * @param skills Skills to cast.
+     * @returns {StrictMacro} This object itself.
+     */
+    skill(...skills) {
+        return super.skill(...skills);
+    }
+    /**
+     * Create a new macro with one or more skill cast steps.
+     * @param skills Skills to cast.
+     * @returns {StrictMacro} This object itself.
+     */
+    static skill(...skills) {
+        return new this().skill(...skills);
+    }
+    /**
+     * Add one or more item steps to the macro.
+     * @param items Items to use. Pass a tuple [item1, item2] to funksling.
+     * @returns {StrictMacro} This object itself.
+     */
+    item(...items) {
+        return super.item(...items);
+    }
+    /**
+     * Create a new macro with one or more item steps.
+     * @param items Items to use. Pass a tuple [item1, item2] to funksling.
+     * @returns {StrictMacro} This object itself.
+     */
+    static item(...items) {
+        return new this().item(...items);
+    }
+    /**
+     * Add one or more skill cast steps to the macro, where each step checks if you have the skill first.
+     * @param skills Skills to try casting.
+     * @returns {StrictMacro} This object itself.
+     */
+    trySkill(...skills) {
+        return super.trySkill(...skills);
+    }
+    /**
+     * Create a new macro with one or more skill cast steps, where each step checks if you have the skill first.
+     * @param skills Skills to try casting.
+     * @returns {StrictMacro} This object itself.
+     */
+    static trySkill(...skills) {
+        return new this().trySkill(...skills);
+    }
+    /**
+     * Add one or more item steps to the macro, where each step checks to see if you have the item first.
+     * @param items Items to try using. Pass a tuple [item1, item2] to funksling.
+     * @returns {StrictMacro} This object itself.
+     */
+    tryItem(...items) {
+        return super.tryItem(...items);
+    }
+    /**
+     * Create a new macro with one or more item steps, where each step checks to see if you have the item first.
+     * @param items Items to try using. Pass a tuple [item1, item2] to funksling.
+     * @returns {StrictMacro} This object itself.
+     */
+    static tryItem(...items) {
+        return new this().tryItem(...items);
+    }
+    /**
+     * Add one or more skill-cast-and-repeat steps to the macro, where each step checks if you have the skill first.
+     * @param skills Skills to try repeatedly casting.
+     * @returns {StrictMacro} This object itself.
+     */
+    trySkillRepeat(...skills) {
+        return this.step(...skills.map((skill) => {
+            return StrictMacro.if_(`hasskill ${skillBallsMacroName(skill)}`, StrictMacro.skill(skill).repeat());
+        }));
+    }
+    /**
+     * Create a new macro with one or more skill-cast-and-repeat steps, where each step checks if you have the skill first.
+     * @param skills Skills to try repeatedly casting.
+     * @returns {StrictMacro} This object itself.
+     */
+    static trySkillRepeat(...skills) {
+        return new this().trySkillRepeat(...skills);
+    }
+}