isaacscript-common 1.2.43 → 1.2.46

package/dist/callbacks/postBoneSwing.lua

@@ -4,7 +4,7 @@ local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local Map = ____lualib.Map
 local ____exports = {}
-local hasSubscriptions, postKnifeRenderBoneClub, boneClubAnimationChanged, BONE_SWING_ANIMATIONS, v
+local hasSubscriptions, postKnifeRender, postKnifeRenderBoneClub, boneClubAnimationChanged, BONE_SWING_ANIMATIONS, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____postBoneSwing = require("callbacks.subscriptions.postBoneSwing")
@@ -13,10 +13,16 @@ local postBoneSwingHasSubscriptions = ____postBoneSwing.postBoneSwingHasSubscrip
 function hasSubscriptions(self)
     return postBoneSwingHasSubscriptions(nil)
 end
-function postKnifeRenderBoneClub(self, boneClub)
+function postKnifeRender(self, knife)
     if not hasSubscriptions(nil) then
         return
     end
+    if knife.Variant ~= 1 then
+        return
+    end
+    postKnifeRenderBoneClub(nil, knife)
+end
+function postKnifeRenderBoneClub(self, boneClub)
     local sprite = boneClub:GetSprite()
     local animation = sprite:GetAnimation()
     local ptrHash = GetPtrHash(boneClub)
@@ -35,6 +41,6 @@ BONE_SWING_ANIMATIONS = __TS__New(Set, {"Swing", "Swing2", "Spin"})
 v = {room = {boneClubAnimations = __TS__New(Map)}}
 function ____exports.postBoneSwingCallbackInit(self, mod)
     saveDataManager(nil, "postBoneSwing", v, hasSubscriptions)
-    mod:AddCallback(ModCallbacks.MC_POST_KNIFE_RENDER, postKnifeRenderBoneClub, 1)
+    mod:AddCallback(ModCallbacks.MC_POST_KNIFE_RENDER, postKnifeRender)
 end
 return ____exports

package/dist/callbacks/postTransformation.lua

@@ -1,9 +1,10 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
+local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
+local Map = ____lualib.Map
 local ____exports = {}
-local hasSubscriptions, postPEffectUpdateReordered, v
+local hasSubscriptions, postPEffectUpdateReordered, UNUSED_TRANSFORMATIONS, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____array = require("functions.array")
@@ -31,16 +32,23 @@ function postPEffectUpdateReordered(self, player)
     do
         local playerForm = 0
         while playerForm < PlayerForm.NUM_PLAYER_FORMS do
-            local hasForm = player:HasPlayerForm(playerForm)
-            local storedForm = transformations[playerForm + 1]
-            if hasForm ~= storedForm then
-                transformations[playerForm + 1] = hasForm
-                postTransformationFire(nil, player, playerForm, hasForm)
+            do
+                if UNUSED_TRANSFORMATIONS:has(playerForm) then
+                    goto __continue7
+                end
+                local hasForm = player:HasPlayerForm(playerForm)
+                local storedForm = transformations[playerForm + 1]
+                if hasForm ~= storedForm then
+                    transformations[playerForm + 1] = hasForm
+                    postTransformationFire(nil, player, playerForm, hasForm)
+                end
             end
+            ::__continue7::
             playerForm = playerForm + 1
         end
     end
 end
+UNUSED_TRANSFORMATIONS = __TS__New(Set, {PlayerForm.PLAYERFORM_FLIGHT})
 v = {run = {transformations = __TS__New(Map)}}
 function ____exports.postTransformationCallbackInit(self, mod)
     saveDataManager(nil, "postTransformation", v, hasSubscriptions)

package/dist/constants.d.ts

@@ -104,12 +104,8 @@ export declare const MAX_VANILLA_CHARACTER = PlayerType.PLAYER_THESOUL_B;
 export declare const MAX_VANILLA_COLLECTIBLE_TYPE = CollectibleType.COLLECTIBLE_MOMS_RING;
 export declare const SECOND_IN_MILLISECONDS = 1000;
 export declare const MINUTE_IN_MILLISECONDS: number;
