libram 0.10.0 → 0.10.2

package/dist/lib.d.ts

@@ -1,5 +1,6 @@
 /** @module GeneralLibrary */
 import { Effect, Element, Familiar, Item, Location, Monster, runCombat, Servant, Skill, Slot, Stat, Thrall, Coinmaster, MafiaClass } from "kolmafia";
+import { ValueOf } from "./utils.js";
 import { StringProperty } from "./propertyTypes.js";
 /**
  * Determines the current maximum Accordion Thief songs the player can have in their head
@@ -344,7 +345,7 @@ export declare const Environment: {
     readonly Underground: "underground";
     readonly Underwater: "underwater";
 };
-export type EnvironmentType = (typeof Environment)[keyof typeof Environment];
+export type EnvironmentType = ValueOf<typeof Environment>;
 /**
  * Determines the weight-coefficient of any leprechaunning that this familiar may find itself doing
  * Assumes the familiar is nude and thus fails for hatrack & pantsrack
@@ -572,14 +573,29 @@ export declare const bulkRepriceShop: (items: Map<Item, {
  * @returns The total weight of the given familiar
  */
 export declare function totalFamiliarWeight(familiar?: Familiar, considerAdjustment?: boolean): number;
-export declare const familiarTags: readonly ["animal", "insect", "haseyes", "haswings", "fast", "bite", "flies", "hashands", "wearsclothes", "organic", "vegetable", "hovers", "edible", "food", "sentient", "cute", "mineral", "polygonal", "object", "undead", "cantalk", "evil", "orb", "spooky", "sleaze", "aquatic", "swims", "isclothes", "phallic", "stench", "hot", "hasbeak", "haslegs", "robot", "technological", "hard", "cold", "hasbones", "hasclaws", "reallyevil", "good", "person", "humanoid", "animatedart", "software", "pokefam", "hasshell", "hasstinger"];
-export type FamiliarTag = (typeof familiarTags)[number];
+export declare const regularFamiliarTags: readonly ["animal", "insect", "haseyes", "haswings", "fast", "bite", "flies", "hashands", "wearsclothes", "organic", "vegetable", "hovers", "edible", "food", "sentient", "cute", "mineral", "polygonal", "object", "undead", "cantalk", "evil", "orb", "spooky", "sleaze", "aquatic", "swims", "isclothes", "phallic", "stench", "hot", "hasbeak", "haslegs", "robot", "technological", "hard", "cold", "hasbones", "hasclaws", "reallyevil", "good", "person", "humanoid", "animatedart", "software", "hasshell", "hasstinger"];
+export declare const pokefamUltTags: readonly ["ult_bearhug", "ult_sticktreats", "ult_owlstare", "ult_bloodbath", "ult_pepperscorn", "ult_rainbowstorm"];
+export type PokefamUltTag = (typeof pokefamUltTags)[number];
+export type RegularFamiliarTag = (typeof regularFamiliarTags)[number];
+export type FamiliarTag = RegularFamiliarTag | PokefamUltTag;
 /**
- * Find the tags (used in mumming trunk, stillsuit, etc) for a given familiar
+ * Type guard function to determine if a tag is a regular familiar tag or a pokefam ult
+ * @param tag The familiar tag to check
+ * @returns Asserts that `tag` is a `RegularFamiliarTag`
+ */
+export declare function isRegularFamiliarTag(tag: string): tag is RegularFamiliarTag;
+/**
+ * Find the tags (used in mumming trunk, stillsuit, etc) for a given familiar, EXCLUDING special tags used for pokefam ults
+ * @param familiar The familiar in question
+ * @returns An array of the familiar's tags
+ */
+export declare function getRegularFamiliarTags(familiar: Familiar): RegularFamiliarTag[];
+/**
+ * Find the tags (used in mumming trunk, stillsuit, etc) for a given familiar, INCLUDING special tags used for pokefam ults
  * @param familiar The familiar in question
  * @returns An array of the familiar's tags
  */
