isaacscript-common 35.0.0 → 35.0.1

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 35.0.0
+isaacscript-common 35.0.1
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -30382,8 +30382,6 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
-local ____shouldFire = require("src.shouldFire")
-local shouldFirePickup = ____shouldFire.shouldFirePickup
 local ____CustomCallback = require("src.classes.private.CustomCallback")
 local CustomCallback = ____CustomCallback.CustomCallback
 ____exports.PostPickupSelectionFilter = __TS__Class()
@@ -30392,7 +30390,11 @@ PostPickupSelectionFilter.name = "PostPickupSelectionFilter"
 __TS__ClassExtends(PostPickupSelectionFilter, CustomCallback)
 function PostPickupSelectionFilter.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
-    self.shouldFire = shouldFirePickup
+    self.shouldFire = function(____, fireArgs, optionalArgs)
+        local _pickup, pickupVariant, subType = table.unpack(fireArgs)
+        local callbackPickupVariant, callbackPickupSubType = table.unpack(optionalArgs)
+        return (callbackPickupVariant == nil or callbackPickupVariant == pickupVariant) and (callbackPickupSubType == nil or callbackPickupSubType == subType)
+    end
     self.postPickupSelection = function(____, pickup, variant, subType) return self:fire(pickup, variant, subType) end
     self.callbacksUsed = {{ModCallback.POST_PICKUP_SELECTION, self.postPickupSelection}}
 end

package/dist/src/classes/callbacks/PostPickupSelectionFilter.d.ts

@@ -1,9 +1,16 @@
+import type { PickupVariant } from "isaac-typescript-definitions";
 import type { ModCallbackCustom } from "../../enums/ModCallbackCustom";
-import { shouldFirePickup } from "../../shouldFire";
 import { CustomCallback } from "../private/CustomCallback";
-export declare class PostPickupSelectionFilter extends CustomCallback<ModCallbackCustom.POST_PICKUP_SELECTION_FILTER> {
+type T = ModCallbackCustom.POST_PICKUP_SELECTION_FILTER;
+export declare class PostPickupSelectionFilter extends CustomCallback<T> {
     constructor();
-    protected shouldFire: typeof shouldFirePickup;
+    /**
+     * We cannot use the `shouldFirePickup` helper function because in the case of non-collectibles,
+     * `EntityPickup.Type` and `EntityPickup.Variant` and `EntityPickup.SubType` will all be set to 0
+     * in this callback.
+     */
+    protected shouldFire: (fireArgs: [pickup: EntityPickup, variant: PickupVariant, subType: int], optionalArgs: [pickupVariant?: PickupVariant | undefined, subType?: int | undefined]) => boolean;
     private readonly postPickupSelection;
 }
+export {};
 //# sourceMappingURL=PostPickupSelectionFilter.d.ts.map

package/dist/src/classes/callbacks/PostPickupSelectionFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostPickupSelectionFilter.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostPickupSelectionFilter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,qBAAa,yBAA0B,SAAQ,cAAc,CAAC,iBAAiB,CAAC,4BAA4B,CAAC;;IAU3G,UAAmB,UAAU,0BAAoB;IAGjD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAIuC;CAC5E"}
+{"version":3,"file":"PostPickupSelectionFilter.d.ts","sourceRoot":"","sources":["../../../../src/classes/callbacks/PostPickupSelectionFilter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,KAAK,CAAC,GAAG,iBAAiB,CAAC,4BAA4B,CAAC;AAExD,qBAAa,yBAA0B,SAAQ,cAAc,CAAC,CAAC,CAAC;;IAU9D;;;;OAIG;IACH,UAAmB,UAAU,oKAG1B,OAAO,CASR;IAGF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAIuC;CAC5E"}

package/dist/src/classes/callbacks/PostPickupSelectionFilter.lua

@@ -4,8 +4,6 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
-local ____shouldFire = require("src.shouldFire")
-local shouldFirePickup = ____shouldFire.shouldFirePickup
 local ____CustomCallback = require("src.classes.private.CustomCallback")
 local CustomCallback = ____CustomCallback.CustomCallback
 ____exports.PostPickupSelectionFilter = __TS__Class()
@@ -14,7 +12,11 @@ PostPickupSelectionFilter.name = "PostPickupSelectionFilter"
 __TS__ClassExtends(PostPickupSelectionFilter, CustomCallback)
 function PostPickupSelectionFilter.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
-    self.shouldFire = shouldFirePickup
+    self.shouldFire = function(____, fireArgs, optionalArgs)
+        local _pickup, pickupVariant, subType = table.unpack(fireArgs)
+        local callbackPickupVariant, callbackPickupSubType = table.unpack(optionalArgs)
+        return (callbackPickupVariant == nil or callbackPickupVariant == pickupVariant) and (callbackPickupSubType == nil or callbackPickupSubType == subType)
+    end
     self.postPickupSelection = function(____, pickup, variant, subType) return self:fire(pickup, variant, subType) end
     self.callbacksUsed = {{ModCallback.POST_PICKUP_SELECTION, self.postPickupSelection}}
 end

package/package.json

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

package/src/classes/callbacks/PostPickupSelectionFilter.ts

@@ -1,10 +1,12 @@
 import type { PickupVariant } from "isaac-typescript-definitions";
 import { ModCallback } from "isaac-typescript-definitions";
 import type { ModCallbackCustom } from "../../enums/ModCallbackCustom";
-import { shouldFirePickup } from "../../shouldFire";
+import type { FireArgs, OptionalArgs } from "../private/CustomCallback";
 import { CustomCallback } from "../private/CustomCallback";
 
-export class PostPickupSelectionFilter extends CustomCallback<ModCallbackCustom.POST_PICKUP_SELECTION_FILTER> {
+type T = ModCallbackCustom.POST_PICKUP_SELECTION_FILTER;
+
+export class PostPickupSelectionFilter extends CustomCallback<T> {
   constructor() {
     super();
 
@@ -14,7 +16,24 @@ export class PostPickupSelectionFilter extends CustomCallback<ModCallbackCustom.
     ];
   }
 
-  protected override shouldFire = shouldFirePickup;
+  /**
+   * We cannot use the `shouldFirePickup` helper function because in the case of non-collectibles,
+   * `EntityPickup.Type` and `EntityPickup.Variant` and `EntityPickup.SubType` will all be set to 0
+   * in this callback.
+   */
+  protected override shouldFire = (
+    fireArgs: FireArgs<T>,
+    optionalArgs: OptionalArgs<T>,
+  ): boolean => {
+    const [_pickup, pickupVariant, subType] = fireArgs;
+    const [callbackPickupVariant, callbackPickupSubType] = optionalArgs;
+
+    return (
+      (callbackPickupVariant === undefined ||
+        callbackPickupVariant === pickupVariant) &&
+      (callbackPickupSubType === undefined || callbackPickupSubType === subType)
+    );
+  };
 
   // ModCallback.POST_PICKUP_SELECTION (37)
   private readonly postPickupSelection = (