isaacscript-common 87.8.3 → 87.9.0

package/dist/classes/features/other/CustomPickups.d.ts

@@ -26,12 +26,13 @@ export declare class CustomPickups extends Feature {
      * @param subType The sub-type for the corresponding custom pickup.
      * @param collectFunc The function to run when the player collects this pickup.
      * @param collisionFunc Optional. The function to run when a player collides with the pickup.
-     *                      Default is a function that always returns true, meaning that the player
-     *                      will always immediately collect the pickup when they collide with it.
-     *                      Specify this function if your pickup should only be able to be collected
-     *                      under certain conditions.
+     *                      Default is a function that always returns undefined, meaning that the
+     *                      player will always immediately collect the pickup when they collide with
+     *                      it. Specify this function if your pickup should only be able to be
+     *                      collected under certain conditions. Return value acts similar to
+     *                      `ModCallback.PRE_PICKUP_COLLISION`.
      * @public
      */
-    registerCustomPickup(pickupVariantCustom: PickupVariant, subType: int, collectFunc: (this: void, player: EntityPlayer) => void, collisionFunc?: (this: void, player: EntityPlayer) => boolean): void;
+    registerCustomPickup(pickupVariantCustom: PickupVariant, subType: int, collectFunc: (this: void, pickup: EntityPickup, player: EntityPlayer) => void, collisionFunc?: (this: void, pickup: EntityPickup, player: EntityPlayer) => boolean | undefined): void;
 }
 //# sourceMappingURL=CustomPickups.d.ts.map