-export declare function getFamiliarTags(familiar: Familiar): FamiliarTag[];
+export declare function getAllFamiliarTags(familiar: Familiar): FamiliarTag[];
 /**
  * Determines the cost of acquiring an item taking into account your valueOfInventory preference
  *

package/dist/lib.js

@@ -3,7 +3,7 @@ import { appearanceRates, autosellPrice, availableAmount, booleanModifier, choic
 import logger from "./logger.js";
 import { get } from "./property.js";
 import { $class, $effect, $element, $familiar, $item, $items, $monsters, $skill, $stat, } from "./template-string.js";
-import { makeByXFunction, notNull, clamp, chunk } from "./utils.js";
+import { makeByXFunction, notNull, clamp, chunk, } from "./utils.js";
 /**
  * Determines the current maximum Accordion Thief songs the player can have in their head
  *
@@ -1126,7 +1126,7 @@ export function totalFamiliarWeight(familiar = myFamiliar(), considerAdjustment
         (considerAdjustment ? weightAdjustment() : 0) +
         (familiar.feasted ? 10 : 0));
 }
-export const familiarTags = Object.freeze([
+export const regularFamiliarTags = Object.freeze([
     "animal",
     "insect",
     "haseyes",
@@ -1172,17 +1172,54 @@ export const familiarTags = Object.freeze([
     "humanoid",
     "animatedart",
     "software",
-    "pokefam",
     "hasshell",
     "hasstinger",
 ]);
+const regularFamiliarTagSet = new Set(regularFamiliarTags);
+export const pokefamUltTags = Object.freeze([
+    "ult_bearhug",
+    "ult_sticktreats",
+    "ult_owlstare",
+    "ult_bloodbath",
+    "ult_pepperscorn",
+    "ult_rainbowstorm",
+]);
+const SPECIAL_ULTS = new Map([
+    [$familiar `Nursine`, ["ult_bearhug"]],
+    [$familiar `Caramel`, ["ult_sticktreats"]],
+    [$familiar `Smashmoth`, ["ult_owlstare"]],
+    [$familiar `Slotter`, ["ult_bloodbath"]],
+    [$familiar `Cornbeefadon`, ["ult_pepperscorn"]],
+    [$familiar `Mu`, ["ult_rainbowstorm"]],
+]);
+/**
+ * Type guard function to determine if a tag is a regular familiar tag or a pokefam ult
+ * @param tag The familiar tag to check
+ * @returns Asserts that `tag` is a `RegularFamiliarTag`
+ */
+export function isRegularFamiliarTag(tag) {
+    return regularFamiliarTagSet.has(tag);
+}
+/**
+ * Find the tags (used in mumming trunk, stillsuit, etc) for a given familiar, EXCLUDING special tags used for pokefam ults
+ * @param familiar The familiar in question
+ * @returns An array of the familiar's tags
+ */
+export function getRegularFamiliarTags(familiar) {
+    return familiar.attributes
+        .split("; ")
+        .filter(isRegularFamiliarTag);
+}
 /**
- * Find the tags (used in mumming trunk, stillsuit, etc) for a given familiar
+ * Find the tags (used in mumming trunk, stillsuit, etc) for a given familiar, INCLUDING special tags used for pokefam ults
  * @param familiar The familiar in question
  * @returns An array of the familiar's tags
  */