-export declare const MOVEMENT_ACTIONS: readonly ButtonAction[];
-export declare const MOVEMENT_ACTIONS_SET: ReadonlySet<ButtonAction>;
 export declare const ONE_BY_ONE_ROOM_GRID_SIZE = 135;
 export declare const SINGLE_USE_ACTIVE_COLLECTIBLE_TYPES: ReadonlySet<CollectibleType>;
-export declare const SHOOTING_ACTIONS: readonly ButtonAction[];
-export declare const SHOOTING_ACTIONS_SET: ReadonlySet<ButtonAction>;
 export declare const STORY_BOSSES: ReadonlySet<EntityType>;
 /**
  * This is the number of draw coordinates that each heart spans on the UI in the upper left hand

package/dist/constants.lua

@@ -90,8 +90,6 @@ ____exports.MAX_VANILLA_CHARACTER = PlayerType.PLAYER_THESOUL_B
 ____exports.MAX_VANILLA_COLLECTIBLE_TYPE = CollectibleType.COLLECTIBLE_MOMS_RING
 ____exports.SECOND_IN_MILLISECONDS = 1000
 ____exports.MINUTE_IN_MILLISECONDS = 60 * ____exports.SECOND_IN_MILLISECONDS
-____exports.MOVEMENT_ACTIONS = {ButtonAction.ACTION_LEFT, ButtonAction.ACTION_RIGHT, ButtonAction.ACTION_UP, ButtonAction.ACTION_DOWN}
-____exports.MOVEMENT_ACTIONS_SET = __TS__New(Set, ____exports.MOVEMENT_ACTIONS)
 ____exports.ONE_BY_ONE_ROOM_GRID_SIZE = 135
 ____exports.SINGLE_USE_ACTIVE_COLLECTIBLE_TYPES = __TS__New(Set, {
     CollectibleType.COLLECTIBLE_FORGET_ME_NOW,
@@ -103,8 +101,6 @@ ____exports.SINGLE_USE_ACTIVE_COLLECTIBLE_TYPES = __TS__New(Set, {
     CollectibleType.COLLECTIBLE_DEATH_CERTIFICATE,
     CollectibleType.COLLECTIBLE_R_KEY
 })
-____exports.SHOOTING_ACTIONS = {ButtonAction.ACTION_SHOOTLEFT, ButtonAction.ACTION_SHOOTRIGHT, ButtonAction.ACTION_SHOOTUP, ButtonAction.ACTION_SHOOTDOWN}
-____exports.SHOOTING_ACTIONS_SET = __TS__New(Set, ____exports.SHOOTING_ACTIONS)
 ____exports.STORY_BOSSES = __TS__New(Set, {
     EntityType.ENTITY_MOM,
     EntityType.ENTITY_MOMS_HEART,

package/dist/features/disableInputs.d.ts

@@ -1,59 +1,62 @@
 /// <reference types="isaac-typescript-definitions" />
-/** After having disabled inputs, use this function to set things back to normal. */
-export declare function enableAllInputs(): void;
 /**
- * Helper function to disable all inputs.
- * This is useful because `EntityPlayer.ControlsEnabled` can be changed by the game under certain
- * conditions.
+ * Helper function to enable all inputs. Use this function to set things back to normal after having
+ * used one of the other helper functions to disable inputs.
  *
- * Call `enableAllInputs()` to set things back to normal.
+ * @param key The name of the mod feature that is requesting the enable/disable. This is needed so
+ * that multiple mod features can work in tandem.
+ */
+export declare function enableAllInputs(key: string): void;
+/**
+ * Helper function to disable all inputs. This is useful because `EntityPlayer.ControlsEnabled` can
+ * be changed by the game under certain conditions.
+ *
+ * Use the [[`enableAllInputs`]] helper function to set things back to normal.
  *
- * Note that calling any of the various `enable` or `disable` functions will override the effects of
- * this function.
+ * @param key The name of the mod feature that is requesting the enable/disable. This is needed so
+ * that multiple mod features can work in tandem.
  */