package/dist/classes/features/other/CustomPickups.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CustomPickups.d.ts","sourceRoot":"","sources":["../../../../src/classes/features/other/CustomPickups.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAalE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAkBhD,qBAAa,aAAc,SAAQ,OAAO;IACxC,4BAA4B;IAC5B,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAGrC;IAoBJ,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAqCjC;IAIF,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAU3C;IAEF;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IAEI,oBAAoB,CACzB,mBAAmB,EAAE,aAAa,EAClC,OAAO,EAAE,GAAG,EACZ,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,KAAK,IAAI,EACvD,aAAa,GAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,KAAK,OAAoB,GACxE,IAAI;CAYR"}
+{"version":3,"file":"CustomPickups.d.ts","sourceRoot":"","sources":["../../../../src/classes/features/other/CustomPickups.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAalE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAsBhD,qBAAa,aAAc,SAAQ,OAAO;IACxC,4BAA4B;IAC5B,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAGrC;IAoBJ,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAqCjC;IAIF,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAU3C;IAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IAEI,oBAAoB,CACzB,mBAAmB,EAAE,aAAa,EAClC,OAAO,EAAE,GAAG,EACZ,WAAW,EAAE,CACX,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,KACjB,IAAI,EACT,aAAa,GAAE,CACb,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,KACjB,OAAO,GAAG,SAA2B,GACzC,IAAI;CAYR"}

package/dist/classes/features/other/CustomPickups.js

@@ -51,9 +51,9 @@ class CustomPickups extends Feature_1.Feature {
         if (player === undefined) {
             return undefined;
         }
-        const shouldPickup = customPickupFunctions.collisionFunc(player);
-        if (!shouldPickup) {
-            return undefined;
+        const shouldPickup = customPickupFunctions.collisionFunc(pickup, player);
+        if (shouldPickup !== undefined) {
+            return shouldPickup;
         }
         pickup.Remove();
         const pickupSprite = pickup.GetSprite();
@@ -62,7 +62,7 @@ class CustomPickups extends Feature_1.Feature {
         const effectSprite = effect.GetSprite();
         effectSprite.Load(fileName, true);
         effectSprite.Play("Collect", true);
-        customPickupFunctions.collectFunc(player);
+        customPickupFunctions.collectFunc(pickup, player);
         return undefined;
     };
     // ModCallback.POST_EFFECT_RENDER (56)
@@ -98,13 +98,14 @@ class CustomPickups extends Feature_1.Feature {
      * @param subType The sub-type for the corresponding custom pickup.
      * @param collectFunc The function to run when the player collects this pickup.
      * @param collisionFunc Optional. The function to run when a player collides with the pickup.
-     *                      Default is a function that always returns true, meaning that the player
-     *                      will always immediately collect the pickup when they collide with it.
-     *                      Specify this function if your pickup should only be able to be collected
-     *                      under certain conditions.
+     *                      Default is a function that always returns undefined, meaning that the
+     *                      player will always immediately collect the pickup when they collide with
+     *                      it. Specify this function if your pickup should only be able to be
+     *                      collected under certain conditions. Return value acts similar to
+     *                      `ModCallback.PRE_PICKUP_COLLISION`.
      * @public
      */
-    registerCustomPickup(pickupVariantCustom, subType, collectFunc, collisionFunc = () => true) {
+    registerCustomPickup(pickupVariantCustom, subType, collectFunc, collisionFunc = () => undefined) {
         const entityID = (0, entities_1.getEntityIDFromConstituents)(isaac_typescript_definitions_1.EntityType.PICKUP, pickupVariantCustom, subType);
         const customPickupFunctions = {
             collectFunc,

package/dist/classes/features/other/CustomPickups.lua

@@ -45,9 +45,9 @@ function CustomPickups.prototype.____constructor(self)
         if player == nil then
             return nil
         end
-        local shouldPickup = customPickupFunctions.collisionFunc(player)
-        if not shouldPickup then
-            return nil
+        local shouldPickup = customPickupFunctions.collisionFunc(pickup, player)
+        if shouldPickup ~= nil then
+            return shouldPickup
         end
         pickup:Remove()
         local pickupSprite = pickup:GetSprite()
@@ -56,7 +56,7 @@ function CustomPickups.prototype.____constructor(self)
         local effectSprite = effect:GetSprite()
         effectSprite:Load(fileName, true)
         effectSprite:Play("Collect", true)
-        customPickupFunctions.collectFunc(player)
+        customPickupFunctions.collectFunc(pickup, player)
         return nil
     end
     self.postEffectRenderPickupEffect = function(____, effect)
@@ -72,7 +72,7 @@ function CustomPickups.prototype.____constructor(self)
 end
 function CustomPickups.prototype.registerCustomPickup(self, pickupVariantCustom, subType, collectFunc, collisionFunc)
     if collisionFunc == nil then
-        collisionFunc = function() return true end
+        collisionFunc = function() return nil end
     end
     local entityID = getEntityIDFromConstituents(nil, EntityType.PICKUP, pickupVariantCustom, subType)
     local customPickupFunctions = {collectFunc = collectFunc, collisionFunc = collisionFunc}

package/dist/core/constants.d.ts

@@ -143,6 +143,8 @@ export declare const NUM_DIMENSIONS: number;
 /**
  * An array containing every valid `Dimension`, not including `Dimension.CURRENT`. (This is derived
  * from the `NUM_DIMENSIONS` constant.)
+ *
+ * We cannot use the values of the `Dimension` enum because it includes -1.
  */
 export declare const DIMENSIONS: readonly Dimension[];
 /**

package/dist/core/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/core/constants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/core/constants.ts"],"names":[],"mappings":"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"}

package/dist/core/constants.js

@@ -216,6 +216,8 @@ exports.NUM_DIMENSIONS = (0, enums_1.getEnumLength)(isaac_typescript_definitions
 /**
  * An array containing every valid `Dimension`, not including `Dimension.CURRENT`. (This is derived
  * from the `NUM_DIMENSIONS` constant.)
+ *
+ * We cannot use the values of the `Dimension` enum because it includes -1.
  */
 exports.DIMENSIONS = (0, utils_1.eRange)(exports.NUM_DIMENSIONS);
 /**

package/dist/core/constants.lua

@@ -196,6 +196,8 @@ ____exports.MAX_TAINTED_SAMSON_BERSERK_CHARGE = 100000
 ____exports.NUM_DIMENSIONS = getEnumLength(nil, Dimension) - 1
 --- An array containing every valid `Dimension`, not including `Dimension.CURRENT`. (This is derived
 -- from the `NUM_DIMENSIONS` constant.)
+-- 
+-- We cannot use the values of the `Dimension` enum because it includes -1.
 ____exports.DIMENSIONS = eRange(nil, ____exports.NUM_DIMENSIONS)
 --- The pill pool for each run is comprised of one effect for each unique pill color (minus gold and
 -- horse pills.)

package/dist/functions/playerCollectibles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"playerCollectibles.d.ts","sourceRoot":"","sources":["../../src/functions/playerCollectibles.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EAEhB,MAAM,8BAA8B,CAAC;AAStC;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,GAAG,gBAAgB,EAAE,SAAS,eAAe,EAAE,GAC9C,IAAI,CAIN;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,GAC/B,IAAI,CAON;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,OAAO,GACxB,OAAO,CAMT;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,GAC/B,SAAS,UAAU,EAAE,CAKvB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,GAAG,GAAG,GAAG,CAKpD;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,GAAG,gBAAgB,EAAE,SAAS,eAAe,EAAE,GAC9C,GAAG,CAQL;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,gBAAgB,EAAE,SAAS,eAAe,EAAE,GAC9C,SAAS,YAAY,EAAE,CAQzB;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,eAAe,GAC/B,GAAG,CAQL;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,GAAG,gBAAgB,EAAE,SAAS,eAAe,EAAE,GAC9C,OAAO,CAIT;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,GAAG,WAAW,EAAE,SAAS,UAAU,EAAE,GACpC,OAAO,CAOT;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAiBnE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,YAAY,EACpB,UAAU,aAAqB,GAC9B,OAAO,CAGT;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAa/D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,YAAY,EACpB,GAAG,gBAAgB,EAAE,SAAS,eAAe,EAAE,GAC9C,IAAI,CAIN;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,GAC/B,IAAI,CAON;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,GAAG,gBAAgB,EAAE,SAAS,eAAe,EAAE,GAC9C,IAAI,CAQN;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,UAAU,aAAqB,EAC/B,MAAM,CAAC,EAAE,GAAG,EACZ,WAAW,UAAQ,GAClB,IAAI,CA2DN;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,GAC/B,IAAI,CAEN"}
+{"version":3,"file":"playerCollectibles.d.ts","sourceRoot":"","sources":["../../src/functions/playerCollectibles.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EAEhB,MAAM,8BAA8B,CAAC;AAStC;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,GAAG,gBAAgB,EAAE,SAAS,eAAe,EAAE,GAC9C,IAAI,CAIN;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,GAC/B,IAAI,CAON;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,OAAO,GACxB,OAAO,CAMT;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,GAC/B,SAAS,UAAU,EAAE,CAKvB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,GAAG,GAAG,GAAG,CAGpD;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,GAAG,gBAAgB,EAAE,SAAS,eAAe,EAAE,GAC9C,GAAG,CAQL;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,gBAAgB,EAAE,SAAS,eAAe,EAAE,GAC9C,SAAS,YAAY,EAAE,CAQzB;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,eAAe,GAC/B,GAAG,CAQL;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,GAAG,gBAAgB,EAAE,SAAS,eAAe,EAAE,GAC9C,OAAO,CAIT;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,GAAG,WAAW,EAAE,SAAS,UAAU,EAAE,GACpC,OAAO,CAOT;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAiBnE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,YAAY,EACpB,UAAU,aAAqB,GAC9B,OAAO,CAGT;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAa/D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,YAAY,EACpB,GAAG,gBAAgB,EAAE,SAAS,eAAe,EAAE,GAC9C,IAAI,CAIN;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,GAC/B,IAAI,CAON;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,GAAG,gBAAgB,EAAE,SAAS,eAAe,EAAE,GAC9C,IAAI,CAQN;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,UAAU,aAAqB,EAC/B,MAAM,CAAC,EAAE,GAAG,EACZ,WAAW,UAAQ,GAClB,IAAI,CA2DN;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,GAC/B,IAAI,CAEN"}

package/dist/functions/playerCollectibles.js

@@ -73,9 +73,7 @@ function getActiveItemSlots(player, collectibleType) {
  */
 function getAdjustedPrice(basePrice) {
     const numSteamSales = getTotalPlayerCollectibles(isaac_typescript_definitions_1.CollectibleType.STEAM_SALE);
-    return numSteamSales > 0
-        ? Math.floor(basePrice / (numSteamSales + 1))
-        : basePrice;
+    return Math.ceil(basePrice / (numSteamSales + 1));
 }
 /**
  * Helper function to return the total amount of collectibles that a player has that match the

package/dist/functions/playerCollectibles.lua

@@ -83,7 +83,7 @@ end
 -- the prices for items in the shop would be the same as if Isaac had two Steam Sales.)
 function ____exports.getAdjustedPrice(self, basePrice)
     local numSteamSales = ____exports.getTotalPlayerCollectibles(nil, CollectibleType.STEAM_SALE)
-    return numSteamSales > 0 and math.floor(basePrice / (numSteamSales + 1)) or basePrice
+    return math.ceil(basePrice / (numSteamSales + 1))
 end
 --- Helper function to return the total amount of collectibles that a player has that match the
 -- collectible type(s) provided.

package/dist/index.rollup.d.ts

@@ -2175,13 +2175,14 @@ declare class CustomPickups extends Feature {
      * @param subType The sub-type for the corresponding custom pickup.
      * @param collectFunc The function to run when the player collects this pickup.
      * @param collisionFunc Optional. The function to run when a player collides with the pickup.
-     *                      Default is a function that always returns true, meaning that the player
-     *                      will always immediately collect the pickup when they collide with it.
-     *                      Specify this function if your pickup should only be able to be collected
-     *                      under certain conditions.
+     *                      Default is a function that always returns undefined, meaning that the
+     *                      player will always immediately collect the pickup when they collide with
+     *                      it. Specify this function if your pickup should only be able to be
+     *                      collected under certain conditions. Return value acts similar to
+     *                      `ModCallback.PRE_PICKUP_COLLISION`.
      * @public
      */
-    registerCustomPickup(pickupVariantCustom: PickupVariant, subType: int, collectFunc: (this: void, player: EntityPlayer) => void, collisionFunc?: (this: void, player: EntityPlayer) => boolean): void;
+    registerCustomPickup(pickupVariantCustom: PickupVariant, subType: int, collectFunc: (this: void, pickup: EntityPickup, player: EntityPlayer) => void, collisionFunc?: (this: void, pickup: EntityPickup, player: EntityPlayer) => boolean | undefined): void;
 }
 
 declare class CustomRevive extends Feature {
@@ -3745,6 +3746,8 @@ export declare const DICE_FLOOR_TRIGGER_SQUARE_SIZE = 75;
 /**
  * An array containing every valid `Dimension`, not including `Dimension.CURRENT`. (This is derived
  * from the `NUM_DIMENSIONS` constant.)
+ *
+ * We cannot use the values of the `Dimension` enum because it includes -1.
  */
 export declare const DIMENSIONS: readonly Dimension[];
 

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 87.8.2
+isaacscript-common 87.8.3
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -21405,6 +21405,8 @@ ____exports.MAX_TAINTED_SAMSON_BERSERK_CHARGE = 100000
 ____exports.NUM_DIMENSIONS = getEnumLength(nil, Dimension) - 1
 --- An array containing every valid `Dimension`, not including `Dimension.CURRENT`. (This is derived
 -- from the `NUM_DIMENSIONS` constant.)
+-- 
+-- We cannot use the values of the `Dimension` enum because it includes -1.
 ____exports.DIMENSIONS = eRange(nil, ____exports.NUM_DIMENSIONS)
 --- The pill pool for each run is comprised of one effect for each unique pill color (minus gold and
 -- horse pills.)
@@ -29102,7 +29104,7 @@ end
 -- the prices for items in the shop would be the same as if Isaac had two Steam Sales.)
 function ____exports.getAdjustedPrice(self, basePrice)
     local numSteamSales = ____exports.getTotalPlayerCollectibles(nil, CollectibleType.STEAM_SALE)
-    return numSteamSales > 0 and math.floor(basePrice / (numSteamSales + 1)) or basePrice
+    return math.ceil(basePrice / (numSteamSales + 1))
 end
 --- Helper function to return the total amount of collectibles that a player has that match the
 -- collectible type(s) provided.
@@ -48170,9 +48172,9 @@ function CustomPickups.prototype.____constructor(self)
         if player == nil then
             return nil
         end
-        local shouldPickup = customPickupFunctions.collisionFunc(player)
-        if not shouldPickup then
-            return nil
+        local shouldPickup = customPickupFunctions.collisionFunc(pickup, player)
+        if shouldPickup ~= nil then
+            return shouldPickup
         end
         pickup:Remove()
         local pickupSprite = pickup:GetSprite()
@@ -48181,7 +48183,7 @@ function CustomPickups.prototype.____constructor(self)
         local effectSprite = effect:GetSprite()
         effectSprite:Load(fileName, true)
         effectSprite:Play("Collect", true)
-        customPickupFunctions.collectFunc(player)
+        customPickupFunctions.collectFunc(pickup, player)
         return nil
     end
     self.postEffectRenderPickupEffect = function(____, effect)
@@ -48197,7 +48199,7 @@ function CustomPickups.prototype.____constructor(self)
 end
 function CustomPickups.prototype.registerCustomPickup(self, pickupVariantCustom, subType, collectFunc, collisionFunc)
     if collisionFunc == nil then
-        collisionFunc = function() return true end
+        collisionFunc = function() return nil end
     end
     local entityID = getEntityIDFromConstituents(nil, EntityType.PICKUP, pickupVariantCustom, subType)
     local customPickupFunctions = {collectFunc = collectFunc, collisionFunc = collisionFunc}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "87.8.3",
+  "version": "87.9.0",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/features/other/CustomPickups.ts

@@ -14,8 +14,12 @@ import { spawnEffect } from "../../../functions/entitiesSpecific";
 import { Feature } from "../../private/Feature";
 
 interface CustomPickupFunctions {
-  collectFunc: (this: void, player: EntityPlayer) => void;
-  collisionFunc: (this: void, player: EntityPlayer) => boolean;
+  collectFunc: (this: void, pickup: EntityPickup, player: EntityPlayer) => void;
+  collisionFunc: (
+    this: void,
+    pickup: EntityPickup,
+    player: EntityPlayer,
+  ) => boolean | undefined;
 }
 
 /**
@@ -69,9 +73,9 @@ export class CustomPickups extends Feature {
       return undefined;
     }
 
-    const shouldPickup = customPickupFunctions.collisionFunc(player);
-    if (!shouldPickup) {
-      return undefined;
+    const shouldPickup = customPickupFunctions.collisionFunc(pickup, player);
+    if (shouldPickup !== undefined) {
+      return shouldPickup;
     }
 
     pickup.Remove();
@@ -88,7 +92,7 @@ export class CustomPickups extends Feature {
     effectSprite.Load(fileName, true);
     effectSprite.Play("Collect", true);
 
-    customPickupFunctions.collectFunc(player);
+    customPickupFunctions.collectFunc(pickup, player);
 
     return undefined;
   };
@@ -128,18 +132,27 @@ export class CustomPickups extends Feature {
    * @param subType The sub-type for the corresponding custom pickup.
    * @param collectFunc The function to run when the player collects this pickup.
    * @param collisionFunc Optional. The function to run when a player collides with the pickup.
-   *                      Default is a function that always returns true, meaning that the player
-   *                      will always immediately collect the pickup when they collide with it.
-   *                      Specify this function if your pickup should only be able to be collected
-   *                      under certain conditions.
+   *                      Default is a function that always returns undefined, meaning that the
+   *                      player will always immediately collect the pickup when they collide with
+   *                      it. Specify this function if your pickup should only be able to be
+   *                      collected under certain conditions. Return value acts similar to
+   *                      `ModCallback.PRE_PICKUP_COLLISION`.
    * @public
    */
   @Exported
   public registerCustomPickup(
     pickupVariantCustom: PickupVariant,
     subType: int,
-    collectFunc: (this: void, player: EntityPlayer) => void,
-    collisionFunc: (this: void, player: EntityPlayer) => boolean = () => true,
+    collectFunc: (
+      this: void,
+      pickup: EntityPickup,
+      player: EntityPlayer,
+    ) => void,
+    collisionFunc: (
+      this: void,
+      pickup: EntityPickup,
+      player: EntityPlayer,
+    ) => boolean | undefined = () => undefined,
   ): void {
     const entityID = getEntityIDFromConstituents(
       EntityType.PICKUP,

package/src/core/constants.ts

@@ -276,6 +276,8 @@ export const NUM_DIMENSIONS = getEnumLength(Dimension) - 1;
 /**
  * An array containing every valid `Dimension`, not including `Dimension.CURRENT`. (This is derived
  * from the `NUM_DIMENSIONS` constant.)
+ *
+ * We cannot use the values of the `Dimension` enum because it includes -1.
  */
 export const DIMENSIONS: readonly Dimension[] = eRange(
   NUM_DIMENSIONS,

package/src/functions/playerCollectibles.ts

@@ -78,9 +78,7 @@ export function getActiveItemSlots(
  */
 export function getAdjustedPrice(basePrice: int): int {
   const numSteamSales = getTotalPlayerCollectibles(CollectibleType.STEAM_SALE);
-  return numSteamSales > 0
-    ? Math.floor(basePrice / (numSteamSales + 1))
-    : basePrice;
+  return Math.ceil(basePrice / (numSteamSales + 1));
 }
 
 /**