-export function getFamiliarTags(familiar) {
-    return familiar.attributes.split("; ").filter(Boolean);
+export function getAllFamiliarTags(familiar) {
+    return [
+        ...getRegularFamiliarTags(familiar),
+        ...(SPECIAL_ULTS.get(familiar) ?? []),
+    ];
 }
 /**
  * Determines the cost of acquiring an item taking into account your valueOfInventory preference

package/dist/modifier.d.ts

@@ -59,6 +59,11 @@ baseModifier?: string, componentColor?: string, totalColor?: string): void;
  * @returns The sum of the appropriate modifier for all of the subjects
  */
 export declare function getTotalModifier(modifier: NumericModifier, ...subjects: (Skill | Effect | Item)[]): number;
+export type ModifierParser = {
+    numeric: (value: string) => number;
+    str: (value: string) => string;
+    bool: (value: string) => boolean;
+};
 /**
  * Translate a pref into a `Modifiers` object by wrapping mafia's `splitModifiers`
  * @param pref The name of the mafia preference in question
@@ -73,3 +78,9 @@ export declare function parseModifiers(pref: StringProperty, { numeric, str, boo
     str: (value: string) => string;
     bool: (value: string) => boolean;
 }>): Modifiers;
+/**
+ * Compile together all `Modifiers` something has
+ * @param thing An Item, Effect, or string to check all modifiers of
+ * @returns A `Modifiers` object corresponding to the givem Effect, Item, or string
+ */
+export declare function allModifiers(thing: Effect | Item | string): Modifiers;

package/dist/modifier.js

@@ -1,4 +1,4 @@
-import { booleanModifier, cliExecuteOutput, familiarWeight, getProperty, myFamiliar, numericModifier, print, splitModifiers, stringModifier, } from "kolmafia";
+import { booleanModifier, cliExecuteOutput, Effect, familiarWeight, getProperty, Item, myFamiliar, numericModifier, print, splitModifiers, stringModifier, } from "kolmafia";
 import { have } from "./lib.js";
 import { booleanModifiersSet, numericModifiersSet, stringModifiersSet, } from "./modifierTypes.js";
 import { $effect } from "./template-string.js";
@@ -177,6 +177,16 @@ baseModifier, componentColor = "purple", totalColor = "blue") {
 export function getTotalModifier(modifier, ...subjects) {
     return sum(subjects, (subject) => get(modifier, subject));
 }
+function parseModifierString(modifiers, { numeric = Number, str = String, bool = (val) => val === "true", } = {}) {
+    return Object.entries(splitModifiers(modifiers)).reduce((acc, [key, value]) => ({
+        ...acc,
+        [key]: isBooleanModifier(key)
+            ? bool(value)
+            : isNumericModifier(key)
+                ? numeric(value)
+                : str(value),
+    }), {});
+}
 /**
  * Translate a pref into a `Modifiers` object by wrapping mafia's `splitModifiers`
  * @param pref The name of the mafia preference in question
@@ -187,12 +197,18 @@ export function getTotalModifier(modifier, ...subjects) {
  * @returns A `Modifiers` object corresponding to the given preference.
  */
 export function parseModifiers(pref, { numeric = Number, str = String, bool = (val) => val === "true", } = {}) {
-    return Object.entries(splitModifiers(getProperty(pref))).reduce((acc, [key, value]) => ({
-        ...acc,
-        [key]: isBooleanModifier(key)
-            ? bool(value)
-            : isNumericModifier(key)
-                ? numeric(value)
-                : str(value),
-    }), {});
+    return parseModifierString(getProperty(pref), { numeric, str, bool });
+}
+const overloadedStringModifier = (thing, modifier) => thing instanceof Effect
+    ? stringModifier(thing, modifier)
+    : thing instanceof Item
+        ? stringModifier(thing, modifier)
+        : stringModifier(thing, modifier);
+/**
+ * Compile together all `Modifiers` something has
+ * @param thing An Item, Effect, or string to check all modifiers of
+ * @returns A `Modifiers` object corresponding to the givem Effect, Item, or string
+ */
+export function allModifiers(thing) {
+    return parseModifierString(overloadedStringModifier(thing, "Modifiers"));
 }

package/dist/modifierTypes.d.ts

@@ -5,6 +5,6 @@ export declare const booleanModifiers: readonly ["Softcore Only", "Single Equip"
 export declare const booleanModifiersSet: Set<"Four Songs" | "Softcore Only" | "Single Equip" | "Always Fumble" | "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" | "Adventure Randomly" | "Adventure Underwater" | "Underwater Familiar" | "Generic" | "Unarmed" | "No Pull" | "Lasts Until Rollover" | "Alters Page Text" | "Attacks Can't Miss" | "Pirate" | "Blind" | "Breakable" | "Drops Items" | "Drops Meat" | "Volleyball or Sombrero" | "Extra Pickpocket" | "Negative Status Resist">;
 export type BooleanModifier = typeof booleanModifiers[number];
 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", "Avoid Attack", "Damage vs. Bugbears", "Damage vs. Werewolves", "Damage vs. Zombies", "Damage vs. Ghosts", "Damage vs. Vampires", "Damage vs. Skeletons", "Damage vs. Undead"];
-export declare const numericModifiersSet: Set<"Additional Song" | "Leprechaun Effectiveness" | "Meat Drop" | "Fairy Effectiveness" | "Item Drop" | "Moxie" | "Muscle" | "Mysticality" | "Familiar Weight" | "Water Level" | "Monster Level" | "Combat Rate" | "Initiative" | "Experience" | "Damage Absorption" | "Damage Reduction" | "Cold Resistance" | "Hot Resistance" | "Sleaze Resistance" | "Spooky Resistance" | "Stench Resistance" | "Mana Cost" | "Moxie Percent" | "Muscle Percent" | "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" | "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" | "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" | "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" | "Avoid Attack" | "Damage vs. Bugbears" | "Damage vs. Werewolves" | "Damage vs. Zombies" | "Damage vs. Ghosts" | "Damage vs. Vampires" | "Damage vs. Skeletons" | "Damage vs. Undead">;
+export declare const numericModifiersSet: Set<"Additional Song" | "Leprechaun Effectiveness" | "Meat Drop" | "Fairy Effectiveness" | "Item Drop" | "Moxie" | "Muscle" | "Mysticality" | "Familiar Weight" | "Monster Level" | "Combat Rate" | "Initiative" | "Experience" | "Damage Absorption" | "Damage Reduction" | "Cold Resistance" | "Hot Resistance" | "Sleaze Resistance" | "Spooky Resistance" | "Stench Resistance" | "Mana Cost" | "Moxie Percent" | "Muscle Percent" | "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" | "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" | "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" | "Avoid Attack" | "Damage vs. Bugbears" | "Damage vs. Werewolves" | "Damage vs. Zombies" | "Damage vs. Ghosts" | "Damage vs. Vampires" | "Damage vs. Skeletons" | "Damage vs. Undead">;
 export type NumericModifier = typeof numericModifiers[number];
 export type ModifierType = NumericModifier | StringModifier | BooleanModifier;

package/dist/overlappingNames.js

@@ -15,9 +15,11 @@ export const overlappingItemNames = [
     "bowling ball",
     "adder",
     "red button",
+    "tennis ball",
     "pile of sand",
     "mushroom",
     "deluxe mushroom",
+    "spoon",
 ];
 export const overlappingSkillNames = [
     "Shoot",

package/dist/property.js

@@ -1,4 +1,5 @@
 import { Bounty, Class, Coinmaster, Effect, Element, Familiar, getProperty, Item, Location, Monster, Phylum, propertyExists, removeProperty, Servant, setProperty, Skill, Slot, Stat, Thrall, toBounty, toClass, toCoinmaster, toEffect, toElement, toFamiliar, toItem, toLocation, toMonster, toPhylum, toServant, toSkill, toSlot, toStat, toThrall, } from "kolmafia";
+import { familiarNumericProperties, itemNumericProperties, monsterNumericProperties, } from "./propertyTypes.js";
 import { isBooleanProperty, isFamiliarProperty, isItemProperty, isLocationProperty, isMonsterProperty, isNumericOrStringProperty, isNumericProperty, isPhylumProperty, isStatProperty, isStringProperty, } from "./propertyTyping.js";
 const createPropertyGetter = (transform) => (property, default_) => {
     const value = getProperty(property);
@@ -7,12 +8,20 @@ const createPropertyGetter = (transform) => (property, default_) => {
     }
     return transform(value, property);
 };
-const createMafiaClassPropertyGetter = (Type, toType) => createPropertyGetter((value) => {
-    if (value === "")
-        return null;
-    const v = toType(value);
-    return v === Type.none ? null : v;
-});
+function createMafiaClassPropertyGetter(Type, 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+toType, numericPropertyNames = []) {
+    return createPropertyGetter((value, property) => {
+        if (value === "")
+            return null;
+        const v = numericPropertyNames.includes(property)
+            ? value.match(/^[0-9]+$/)
+                ? toType(parseInt(value))
+                : null
+            : toType(value);
+        return v === Type.none ? null : v;
+    });
+}
 export const getString = createPropertyGetter((value) => value);
 export const getCommaSeparated = createPropertyGetter((value) => value.split(/, ?/));
 export const getBoolean = createPropertyGetter((value) => value === "true");
@@ -22,10 +31,10 @@ export const getClass = createMafiaClassPropertyGetter(Class, toClass);
 export const getCoinmaster = createMafiaClassPropertyGetter(Coinmaster, toCoinmaster);
 export const getEffect = createMafiaClassPropertyGetter(Effect, toEffect);
 export const getElement = createMafiaClassPropertyGetter(Element, toElement);
-export const getFamiliar = createMafiaClassPropertyGetter(Familiar, toFamiliar);
-export const getItem = createMafiaClassPropertyGetter(Item, toItem);
+export const getFamiliar = createMafiaClassPropertyGetter(Familiar, toFamiliar, familiarNumericProperties);
+export const getItem = createMafiaClassPropertyGetter(Item, toItem, itemNumericProperties);
 export const getLocation = createMafiaClassPropertyGetter(Location, toLocation);
-export const getMonster = createMafiaClassPropertyGetter(Monster, toMonster);
+export const getMonster = createMafiaClassPropertyGetter(Monster, toMonster, monsterNumericProperties);
 export const getPhylum = createMafiaClassPropertyGetter(Phylum, toPhylum);
 export const getServant = createMafiaClassPropertyGetter(Servant, toServant);
 export const getSkill = createMafiaClassPropertyGetter(Skill, toSkill);