-export declare function disableAllInputs(): void;
+export declare function disableAllInputs(key: string): void;
 /**
- * Helper function to enable all inputs besides the ones provided.
- * This is useful because `EntityPlayer.ControlsEnabled` can be changed by the game under certain
- * conditions.
+ * Helper function to enable all inputs besides the ones provided. This is useful because
+ * `EntityPlayer.ControlsEnabled` can be changed by the game under certain conditions.
  *
- * Call `enableAllInputs()` to set things back to normal.
+ * Use the [[`enableAllInputs`]] helper function to set things back to normal.
  *
- * Note that calling any of the various `enable` or `disable` functions will override the effects of
- * this function.
+ * @param key The name of the mod feature that is requesting the enable/disable. This is needed so
+ * that multiple mod features can work in tandem.
+ * @param blacklist A set of ButtonActions to disallow.
  */
-export declare function enableAllInputsExceptFor(blacklist: Set<ButtonAction> | ReadonlySet<ButtonAction>): void;
+export declare function enableAllInputsExceptFor(key: string, blacklist: Set<ButtonAction> | ReadonlySet<ButtonAction>): void;
 /**
- * Helper function to disable all inputs besides the ones provided.
- * This is useful because `EntityPlayer.ControlsEnabled` can be changed by the game under certain
- * conditions.
+ * Helper function to disable all inputs besides the ones provided. This is useful because
+ * `EntityPlayer.ControlsEnabled` can be changed by the game under certain conditions.
  *
- * Call `enableAllInputs()` to set things back to normal.
+ * Use the [[`enableAllInputs`]] helper function to set things back to normal.
  *
- * Note that calling any of the various `enable` or `disable` functions will override the effects of
- * this function.
+ * @param key The name of the mod feature that is requesting the enable/disable. This is needed so
+ * that multiple mod features can work in tandem.
+ * @param whitelist A set of ButtonActions to allow.
  */
-export declare function disableAllInputsExceptFor(whitelist: Set<ButtonAction>): void;
+export declare function disableAllInputsExceptFor(key: string, whitelist: Set<ButtonAction>): void;
 /**
  * Helper function to disable only the inputs used for moving the character (or moving the cursor in
- * the UI).
- * This is useful because `EntityPlayer.ControlsEnabled` can be changed by the game under certain
- * conditions.
+ * the UI). This is useful because `EntityPlayer.ControlsEnabled` can be changed by the game under
+ * certain conditions.
  *
- * Call `enableInputs()` to set things back to normal.
+ * Use the [[`enableAllInputs`]] helper function to set things back to normal.
  *
- * Note that calling any of the various `enable` or `disable` functions will override the effects of
- * this function.
+ * @param key The name of the mod feature that is requesting the enable/disable. This is needed so
+ * that multiple mod features can work in tandem.
  */
-export declare function disableMovementInputs(): void;
+export declare function disableMovementInputs(key: string): void;
 /**
- * Helper function to disable only the inputs used for shooting tears.
- * This is useful because `EntityPlayer.ControlsEnabled` can be changed by the game under certain
- * conditions.
+ * Helper function to disable only the inputs used for shooting tears. This is useful because
+ * `EntityPlayer.ControlsEnabled` can be changed by the game under certain conditions.
  *
- * Call `enableInputs()` to set things back to normal.
+ * Use the [[`enableAllInputs`]] helper function to set things back to normal.
  *
- * Note that calling any of the various `enable` or `disable` functions will override the effects of
- * this function.
+ * @param key The name of the mod feature that is requesting the enable/disable. This is needed so
+ * that multiple mod features can work in tandem.
  */
-export declare function disableShootingInputs(): void;
+export declare function disableShootingInputs(key: string): void;

