isaacscript-common 1.2.290 → 2.0.0

package/dist/functions/pickups.lua

@@ -1,6 +1,8 @@
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local PickupVariant = ____isaac_2Dtypescript_2Ddefinitions.PickupVariant
 local ____constants = require("constants")
 local VectorZero = ____constants.VectorZero
 local ____coinSubTypeToValue = require("objects.coinSubTypeToValue")
@@ -18,13 +20,13 @@ function ____exports.getBatteries(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
     end
-    return getPickups(nil, 90, matchingSubType)
+    return getPickups(nil, PickupVariant.LIL_BATTERY, matchingSubType)
 end
 function ____exports.getCards(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
     end
-    return getPickups(nil, 300, matchingSubType)
+    return getPickups(nil, PickupVariant.TAROT_CARD, matchingSubType)
 end
 function ____exports.getCoinValue(self, coinSubType)
     local value = COIN_SUBTYPE_TO_VALUE[coinSubType]
@@ -34,31 +36,31 @@ function ____exports.getCoins(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
     end
-    return getPickups(nil, 20, matchingSubType)
+    return getPickups(nil, PickupVariant.COIN, matchingSubType)
 end
 function ____exports.getCollectibles(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
     end
-    return getPickups(nil, 100, matchingSubType)
+    return getPickups(nil, PickupVariant.COLLECTIBLE, matchingSubType)
 end
 function ____exports.getHearts(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
     end
-    return getPickups(nil, 10, matchingSubType)
+    return getPickups(nil, PickupVariant.HEART, matchingSubType)
 end
 function ____exports.getKeys(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
     end
-    return getPickups(nil, 30, matchingSubType)
+    return getPickups(nil, PickupVariant.KEY, matchingSubType)
 end
 function ____exports.getPills(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
     end
-    return getPickups(nil, 70, matchingSubType)
+    return getPickups(nil, PickupVariant.PILL, matchingSubType)
 end
 function ____exports.getRedHearts(self)
     local hearts = ____exports.getHearts(nil)
@@ -71,46 +73,46 @@ function ____exports.getSacks(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
     end
-    return getPickups(nil, 69, matchingSubType)
+    return getPickups(nil, PickupVariant.GRAB_BAG, matchingSubType)
 end
 function ____exports.getTrinkets(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
     end
-    return getPickups(nil, 350, matchingSubType)
+    return getPickups(nil, PickupVariant.TRINKET, matchingSubType)
 end
 function ____exports.isChest(self, pickup)
     return CHEST_PICKUP_VARIANTS:has(pickup.Variant)
 end
 function ____exports.isRedHeart(self, pickup)
-    return pickup.Variant == 10 and RED_HEART_SUB_TYPES_SET:has(pickup.SubType)
+    return pickup.Variant == PickupVariant.HEART and RED_HEART_SUB_TYPES_SET:has(pickup.SubType)
 end
 function ____exports.removeAllBatteries(self, batterySubType, cap)
-    return removeAllPickups(nil, 90, batterySubType, cap)
+    return removeAllPickups(nil, PickupVariant.LIL_BATTERY, batterySubType, cap)
 end
 function ____exports.removeAllCards(self, card, cap)
-    return removeAllPickups(nil, 300, card, cap)
+    return removeAllPickups(nil, PickupVariant.TAROT_CARD, card, cap)
 end
 function ____exports.removeAllCoins(self, coinSubType, cap)
-    return removeAllPickups(nil, 20, coinSubType, cap)
+    return removeAllPickups(nil, PickupVariant.COIN, coinSubType, cap)
 end
 function ____exports.removeAllCollectibles(self, collectibleType, cap)
-    return removeAllPickups(nil, 100, collectibleType, cap)
+    return removeAllPickups(nil, PickupVariant.COLLECTIBLE, collectibleType, cap)
 end
 function ____exports.removeAllHearts(self, heartSubType, cap)
-    return removeAllPickups(nil, 10, heartSubType, cap)
+    return removeAllPickups(nil, PickupVariant.HEART, heartSubType, cap)
 end
 function ____exports.removeAllKeys(self, keySubType, cap)
-    return removeAllPickups(nil, 30, keySubType, cap)
+    return removeAllPickups(nil, PickupVariant.KEY, keySubType, cap)
 end
 function ____exports.removeAllPills(self, pillColor, cap)
-    return removeAllPickups(nil, 70, pillColor, cap)
+    return removeAllPickups(nil, PickupVariant.PILL, pillColor, cap)
 end
 function ____exports.removeAllSacks(self, sackSubType, cap)
-    return removeAllPickups(nil, 350, sackSubType, cap)
+    return removeAllPickups(nil, PickupVariant.TRINKET, sackSubType, cap)
 end
 function ____exports.removeAllTrinkets(self, trinketType, cap)
-    return removeAllPickups(nil, 350, trinketType, cap)
+    return removeAllPickups(nil, PickupVariant.TRINKET, trinketType, cap)
 end
 function ____exports.spawnBattery(self, subType, position, velocity, spawner, seed)
     if velocity == nil then
@@ -124,7 +126,7 @@ function ____exports.spawnBattery(self, subType, position, velocity, spawner, se
     end
     return spawnPickup(
         nil,
-        90,
+        PickupVariant.LIL_BATTERY,
         subType,
         position,
         velocity,
@@ -160,7 +162,7 @@ function ____exports.spawnCard(self, subType, position, velocity, spawner, seed)
     end
     return spawnPickup(
         nil,
-        300,
+        PickupVariant.TAROT_CARD,
         subType,
         position,
         velocity,
@@ -196,7 +198,7 @@ function ____exports.spawnCoin(self, subType, position, velocity, spawner, seed)
     end
     return spawnPickup(
         nil,
-        20,
+        PickupVariant.COIN,
         subType,
         position,
         velocity,
@@ -232,7 +234,7 @@ function ____exports.spawnHeart(self, subType, position, velocity, spawner, seed
     end
     return spawnPickup(
         nil,
-        10,
+        PickupVariant.HEART,
         subType,
         position,
         velocity,
@@ -268,7 +270,7 @@ function ____exports.spawnKey(self, subType, position, velocity, spawner, seed)
     end
     return spawnPickup(
         nil,
-        30,
+        PickupVariant.KEY,
         subType,
         position,
         velocity,
@@ -292,7 +294,7 @@ function ____exports.spawnKeyWithSeed(self, subType, position, seed, velocity, s
         seed
     )
 end
-function ____exports.spawnPill(self, subType, position, velocity, spawner, seed)
+function ____exports.spawnPill(self, pillColor, position, velocity, spawner, seed)
     if velocity == nil then
         velocity = VectorZero
     end
@@ -304,8 +306,8 @@ function ____exports.spawnPill(self, subType, position, velocity, spawner, seed)
     end
     return spawnPickup(
         nil,
-        70,
-        subType,
+        PickupVariant.PILL,
+        pillColor,
         position,
         velocity,
         spawner,
@@ -340,7 +342,7 @@ function ____exports.spawnSack(self, subType, position, velocity, spawner, seed)
     end
     return spawnPickup(
         nil,
-        69,
+        PickupVariant.GRAB_BAG,
         subType,
         position,
         velocity,
@@ -376,7 +378,7 @@ function ____exports.spawnTrinket(self, subType, position, velocity, spawner, se
     end
     return spawnPickup(
         nil,
-        350,
+        PickupVariant.TRINKET,
         subType,
         position,
         velocity,

package/dist/functions/pills.d.ts

@@ -1,11 +1,11 @@
-/// <reference types="isaac-typescript-definitions" />
-import { PillEffectClass } from "../enums/PillEffectClass";
-import { PillEffectType } from "../enums/PillEffectType";
+import { ItemConfigPillEffectClass, ItemConfigPillEffectType, PillColor, PillEffect } from "isaac-typescript-definitions";
 /**
- * Helper function to get the final pill effect in the game. This cannot be reliably determined
- * before run-time due to mods adding a variable amount of new pill effects.
+ * Helper function to get the corresponding horse pill color from a normal pill color.
+ *
+ * For example, passing `PillColor.BLUE_BLUE` would result in 2049, which is the value that
+ * corresponds to the horse pill color for blue/blue.
  */
-export declare function getMaxPillEffects(): int;
+export declare function getHorsePillColor(pillColor: PillColor): PillColor;
 /**
  * Helper function to get a pill effect class from a PillEffect enum value. In this context, the
  * class is equal to the numerical prefix in the "class" tag in the "pocketitems.xml" file. Use the
@@ -15,24 +15,25 @@ export declare function getMaxPillEffects(): int;
  * Due to limitations in the API, this function will not work properly for modded pill effects, and
  * will always return `DEFAULT_PILL_EFFECT_CLASS` in those cases.
  */
-export declare function getPillEffectClass(pillEffect: PillEffect | int): PillEffectClass;
+export declare function getPillEffectClass(pillEffect: PillEffect | int): ItemConfigPillEffectClass;
 /**
  * Helper function to get a pill effect name from a PillEffect enum value.
  *
  * Example:
  * ```ts
- * const pillEffect = PillEffect.PILLEFFECT_BAD_GAS;
+ * const pillEffect = PillEffect.BAD_GAS;
  * const pillEffectName = getPillEffectName(pillEffect); // trinketName is "Bad Gas"
  * ```
  */
 export declare function getPillEffectName(pillEffect: PillEffect | int): string;
 /**
- * Helper function to get a pill effect type from a PillEffect enum value. In this context, the
- * type is equal to positive, negative, or neutral. This is derived from the suffix of the the
- * "class" tag in the "pocketitems.xml" file. Use the `getPillEffectClass` helper function to
- * determine the "power" of the pill.
+ * Helper function to get a pill effect type from a PillEffect enum value. In this context, the type
+ * is equal to positive, negative, or neutral. This is derived from the suffix of the the "class"
+ * tag in the "pocketitems.xml" file. Use the `getPillEffectClass` helper function to determine the
+ * "power" of the pill.
  *
  * Due to limitations in the API, this function will not work properly for modded pill effects, and
  * will always return `DEFAULT_PILL_EFFECT_TYPE` in those cases.
  */
-export declare function getPillEffectType(pillEffect: PillEffect | int): PillEffectType;
+export declare function getPillEffectType(pillEffect: PillEffect | int): ItemConfigPillEffectType;
+export declare function isHorsePill(pillColor: PillColor): boolean;

package/dist/functions/pills.lua

@@ -1,4 +1,3 @@
---[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
 local ____cachedClasses = require("cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
@@ -11,8 +10,12 @@ local PILL_EFFECT_NAMES = ____pillEffectNames.PILL_EFFECT_NAMES
 local ____pillEffectTypes = require("objects.pillEffectTypes")
 local DEFAULT_PILL_EFFECT_TYPE = ____pillEffectTypes.DEFAULT_PILL_EFFECT_TYPE
 local PILL_EFFECT_TYPES = ____pillEffectTypes.PILL_EFFECT_TYPES
-function ____exports.getMaxPillEffects(self)
-    return itemConfig:GetPillEffects().Size - 1
+local ____flag = require("functions.flag")
+local hasFlag = ____flag.hasFlag
+local HORSE_PILL_FLAG = 2047
+local HORSE_PILL_ADJUSTMENT = 2048
+function ____exports.getHorsePillColor(self, pillColor)
+    return pillColor + HORSE_PILL_ADJUSTMENT
 end
 function ____exports.getPillEffectClass(self, pillEffect)
     local pillEffectClass = PILL_EFFECT_CLASSES[pillEffect]
@@ -33,4 +36,7 @@ function ____exports.getPillEffectType(self, pillEffect)
     local pillEffectClass = PILL_EFFECT_TYPES[pillEffect]
     return pillEffectClass == nil and DEFAULT_PILL_EFFECT_TYPE or pillEffectClass
 end
+function ____exports.isHorsePill(self, pillColor)
+    return hasFlag(nil, pillColor, HORSE_PILL_FLAG)
+end
 return ____exports

package/dist/functions/player.d.ts

@@ -1,20 +1,20 @@
-/// <reference types="isaac-typescript-definitions" />
+import { ActiveSlot, CacheFlag, CollectibleType, PlayerType, TrinketType } from "isaac-typescript-definitions";
 import { HealthType } from "../enums/HealthType";
 export declare function addCollectibleCostume(player: EntityPlayer, collectibleType: CollectibleType | int): void;
 /**
  * Helper function to add a stat to a player based on the `CacheFlag` provided. Call this function
  * from the EvaluateCache callback.
  *
- * Note that for `CacheFlag.CACHE_FIREDELAY`, the "amount" argument will be interpreted as the tear
- * stat to add (and not the amount to mutate `EntityPlayer.MaxFireDelay` by).
+ * Note that for `CacheFlag.FIRE_DELAY`, the "amount" argument will be interpreted as the tear stat
+ * to add (and not the amount to mutate `EntityPlayer.MaxFireDelay` by).
  *
  * This function supports the following cache flags:
- * - CacheFlag.CACHE_DAMAGE (1 << 0)
- * - CacheFlag.CACHE_FIREDELAY (1 << 1)
- * - CacheFlag.CACHE_SHOTSPEED (1 << 2)
- * - CacheFlag.CACHE_RANGE (1 << 3)
- * - CacheFlag.CACHE_SPEED (1 << 4)
- * - CacheFlag.CACHE_LUCK (1 << 10)
+ * - CacheFlag.DAMAGE (1 << 0)
+ * - CacheFlag.FIRE_DELAY (1 << 1)
+ * - CacheFlag.SHOT_SPEED (1 << 2)
+ * - CacheFlag.RANGE (1 << 3)
+ * - CacheFlag.SPEED (1 << 4)
+ * - CacheFlag.LUCK (1 << 10)
  */
 export declare function addStat(player: EntityPlayer, cacheFlag: CacheFlag, amount: number): void;
 export declare function addTrinketCostume(player: EntityPlayer, trinketType: TrinketType | int): void;
@@ -218,12 +218,12 @@ export declare function isJacobOrEsau(player: EntityPlayer): boolean;
 export declare function isKeeper(player: EntityPlayer): boolean;
 /** Helper function for detecting when a player is The Lost or Tainted Lost. */
 export declare function isLost(player: EntityPlayer): boolean;
-export declare function isModdedCharacter(player: EntityPlayer): boolean;
+export declare function isModdedPlayer(player: EntityPlayer): boolean;
 /** Helper function for detecting if a player is one of the Tainted characters. */
 export declare function isTainted(player: EntityPlayer): boolean;
 /** Helper function for detecting when a player is Tainted Lazarus or Dead Tainted Lazarus. */
 export declare function isTaintedLazarus(player: EntityPlayer): boolean;
-export declare function isVanillaCharacter(player: EntityPlayer): boolean;
+export declare function isVanillaPlayer(player: EntityPlayer): boolean;
 /**
  * Helper function to add one or more collectibles to a player.
  *