libram 0.7.3 → 0.7.4

package/dist/combat.d.ts

@@ -7,6 +7,7 @@ import { Class, Effect, Item, Location, Monster, Skill, Stat } from "kolmafia";
  */
 export declare function getMacroId(name?: string): number;
 declare type ItemOrName = Item | string;
+declare type PreBALLSPredicate = string | Monster | Monster[] | Effect | Skill | Item | Location | Class | Stat;
 declare type SkillOrName = Skill | string;
 declare type Constructor<T> = {
     new (): T;
@@ -97,20 +98,35 @@ export declare class Macro {
      * @returns {Macro} This object itself.
      */
     static runaway<T extends Macro>(this: Constructor<T>): T;
+    private static makeBALLSPredicate;
     /**
      * 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.
      */
-    if_(condition: string | Monster | Monster[] | Effect | Skill | Item | Location | Class | Stat, ifTrue: string | Macro): this;
+    if_(condition: PreBALLSPredicate, ifTrue: string | Macro): this;
     /**
      * Create a new macro with an "if" statement.
      * @param condition The BALLS condition for the if statement.
      * @param ifTrue Continuation if the condition is true.
      * @returns {Macro} This object itself.
      */
-    static if_<T extends Macro>(this: Constructor<T>, condition: Parameters<T["if_"]>[0], ifTrue: string | Macro): T;
+    static if_<T extends Macro>(this: Constructor<T>, condition: PreBALLSPredicate, ifTrue: string | Macro): T;
+    /**
+     * Add an "if" statement to this macro, inverting the condition.
+     * @param condition The BALLS condition for the if statement.
+     * @param ifTrue Continuation if the condition is true.
+     * @returns {Macro} This object itself.
+     */
+    ifNot(condition: PreBALLSPredicate, ifTrue: string | Macro): this;
+    /**
+     * Create a new macro with an "if" statement, inverting the condition.
+     * @param condition The BALLS condition for the if statement.
+     * @param ifTrue Continuation if the condition is true.
+     * @returns {Macro} This object itself.
+     */
+    static ifNot<T extends Macro>(this: Constructor<T>, condition: PreBALLSPredicate, ifTrue: string | Macro): T;
     /**
      * Add a "while" statement to this macro.
      * @param condition The BALLS condition for the if statement.

package/dist/combat.js

@@ -198,13 +198,7 @@ export class Macro {
     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.
-     */
-    if_(condition, ifTrue) {
+    static makeBALLSPredicate(condition) {
         let ballsCondition = "";
         if (condition instanceof Monster) {
             ballsCondition = `monsterid ${condition.id}`;
@@ -246,7 +240,18 @@ export class Macro {
         else {
             ballsCondition = condition;
         }
-        return this.step(`if ${ballsCondition}`).step(ifTrue).step("endif");
+        return ballsCondition;
+    }
+    /**
+     * 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.
+     */
+    if_(condition, ifTrue) {
+        return this.step(`if ${Macro.makeBALLSPredicate(condition)}`)
+            .step(ifTrue)
+            .step("endif");
     }
     /**
      * Create a new macro with an "if" statement.
@@ -257,6 +262,26 @@ export class Macro {
     static if_(condition, ifTrue) {
         return new this().if_(condition, ifTrue);
     }
+    /**
+     * Add an "if" statement to this macro, inverting the condition.
+     * @param condition The BALLS condition for the if statement.
+     * @param ifTrue Continuation if the condition is true.
+     * @returns {Macro} This object itself.
+     */
+    ifNot(condition, ifTrue) {
+        return this.step(`if !(${Macro.makeBALLSPredicate(condition)})`)
+            .step(ifTrue)
+            .step("endif");
+    }
+    /**
+     * Create a new macro with an "if" statement, inverting the condition.
+     * @param condition The BALLS condition for the if statement.
+     * @param ifTrue Continuation if the condition is true.
+     * @returns {Macro} This object itself.
+     */
+    static ifNot(condition, ifTrue) {
+        return new this().ifNot(condition, ifTrue);
+    }
     /**
      * Add a "while" statement to this macro.
      * @param condition The BALLS condition for the if statement.

package/dist/resources/2017/AsdonMartin.js

@@ -56,9 +56,9 @@ function inventoryItems() {
         [100, autosellPrice(item)].includes(price(item, PriceAge.RECENT)));
 }
 // Efficiency in meat per fuel.
-function calculateFuelUnitCost(it, targetUnits, priceAge = PriceAge.RECENT) {
+function calculateFuelUnitCost(it, priceAge = PriceAge.RECENT) {
     const units = getAverageAdventures(it);
-    return price(it, priceAge) / Math.min(targetUnits, units);
+    return price(it, priceAge) / units;
 }
 function isFuelItem(it) {
     return (!isNpcItem(it) &&
@@ -68,7 +68,7 @@ function isFuelItem(it) {
         it.discardable &&
         !fuelSkiplist.includes(it));
 }
-function getBestFuels(targetUnits) {
+function getBestFuels() {
     // Three stages.
     // 1. Filter to reasonable items using historical cost (within 5x of historical best).
     const allFuel = Item.all().filter(isFuelItem);
@@ -76,7 +76,7 @@ function getBestFuels(targetUnits) {
         mallPrices("food");
         mallPrices("booze");
     }
-    const keyHistorical = (item) => calculateFuelUnitCost(item, targetUnits, PriceAge.HISTORICAL);
+    const keyHistorical = (item) => calculateFuelUnitCost(item, PriceAge.HISTORICAL);
     allFuel.sort((x, y) => keyHistorical(x) - keyHistorical(y));
     const bestUnitCost = keyHistorical(allFuel[0]);
     const firstBadIndex = allFuel.findIndex((item) => keyHistorical(item) > 5 * bestUnitCost);
@@ -87,14 +87,14 @@ function getBestFuels(targetUnits) {
         mallPrices("booze");
     }
     const key1 = (item) => -getAverageAdventures(item);
-    const key2 = (item) => calculateFuelUnitCost(item, targetUnits, PriceAge.RECENT);
+    const key2 = (item) => calculateFuelUnitCost(item, PriceAge.RECENT);
     potentialFuel.sort((x, y) => key1(x) - key1(y));
     potentialFuel.sort((x, y) => key2(x) - key2(y));
     // 3. Find result using precise price for those top candidates.
     const candidates = potentialFuel.slice(0, 10);
-    const key3 = (item) => calculateFuelUnitCost(item, targetUnits, PriceAge.TODAY);
+    const key3 = (item) => calculateFuelUnitCost(item, PriceAge.TODAY);
     candidates.sort((x, y) => key3(x) - key3(y));
-    if (calculateFuelUnitCost(candidates[0], targetUnits, PriceAge.TODAY) > 100) {
+    if (calculateFuelUnitCost(candidates[0], PriceAge.TODAY) > 100) {
         throw new Error("Could not identify any fuel with efficiency better than 100 meat per fuel. " +
             "This means something went wrong.");
     }
@@ -119,10 +119,9 @@ export function fillTo(targetUnits) {
     if (!installed())
         return false;
     while (getFuel() < targetUnits) {
-        const remaining = targetUnits - getFuel();
         // if in Hardcore/ronin, skip the price calculation and just use soda bread
         const [bestFuel, secondBest] = canInteract()
-            ? getBestFuels(remaining)
+            ? getBestFuels()
             : [$item `loaf of soda bread`, undefined];
         const count = Math.ceil(targetUnits / getAverageAdventures(bestFuel));
         let ceiling = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libram",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "JavaScript helper library for KoLmafia",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",