package/dist/features/disableInputs.lua

@@ -1,13 +1,16 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____lualib = require("lualib_bundle")
+local Map = ____lualib.Map
+local __TS__New = ____lualib.__TS__New
+local __TS__Iterator = ____lualib.__TS__Iterator
 local Set = ____lualib.Set
 local ____exports = {}
 local isActionPressed, isActionTriggered, getActionValue, getReturnValue, v
-local ____constants = require("constants")
-local MOVEMENT_ACTIONS_SET = ____constants.MOVEMENT_ACTIONS_SET
-local SHOOTING_ACTIONS_SET = ____constants.SHOOTING_ACTIONS_SET
 local ____errors = require("errors")
 local getUpgradeErrorMsg = ____errors.getUpgradeErrorMsg
+local ____input = require("functions.input")
+local getMoveActions = ____input.getMoveActions
+local getShootActions = ____input.getShootActions
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 function isActionPressed(self, _entity, _inputHook, buttonAction)
@@ -27,20 +30,24 @@ function getReturnValue(self, buttonAction, booleanCallback)
         ____booleanCallback_0 = 0
     end
     local disableValue = ____booleanCallback_0
-    if not v.run.enableSomeInputs then
-        return disableValue
+    for ____, whitelist in __TS__Iterator(v.run.disableInputsWithWhitelistMap:values()) do
+        if not whitelist:has(buttonAction) then
+            return disableValue
+        end
     end
-    if v.run.whitelist ~= nil and not v.run.whitelist:has(buttonAction) then
-        return disableValue
-    end
-    if v.run.blacklist ~= nil and v.run.blacklist:has(buttonAction) then
-        return disableValue
+    for ____, blacklist in __TS__Iterator(v.run.enableInputsWithBlacklistMap:values()) do
+        if blacklist:has(buttonAction) then
+            return disableValue
+        end
     end
     return nil
 end
 local FEATURE_NAME = "input disabler"
 local initialized = false
-v = {run = {enableSomeInputs = true, whitelist = nil, blacklist = nil}}
+v = {run = {
+    disableInputsWithWhitelistMap = __TS__New(Map),
+    enableInputsWithBlacklistMap = __TS__New(Map)
+}}
 function ____exports.disableInputsInit(self, mod)
     initialized = true
     saveDataManager(nil, "disableInputs", v)
@@ -48,46 +55,47 @@ function ____exports.disableInputsInit(self, mod)
     mod:AddCallback(ModCallbacks.MC_INPUT_ACTION, isActionTriggered, InputHook.IS_ACTION_TRIGGERED)
     mod:AddCallback(ModCallbacks.MC_INPUT_ACTION, getActionValue, InputHook.GET_ACTION_VALUE)
 end
-function ____exports.enableAllInputs(self)
+function ____exports.enableAllInputs(self, key)
     if not initialized then
         local msg = getUpgradeErrorMsg(nil, FEATURE_NAME)
         error(msg)
     end
-    v.run.enableSomeInputs = true
-    v.run.whitelist = nil
-    v.run.blacklist = nil
+    v.run.disableInputsWithWhitelistMap:delete(key)
+    v.run.enableInputsWithBlacklistMap:delete(key)
 end
-function ____exports.disableAllInputs(self)
+function ____exports.disableAllInputs(self, key)
     if not initialized then
         local msg = getUpgradeErrorMsg(nil, FEATURE_NAME)
         error(msg)
     end
-    v.run.enableSomeInputs = false
-    v.run.whitelist = nil
-    v.run.blacklist = nil
+    v.run.disableInputsWithWhitelistMap:set(
+        key,
+        __TS__New(Set)
+    )
+    v.run.enableInputsWithBlacklistMap:delete(key)
 end
-function ____exports.enableAllInputsExceptFor(self, blacklist)
+function ____exports.enableAllInputsExceptFor(self, key, blacklist)
     if not initialized then
         local msg = getUpgradeErrorMsg(nil, FEATURE_NAME)
         error(msg)
     end
-    v.run.enableSomeInputs = true
-    v.run.whitelist = nil
-    v.run.blacklist = blacklist
+    v.run.disableInputsWithWhitelistMap:delete(key)
+    v.run.enableInputsWithBlacklistMap:set(key, blacklist)
 end
-function ____exports.disableAllInputsExceptFor(self, whitelist)
+function ____exports.disableAllInputsExceptFor(self, key, whitelist)
     if not initialized then
         local msg = getUpgradeErrorMsg(nil, FEATURE_NAME)
         error(msg)
     end
-    v.run.enableSomeInputs = true
-    v.run.whitelist = whitelist
-    v.run.blacklist = nil
+    v.run.disableInputsWithWhitelistMap:set(key, whitelist)
+    v.run.enableInputsWithBlacklistMap:delete(key)
 end
-function ____exports.disableMovementInputs(self)
-    ____exports.enableAllInputsExceptFor(nil, MOVEMENT_ACTIONS_SET)
+function ____exports.disableMovementInputs(self, key)
+    local moveActions = getMoveActions(nil)
+    ____exports.enableAllInputsExceptFor(nil, key, moveActions)
 end
-function ____exports.disableShootingInputs(self)
-    ____exports.enableAllInputsExceptFor(nil, SHOOTING_ACTIONS_SET)
+function ____exports.disableShootingInputs(self, key)
+    local shootActions = getShootActions(nil)
+    ____exports.enableAllInputsExceptFor(nil, key, shootActions)
 end
 return ____exports

package/dist/functions/input.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="isaac-typescript-definitions" />
 /** Helper function to get the enum name for the specified `Controller` value. */
 export declare function controllerToString(controller: Controller): string;
+export declare function getMoveActions(): Set<ButtonAction>;
+export declare function getShootActions(): Set<ButtonAction>;
 /** Iterates over all inputs to determine if a particular button is pressed (i.e. held down). */
 export declare function isActionPressedOnAnyInput(buttonAction: ButtonAction): boolean;
 /**
@@ -9,8 +11,10 @@ export declare function isActionPressedOnAnyInput(buttonAction: ButtonAction): b
  */
 export declare function isActionTriggeredOnAnyInput(buttonAction: ButtonAction): boolean;
 export declare function isKeyboardPressed(key: Keyboard): boolean;
+export declare function isMoveAction(buttonAction: ButtonAction): boolean;
 export declare function isMoveActionPressedOnAnyInput(): boolean;
 export declare function isMoveActionTriggeredOnAnyInput(): boolean;
+export declare function isShootAction(buttonAction: ButtonAction): boolean;
 export declare function isShootActionPressedOnAnyInput(): boolean;
 export declare function isShootActionTriggeredOnAnyInput(): boolean;
 /** Helper function to get the enum name for the specified `Keyboard` value. */

package/dist/functions/input.lua

@@ -1,5 +1,7 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____lualib = require("lualib_bundle")
+local Set = ____lualib.Set
+local __TS__New = ____lualib.__TS__New
 local __TS__StringReplace = ____lualib.__TS__StringReplace
 local __TS__ObjectEntries = ____lualib.__TS__ObjectEntries
 local __TS__ArraySome = ____lualib.__TS__ArraySome
@@ -7,10 +9,10 @@ local __TS__StringSlice = ____lualib.__TS__StringSlice
 local ____exports = {}
 local ____constants = require("constants")
 local MAX_NUM_INPUTS = ____constants.MAX_NUM_INPUTS
-local MOVEMENT_ACTIONS = ____constants.MOVEMENT_ACTIONS
-local SHOOTING_ACTIONS = ____constants.SHOOTING_ACTIONS
 local ____math = require("functions.math")
 local range = ____math.range
+local ____set = require("functions.set")
+local copySet = ____set.copySet
 local ControllerLiteral = ControllerLiteral or ({})
 ControllerLiteral.DPAD_LEFT = 0
 ControllerLiteral[ControllerLiteral.DPAD_LEFT] = "DPAD_LEFT"
@@ -44,6 +46,10 @@ ControllerLiteral.BUTTON_BACK = 14
 ControllerLiteral[ControllerLiteral.BUTTON_BACK] = "BUTTON_BACK"
 ControllerLiteral.BUTTON_START = 15
 ControllerLiteral[ControllerLiteral.BUTTON_START] = "BUTTON_START"
+local MOVEMENT_ACTIONS = {ButtonAction.ACTION_LEFT, ButtonAction.ACTION_RIGHT, ButtonAction.ACTION_UP, ButtonAction.ACTION_DOWN}
+local MOVEMENT_ACTIONS_SET = __TS__New(Set, MOVEMENT_ACTIONS)
+local SHOOTING_ACTIONS = {ButtonAction.ACTION_SHOOTLEFT, ButtonAction.ACTION_SHOOTRIGHT, ButtonAction.ACTION_SHOOTUP, ButtonAction.ACTION_SHOOTDOWN}
+local SHOOTING_ACTIONS_SET = __TS__New(Set, SHOOTING_ACTIONS)
 function ____exports.controllerToString(self, controller)
     for ____, ____value in ipairs(__TS__ObjectEntries(ControllerLiteral)) do
         local key = ____value[1]
@@ -72,6 +78,12 @@ function ____exports.controllerToString(self, controller)
     end
     return "unknown"
 end
+function ____exports.getMoveActions(self)
+    return copySet(nil, MOVEMENT_ACTIONS_SET)
+end
+function ____exports.getShootActions(self)
+    return copySet(nil, SHOOTING_ACTIONS_SET)
+end
 function ____exports.isActionPressedOnAnyInput(self, buttonAction)
     local validInputs = range(nil, 0, MAX_NUM_INPUTS - 1)
     return __TS__ArraySome(
@@ -89,6 +101,9 @@ end
 function ____exports.isKeyboardPressed(self, key)
     return Input.IsButtonPressed(key, 0)
 end
+function ____exports.isMoveAction(self, buttonAction)
+    return MOVEMENT_ACTIONS_SET:has(buttonAction)
+end
 function ____exports.isMoveActionPressedOnAnyInput(self)
     return __TS__ArraySome(
         MOVEMENT_ACTIONS,
@@ -101,6 +116,9 @@ function ____exports.isMoveActionTriggeredOnAnyInput(self)
         function(____, moveAction) return ____exports.isActionTriggeredOnAnyInput(nil, moveAction) end
     )
 end
+function ____exports.isShootAction(self, buttonAction)
+    return SHOOTING_ACTIONS_SET:has(buttonAction)
+end
 function ____exports.isShootActionPressedOnAnyInput(self)
     return __TS__ArraySome(
         SHOOTING_ACTIONS,

package/dist/functions/player.d.ts

@@ -60,8 +60,8 @@ export declare function getClosestPlayer(position: Vector): EntityPlayer;
  */
 export declare function getDeathAnimationName(player: EntityPlayer): string;
 /**
- * Helper function to return the player with the highest index, according to the
- * `Isaac.GetPlayer()` method.
+ * Helper function to return the player with the highest ID, according to the `Isaac.GetPlayer()`
+ * method.
  */
 export declare function getFinalPlayer(): EntityPlayer;
 /**
@@ -116,12 +116,17 @@ export declare function getPlayerFromIndex(playerIndex: PlayerIndex): EntityPlay
  *   continuing.
  * - We cannot use `GetPtrHash()` as an index because it does not persist across exiting and
  *   relaunching the game.
+ * - We cannot use `EntityPlayer.InitSeed` because it is not consistent with additional players
+ *   beyond the first.
  *
- * Instead, we use `EntityPlayer.GetCollectibleRNG()` with an arbitrary value of 1 (i.e. Sad Onion).
- * This works even if the player does not have any Sad Onions.
+ * Instead, we use `EntityPlayer.GetCollectibleRNG()` with an arbitrary value of Sad Onion (1). This
+ * works even if the player does not have any Sad Onions.
  *
- * Finally, this index fails in the case of Tainted Lazarus, since the RNG will be the same for both
- * Tainted Lazarus and Dead Tainted Lazarus. We revert to using the RNG of Inner Eye for this case.
+ * Since the RNG value is the same for both The Forgotten and The Soul, we revert to using the RNG
+ * of Inner Eye (2) for The Soul.
+ *
+ * Since the RNG value is the same for both Tainted Lazarus and Dead Tainted Lazarus, we revert to
+ * using the RNG of Spoon Bender (3) for Dead Tainted Lazarus.
  */
 export declare function getPlayerIndex(player: EntityPlayer): PlayerIndex;
 /**

package/dist/functions/player.lua

@@ -9,7 +9,7 @@ local __TS__Iterator = ____lualib.__TS__Iterator
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
-local getAdjustedPlayerName, isTaintedModded, EXCLUDED_CHARACTERS
+local getPlayerIndexCollectibleType, getAdjustedPlayerName, isTaintedModded, EXCLUDED_CHARACTERS
 local ____constants = require("constants")
 local CHARACTERS_WITH_BLACK_HEART_FROM_ETERNAL_HEART = ____constants.CHARACTERS_WITH_BLACK_HEART_FROM_ETERNAL_HEART
 local CHARACTERS_WITH_FREE_DEVIL_DEALS = ____constants.CHARACTERS_WITH_FREE_DEVIL_DEALS
@@ -52,11 +52,33 @@ function ____exports.getCharacters(self)
 end
 function ____exports.getPlayerIndex(self, player)
     local character = player:GetPlayerType()
-    local collectibleToUse = character == PlayerType.PLAYER_LAZARUS2_B and CollectibleType.COLLECTIBLE_INNER_EYE or CollectibleType.COLLECTIBLE_SAD_ONION
-    local collectibleRNG = player:GetCollectibleRNG(collectibleToUse)
+    local collectibleType = getPlayerIndexCollectibleType(nil, character)
+    local collectibleRNG = player:GetCollectibleRNG(collectibleType)
     local seed = collectibleRNG:GetSeed()
     return seed
 end
+function getPlayerIndexCollectibleType(self, character)
+    repeat
+        local ____switch62 = character
+        local ____cond62 = ____switch62 == PlayerType.PLAYER_THESOUL
+        if ____cond62 then
+            do
+                return CollectibleType.COLLECTIBLE_INNER_EYE
+            end
+        end
+        ____cond62 = ____cond62 or ____switch62 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond62 then
+            do
+                return CollectibleType.COLLECTIBLE_SPOON_BENDER
+            end
+        end
+        do
+            do
+                return CollectibleType.COLLECTIBLE_SAD_ONION
+            end
+        end
+    until true
+end
 function ____exports.getPlayerMaxHeartContainers(self, player)
     local character = player:GetPlayerType()
     local maxHeartContainers = ____exports.getCharacterMaxHeartContainers(nil, character)
@@ -73,39 +95,39 @@ end
 function getAdjustedPlayerName(self, player)
     local character = player:GetPlayerType()
     repeat
-        local ____switch71 = character
-        local ____cond71 = ____switch71 == PlayerType.PLAYER_BLUEBABY or ____switch71 == PlayerType.PLAYER_BLUEBABY_B
-        if ____cond71 then
+        local ____switch75 = character
+        local ____cond75 = ____switch75 == PlayerType.PLAYER_BLUEBABY or ____switch75 == PlayerType.PLAYER_BLUEBABY_B
+        if ____cond75 then
             do
                 return "Blue Baby"
             end
         end
-        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_LAZARUS2
-        if ____cond71 then
+        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_LAZARUS2
+        if ____cond75 then
             do
                 return "Lazarus II"
             end
         end
-        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_BLACKJUDAS
-        if ____cond71 then
+        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_BLACKJUDAS
+        if ____cond75 then
             do
                 return "Dark Judas"
             end
         end
-        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_JACOB
-        if ____cond71 then
+        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_JACOB
+        if ____cond75 then
             do
                 return "Jacob & Esau"
             end
         end
-        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_LAZARUS2_B
-        if ____cond71 then
+        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_LAZARUS2_B
+        if ____cond75 then
             do
                 return "Dead Tainted Lazarus"
             end
         end
-        ____cond71 = ____cond71 or ____switch71 == PlayerType.PLAYER_JACOB2_B
-        if ____cond71 then
+        ____cond75 = ____cond75 or ____switch75 == PlayerType.PLAYER_JACOB2_B
+        if ____cond75 then
             do
                 return "Dead Tainted Jacob"
             end
@@ -128,19 +150,16 @@ function ____exports.getPlayers(self, performExclusions)
         while i < game:GetNumPlayers() do
             do
                 local player = Isaac.GetPlayer(i)
-                if player == nil then
-                    goto __continue81
-                end
                 if ____exports.isChildPlayer(nil, player) then
-                    goto __continue81
+                    goto __continue85
                 end
                 local character = player:GetPlayerType()
                 if performExclusions and EXCLUDED_CHARACTERS:has(character) then
-                    goto __continue81
+                    goto __continue85
                 end
                 __TS__ArrayPush(players, player)
             end
-            ::__continue81::
+            ::__continue85::
             i = i + 1
         end
     end
@@ -365,17 +384,11 @@ function ____exports.getPlayerIndexVanilla(self, playerToFind)
     do
         local i = 0
         while i < game:GetNumPlayers() do
-            do
-                local player = Isaac.GetPlayer(i)
-                if player == nil then
-                    goto __continue62
-                end
-                local playerHash = GetPtrHash(player)
-                if playerHash == playerToFindHash then
-                    return i
-                end
+            local player = Isaac.GetPlayer(i)
+            local playerHash = GetPtrHash(player)
+            if playerHash == playerToFindHash then
+                return i
             end
-            ::__continue62::
             i = i + 1
         end
     end
@@ -545,9 +558,9 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
         itemPool:RemoveCollectible(collectibleType)
     end
     repeat
-        local ____switch124 = activeSlot
-        local ____cond124 = ____switch124 == ActiveSlot.SLOT_PRIMARY
-        if ____cond124 then
+        local ____switch127 = activeSlot
+        local ____cond127 = ____switch127 == ActiveSlot.SLOT_PRIMARY
+        if ____cond127 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -556,8 +569,8 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_SECONDARY
-        if ____cond124 then
+        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_SECONDARY
+        if ____cond127 then
             do
                 if primaryCollectibleType ~= CollectibleType.COLLECTIBLE_NULL then
                     player:RemoveCollectible(primaryCollectibleType)
@@ -572,16 +585,16 @@ function ____exports.setActiveItem(self, player, collectibleType, activeSlot, ch
                 break
             end
         end
-        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_POCKET
-        if ____cond124 then
+        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_POCKET
+        if ____cond127 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 player:SetActiveCharge(charge, activeSlot)
                 break
             end
         end
-        ____cond124 = ____cond124 or ____switch124 == ActiveSlot.SLOT_POCKET2
-        if ____cond124 then
+        ____cond127 = ____cond127 or ____switch127 == ActiveSlot.SLOT_POCKET2
+        if ____cond127 then
             do
                 player:SetPocketActiveItem(collectibleType, activeSlot, keepInPools)
                 break

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.43",
+  "version": "1.2.46",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "@zamiell/typescript-to-lua": "^1.4.0",
-    "isaac-typescript-definitions": "^1.0.347",
+    "isaac-typescript-definitions": "^1.0.348",
     "isaacscript-lint": "^1.0.79",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.12",