isaacscript-common 1.2.177 → 1.2.180

package/dist/callbacks/postCollectibleInitFirst.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/callbacks/postCollectibleInitFirst.lua

@@ -0,0 +1,29 @@
+local ____lualib = require("lualib_bundle")
+local Set = ____lualib.Set
+local __TS__New = ____lualib.__TS__New
+local ____exports = {}
+local hasSubscriptions, postPickupInitCollectible, v
+local ____exports = require("features.saveDataManager.exports")
+local saveDataManager = ____exports.saveDataManager
+local ____collectibles = require("functions.collectibles")
+local getCollectibleIndex = ____collectibles.getCollectibleIndex
+local ____postCollectibleInitFirst = require("callbacks.subscriptions.postCollectibleInitFirst")
+local postCollectibleInitFirstFire = ____postCollectibleInitFirst.postCollectibleInitFirstFire
+local postCollectibleInitFirstHasSubscriptions = ____postCollectibleInitFirst.postCollectibleInitFirstHasSubscriptions
+function hasSubscriptions(self)
+    return postCollectibleInitFirstHasSubscriptions(nil)
+end
+function postPickupInitCollectible(self, collectible)
+    local collectibleIndex = getCollectibleIndex(nil, collectible)
+    if v.run.seenCollectibles:has(collectibleIndex) then
+        return
+    end
+    v.run.seenCollectibles:add(collectibleIndex)
+    postCollectibleInitFirstFire(nil, collectible)
+end
+v = {run = {seenCollectibles = __TS__New(Set)}}
+function ____exports.postCollectibleInitFirstCallbackInit(self, mod)
+    saveDataManager(nil, "postCollectibleInitFirst", v, hasSubscriptions)
+    mod:AddCallback(ModCallbacks.MC_POST_PICKUP_INIT, postPickupInitCollectible, 100)
+end
+return ____exports

package/dist/callbacks/postTrinketBreak.lua

@@ -33,7 +33,7 @@ function entityTakeDmgPlayer(self, tookDamage, _damageAmount, _damageFlags, _dam
                 goto __continue8
             end
             trinketMap:set(trinketType, numTrinketsHeld)
-            local numTrinketsOnGround = Isaac.CountEntities(nil, EntityType.ENTITY_PICKUP, PickupVariant.PICKUP_TRINKET, trinketType)
+            local numTrinketsOnGround = Isaac.CountEntities(nil, EntityType.ENTITY_PICKUP, 350, trinketType)
             if numTrinketsOnGround > 0 then
                 goto __continue8
             end

package/dist/callbacks/subscriptions/postCollectibleInitFirst.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="isaac-typescript-definitions" />
+export declare type PostCollectibleInitFirstCallbackType = (collectible: EntityPickup) => void;

package/dist/callbacks/subscriptions/postCollectibleInitFirst.lua

@@ -0,0 +1,24 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ArrayPush = ____lualib.__TS__ArrayPush
+local ____exports = {}
+local subscriptions = {}
+function ____exports.postCollectibleInitFirstHasSubscriptions(self)
+    return #subscriptions > 0
+end
+function ____exports.postCollectibleInitFirstRegister(self, callback, collectibleType)
+    __TS__ArrayPush(subscriptions, {callback, collectibleType})
+end
+function ____exports.postCollectibleInitFirstFire(self, collectible)
+    for ____, ____value in ipairs(subscriptions) do
+        local callback = ____value[1]
+        local collectibleType = ____value[2]
+        do
+            if collectibleType ~= nil and collectibleType ~= collectible.SubType then
+                goto __continue5
+            end
+            callback(nil, collectible)
+        end
+        ::__continue5::
+    end
+end
+return ____exports

package/dist/constants.lua

@@ -38,18 +38,18 @@ ____exports.CHARACTERS_WITH_NO_SOUL_HEARTS = __TS__New(Set, {
     PlayerType.PLAYER_KEEPER_B
 })
 ____exports.CHEST_PICKUP_VARIANTS = __TS__New(Set, {
-    PickupVariant.PICKUP_CHEST,
-    PickupVariant.PICKUP_BOMBCHEST,
-    PickupVariant.PICKUP_SPIKEDCHEST,
-    PickupVariant.PICKUP_ETERNALCHEST,
-    PickupVariant.PICKUP_MIMICCHEST,
-    PickupVariant.PICKUP_OLDCHEST,
-    PickupVariant.PICKUP_WOODENCHEST,
-    PickupVariant.PICKUP_MEGACHEST,
-    PickupVariant.PICKUP_HAUNTEDCHEST,
-    PickupVariant.PICKUP_LOCKEDCHEST,
-    PickupVariant.PICKUP_REDCHEST,
-    PickupVariant.PICKUP_MOMSCHEST
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    60,
+    360,
+    390
 })
 ____exports.COLORS = {
     Black = Color(1, 1, 1),

package/dist/enums/ModCallbacksCustom.d.ts

@@ -27,35 +27,36 @@ export declare enum ModCallbacksCustom {
     MC_POST_PROJECTILE_INIT_LATE = 18,
     MC_POST_NPC_INIT_LATE = 19,
     MC_POST_EFFECT_INIT_LATE = 20,
-    MC_POST_PICKUP_COLLECT = 21,
-    MC_PRE_ITEM_PICKUP = 22,
-    MC_POST_ITEM_PICKUP = 23,
-    MC_POST_PLAYER_CHANGE_TYPE = 24,
-    MC_POST_PLAYER_CHANGE_HEALTH = 25,
-    MC_POST_PLAYER_FATAL_DAMAGE = 26,
-    MC_PRE_BERSERK_DEATH = 27,
-    MC_PRE_CUSTOM_REVIVE = 28,
-    MC_POST_CUSTOM_REVIVE = 29,
-    MC_POST_FLIP = 30,
-    MC_POST_FIRST_FLIP = 31,
-    MC_POST_ESAU_JR = 32,
-    MC_POST_FIRST_ESAU_JR = 33,
-    MC_POST_TRANSFORMATION = 34,
-    MC_POST_PURCHASE = 35,
-    MC_POST_SACRIFICE = 36,
-    MC_POST_CURSED_TELEPORT = 37,
-    MC_POST_TRINKET_BREAK = 38,
-    MC_POST_SLOT_INIT = 39,
-    MC_POST_SLOT_UPDATE = 40,
-    MC_POST_SLOT_RENDER = 41,
-    MC_POST_SLOT_ANIMATION_CHANGED = 42,
-    MC_POST_SLOT_DESTROYED = 43,
-    MC_POST_GRID_ENTITY_INIT = 44,
-    MC_POST_GRID_ENTITY_UPDATE = 45,
-    MC_POST_GRID_ENTITY_REMOVE = 46,
-    MC_POST_GRID_ENTITY_STATE_CHANGE = 47,
-    MC_POST_GRID_ENTITY_BROKEN = 48,
-    MC_POST_GRID_ENTITY_COLLISION = 49,
-    MC_POST_BONE_SWING = 50,
-    MC_POST_CUSTOM_DOOR_ENTER = 51
+    MC_POST_COLLECTIBLE_INIT_FIRST = 21,
+    MC_POST_PICKUP_COLLECT = 22,
+    MC_PRE_ITEM_PICKUP = 23,
+    MC_POST_ITEM_PICKUP = 24,
+    MC_POST_PLAYER_CHANGE_TYPE = 25,
+    MC_POST_PLAYER_CHANGE_HEALTH = 26,
+    MC_POST_PLAYER_FATAL_DAMAGE = 27,
+    MC_PRE_BERSERK_DEATH = 28,
+    MC_PRE_CUSTOM_REVIVE = 29,
+    MC_POST_CUSTOM_REVIVE = 30,
+    MC_POST_FLIP = 31,
+    MC_POST_FIRST_FLIP = 32,
+    MC_POST_ESAU_JR = 33,
+    MC_POST_FIRST_ESAU_JR = 34,
+    MC_POST_TRANSFORMATION = 35,
+    MC_POST_PURCHASE = 36,
+    MC_POST_SACRIFICE = 37,
+    MC_POST_CURSED_TELEPORT = 38,
+    MC_POST_TRINKET_BREAK = 39,
+    MC_POST_SLOT_INIT = 40,
+    MC_POST_SLOT_UPDATE = 41,
+    MC_POST_SLOT_RENDER = 42,
+    MC_POST_SLOT_ANIMATION_CHANGED = 43,
+    MC_POST_SLOT_DESTROYED = 44,
+    MC_POST_GRID_ENTITY_INIT = 45,
+    MC_POST_GRID_ENTITY_UPDATE = 46,
+    MC_POST_GRID_ENTITY_REMOVE = 47,
+    MC_POST_GRID_ENTITY_STATE_CHANGE = 48,
+    MC_POST_GRID_ENTITY_BROKEN = 49,
+    MC_POST_GRID_ENTITY_COLLISION = 50,
+    MC_POST_BONE_SWING = 51,
+    MC_POST_CUSTOM_DOOR_ENTER = 52
 }

package/dist/enums/ModCallbacksCustom.lua

@@ -43,66 +43,68 @@ ____exports.ModCallbacksCustom.MC_POST_NPC_INIT_LATE = 19
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_NPC_INIT_LATE] = "MC_POST_NPC_INIT_LATE"
 ____exports.ModCallbacksCustom.MC_POST_EFFECT_INIT_LATE = 20
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_EFFECT_INIT_LATE] = "MC_POST_EFFECT_INIT_LATE"
-____exports.ModCallbacksCustom.MC_POST_PICKUP_COLLECT = 21
+____exports.ModCallbacksCustom.MC_POST_COLLECTIBLE_INIT_FIRST = 21
+____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_COLLECTIBLE_INIT_FIRST] = "MC_POST_COLLECTIBLE_INIT_FIRST"
+____exports.ModCallbacksCustom.MC_POST_PICKUP_COLLECT = 22
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_PICKUP_COLLECT] = "MC_POST_PICKUP_COLLECT"
-____exports.ModCallbacksCustom.MC_PRE_ITEM_PICKUP = 22
+____exports.ModCallbacksCustom.MC_PRE_ITEM_PICKUP = 23
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_PRE_ITEM_PICKUP] = "MC_PRE_ITEM_PICKUP"
-____exports.ModCallbacksCustom.MC_POST_ITEM_PICKUP = 23
+____exports.ModCallbacksCustom.MC_POST_ITEM_PICKUP = 24
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_ITEM_PICKUP] = "MC_POST_ITEM_PICKUP"
-____exports.ModCallbacksCustom.MC_POST_PLAYER_CHANGE_TYPE = 24
+____exports.ModCallbacksCustom.MC_POST_PLAYER_CHANGE_TYPE = 25
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_PLAYER_CHANGE_TYPE] = "MC_POST_PLAYER_CHANGE_TYPE"
-____exports.ModCallbacksCustom.MC_POST_PLAYER_CHANGE_HEALTH = 25
+____exports.ModCallbacksCustom.MC_POST_PLAYER_CHANGE_HEALTH = 26
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_PLAYER_CHANGE_HEALTH] = "MC_POST_PLAYER_CHANGE_HEALTH"
-____exports.ModCallbacksCustom.MC_POST_PLAYER_FATAL_DAMAGE = 26
+____exports.ModCallbacksCustom.MC_POST_PLAYER_FATAL_DAMAGE = 27
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_PLAYER_FATAL_DAMAGE] = "MC_POST_PLAYER_FATAL_DAMAGE"
-____exports.ModCallbacksCustom.MC_PRE_BERSERK_DEATH = 27
+____exports.ModCallbacksCustom.MC_PRE_BERSERK_DEATH = 28
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_PRE_BERSERK_DEATH] = "MC_PRE_BERSERK_DEATH"
-____exports.ModCallbacksCustom.MC_PRE_CUSTOM_REVIVE = 28
+____exports.ModCallbacksCustom.MC_PRE_CUSTOM_REVIVE = 29
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_PRE_CUSTOM_REVIVE] = "MC_PRE_CUSTOM_REVIVE"
-____exports.ModCallbacksCustom.MC_POST_CUSTOM_REVIVE = 29
+____exports.ModCallbacksCustom.MC_POST_CUSTOM_REVIVE = 30
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_CUSTOM_REVIVE] = "MC_POST_CUSTOM_REVIVE"
-____exports.ModCallbacksCustom.MC_POST_FLIP = 30
+____exports.ModCallbacksCustom.MC_POST_FLIP = 31
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_FLIP] = "MC_POST_FLIP"
-____exports.ModCallbacksCustom.MC_POST_FIRST_FLIP = 31
+____exports.ModCallbacksCustom.MC_POST_FIRST_FLIP = 32
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_FIRST_FLIP] = "MC_POST_FIRST_FLIP"
-____exports.ModCallbacksCustom.MC_POST_ESAU_JR = 32
+____exports.ModCallbacksCustom.MC_POST_ESAU_JR = 33
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_ESAU_JR] = "MC_POST_ESAU_JR"
-____exports.ModCallbacksCustom.MC_POST_FIRST_ESAU_JR = 33
+____exports.ModCallbacksCustom.MC_POST_FIRST_ESAU_JR = 34
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_FIRST_ESAU_JR] = "MC_POST_FIRST_ESAU_JR"
-____exports.ModCallbacksCustom.MC_POST_TRANSFORMATION = 34
+____exports.ModCallbacksCustom.MC_POST_TRANSFORMATION = 35
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_TRANSFORMATION] = "MC_POST_TRANSFORMATION"
-____exports.ModCallbacksCustom.MC_POST_PURCHASE = 35
+____exports.ModCallbacksCustom.MC_POST_PURCHASE = 36
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_PURCHASE] = "MC_POST_PURCHASE"
-____exports.ModCallbacksCustom.MC_POST_SACRIFICE = 36
+____exports.ModCallbacksCustom.MC_POST_SACRIFICE = 37
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SACRIFICE] = "MC_POST_SACRIFICE"
-____exports.ModCallbacksCustom.MC_POST_CURSED_TELEPORT = 37
+____exports.ModCallbacksCustom.MC_POST_CURSED_TELEPORT = 38
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_CURSED_TELEPORT] = "MC_POST_CURSED_TELEPORT"
-____exports.ModCallbacksCustom.MC_POST_TRINKET_BREAK = 38
+____exports.ModCallbacksCustom.MC_POST_TRINKET_BREAK = 39
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_TRINKET_BREAK] = "MC_POST_TRINKET_BREAK"
-____exports.ModCallbacksCustom.MC_POST_SLOT_INIT = 39
+____exports.ModCallbacksCustom.MC_POST_SLOT_INIT = 40
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_INIT] = "MC_POST_SLOT_INIT"
-____exports.ModCallbacksCustom.MC_POST_SLOT_UPDATE = 40
+____exports.ModCallbacksCustom.MC_POST_SLOT_UPDATE = 41
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_UPDATE] = "MC_POST_SLOT_UPDATE"
-____exports.ModCallbacksCustom.MC_POST_SLOT_RENDER = 41
+____exports.ModCallbacksCustom.MC_POST_SLOT_RENDER = 42
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_RENDER] = "MC_POST_SLOT_RENDER"
-____exports.ModCallbacksCustom.MC_POST_SLOT_ANIMATION_CHANGED = 42
+____exports.ModCallbacksCustom.MC_POST_SLOT_ANIMATION_CHANGED = 43
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_ANIMATION_CHANGED] = "MC_POST_SLOT_ANIMATION_CHANGED"
-____exports.ModCallbacksCustom.MC_POST_SLOT_DESTROYED = 43
+____exports.ModCallbacksCustom.MC_POST_SLOT_DESTROYED = 44
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_DESTROYED] = "MC_POST_SLOT_DESTROYED"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_INIT = 44
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_INIT = 45
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_INIT] = "MC_POST_GRID_ENTITY_INIT"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_UPDATE = 45
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_UPDATE = 46
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_UPDATE] = "MC_POST_GRID_ENTITY_UPDATE"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_REMOVE = 46
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_REMOVE = 47
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_REMOVE] = "MC_POST_GRID_ENTITY_REMOVE"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_STATE_CHANGE = 47
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_STATE_CHANGE = 48
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_STATE_CHANGE] = "MC_POST_GRID_ENTITY_STATE_CHANGE"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_BROKEN = 48
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_BROKEN = 49
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_BROKEN] = "MC_POST_GRID_ENTITY_BROKEN"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION = 49
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION = 50
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION] = "MC_POST_GRID_ENTITY_COLLISION"
-____exports.ModCallbacksCustom.MC_POST_BONE_SWING = 50
+____exports.ModCallbacksCustom.MC_POST_BONE_SWING = 51
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_BONE_SWING] = "MC_POST_BONE_SWING"
-____exports.ModCallbacksCustom.MC_POST_CUSTOM_DOOR_ENTER = 51
+____exports.ModCallbacksCustom.MC_POST_CUSTOM_DOOR_ENTER = 52
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_CUSTOM_DOOR_ENTER] = "MC_POST_CUSTOM_DOOR_ENTER"
 return ____exports

package/dist/features/deployJSONRoom.lua

@@ -237,7 +237,7 @@ function spawnNormalEntityForJSONRoom(self, entityType, variant, subType, x, y,
     local roomType = room:GetType()
     local position = gridToPos(nil, x, y)
     local entity
-    if entityType == EntityType.ENTITY_PICKUP and variant == PickupVariant.PICKUP_COLLECTIBLE then
+    if entityType == EntityType.ENTITY_PICKUP and variant == 100 then
         local options = roomType == RoomType.ROOM_ANGEL
         entity = spawnCollectible(
             nil,

package/dist/features/extraConsoleCommands/commands.lua

@@ -372,7 +372,7 @@ function ____exports.cards(self)
                     local position = gridToPos(nil, x, y)
                     Isaac.Spawn(
                         EntityType.ENTITY_PICKUP,
-                        PickupVariant.PICKUP_TAROTCARD,
+                        300,
                         cardType,
                         position,
                         Vector.Zero,
@@ -654,7 +654,7 @@ function ____exports.pills(self)
                     local position = gridToPos(nil, x, y)
                     Isaac.Spawn(
                         EntityType.ENTITY_PICKUP,
-                        PickupVariant.PICKUP_PILL,
+                        70,
                         subType,
                         position,
                         Vector.Zero,
@@ -877,7 +877,7 @@ function ____exports.spawnGoldenTrinket(self, params)
     local centerPos = room:GetCenterPos()
     Isaac.Spawn(
         EntityType.ENTITY_PICKUP,
-        PickupVariant.PICKUP_TRINKET,
+        350,
         goldenTrinketType,
         centerPos,
         Vector.Zero,

package/dist/features/getCollectibleItemPoolType.lua

@@ -23,11 +23,11 @@ local FEATURE_NAME = "get collectible item pool type"
 v = {run = {collectibleItemPoolTypeMap = __TS__New(Map)}}
 function ____exports.getCollectibleItemPoolTypeInit(self, mod)
     saveDataManager(nil, "getCollectibleItemPoolType", v)
-    mod:AddCallback(ModCallbacks.MC_POST_PICKUP_INIT, postPickupInitCollectible, PickupVariant.PICKUP_COLLECTIBLE)
+    mod:AddCallback(ModCallbacks.MC_POST_PICKUP_INIT, postPickupInitCollectible, 100)
 end
 function ____exports.getCollectibleItemPoolType(self, collectible)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
-    if collectible.Type ~= EntityType.ENTITY_PICKUP or collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
+    if collectible.Type ~= EntityType.ENTITY_PICKUP or collectible.Variant ~= 100 then
         local entityID = getEntityID(nil, collectible)
         error("The \"getCollectibleItemPoolType\" function was given a non-collectible: " .. entityID)
     end

package/dist/features/preventCollectibleRotate.lua

@@ -34,11 +34,11 @@ v = {room = {trackedCollectibles = __TS__New(Map)}}
 function ____exports.preventCollectibleRotateInit(self, mod)
     saveDataManager(nil, "preventCollectibleRotate", v)
     mod:AddCallback(ModCallbacks.MC_USE_CARD, useCardSoulOfIsaac, Card.CARD_SOUL_ISAAC)
-    mod:AddCallback(ModCallbacks.MC_POST_PICKUP_UPDATE, postPickupUpdateCollectible, PickupVariant.PICKUP_COLLECTIBLE)
+    mod:AddCallback(ModCallbacks.MC_POST_PICKUP_UPDATE, postPickupUpdateCollectible, 100)
 end
 function ____exports.preventCollectibleRotate(self, collectible, collectibleType)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
-    if collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
+    if collectible.Variant ~= 100 then
         error("You cannot prevent the rotation for pickups of variant: " .. tostring(collectible.Variant))
     end
     local index = getMapIndex(nil, collectible)

package/dist/functions/collectibles.d.ts

@@ -22,19 +22,25 @@ export declare function getCollectibleGfxFilename(collectibleType: CollectibleTy
 /**
  * Mods often have to track variables relating to a collectible. Finding an index for these kinds of
  * data structures is difficult, since collectibles are respawned every time a player re-enters a
- * room, so the `PtrHash` will change. Instead, we use a 3-tuple of the room list index, the grid
- * index of the collectible in the room, and the collectible's InitSeed.
+ * room, so the `PtrHash` will change. Instead, we use a 4-tuple of the room list index, the grid
+ * index of the collectible in the room, the collectible's SubType, and the collectible's InitSeed.
  *
- * When collectibles are rolled (e.g. with a D6), their InitSeed changes. If you want to track
- * collectibles independently of any rerolls, then use the `PtrHash` as an index instead. (The
- * `PtrHash` will not persist between rooms, however.)
+ * Collectibles that are shifted by Tainted Isaac's mechanic will have unique collectible indexes
+ * because the SubType is different. (The collectible entities share the same InitSeed.)
+ *
+ * Collectibles that are rolled (with e.g. a D6) will have unique collectible indexes because the
+ * SubType and InitSeed are different. If you want to track collectibles independently of any
+ * rerolls, then you can use the `PtrHash` as an index instead. (The `PtrHash` will not persist
+ * between rooms, however.)
  *
  * Note that:
  * - The grid index is a necessary part of the collectible index because Diplopia and Crooked Penny
- * can cause two or more collectibles with the same sub-type and InitSeed to exist in the same room.
+ * can cause two or more collectibles with the same SubType and InitSeed to exist in the same room.
  * - This index will fail in the case where the player uses Diplopia or a successful Crooked Penny
  * seven or more times in the same room, since that will cause two or more collectibles with the
- * same grid index and InitSeed to exist.
+ * same grid index, SubType, and InitSeed to exist.
+ * - The SubType is a necessary part of the collectible index because Tainted Isaac will
+ * continuously cause collectibles to morph into new sub-types with the same InitSeed.
  * - Using a collectible's position as part of the index is problematic, since players can push a
  * pedestal. (Even using the grid index does not solve this problem, since it is possible in certain
  * cases for collectibles to be spawned at a position that is not aligned with the grid, and the
@@ -43,11 +49,11 @@ export declare function getCollectibleGfxFilename(collectibleType: CollectibleTy
  * different InitSeeds, so this is not a problem for this indexing scheme.
  * - The indexing scheme used is different for collectibles that are inside of a Treasure Room, in
  * order to handle the case of the player seeing the same collectible again in a post-Ascent
- * Treasure Room. An 4-tuple of stage, stage type, grid index, and InitSeed is used in this case.
- * (Using the room list index or the room grid index is not suitable for this purpose, since both
- * of these values can change in the post-Ascent Treasure Room.) Even though there can be two
+ * Treasure Room. A 5-tuple of stage, stage type, grid index, SubType, and InitSeed is used in this
+ * case. (Using the room list index or the room grid index is not suitable for this purpose, since
+ * both of these values can change in the post-Ascent Treasure Room.) Even though there can be two
  * Treasure Rooms on an XL floor, both Treasure Rooms should not have collectibles with the same
- * InitSeed.
+ * grid index, Subtype, and InitSeed.
  */
 export declare function getCollectibleIndex(collectible: EntityPickup): CollectibleIndex;
 /**

package/dist/functions/collectibles.lua

@@ -23,7 +23,7 @@ local getRoomListIndex = ____roomData.getRoomListIndex
 local ____sprite = require("functions.sprite")
 local clearSprite = ____sprite.clearSprite
 function ____exports.setCollectibleSprite(self, collectible, pngPath)
-    if collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
+    if collectible.Variant ~= 100 then
         error("You cannot set a collectible sprite for pickups of variant: " .. tostring(collectible.Variant))
     end
     local sprite = collectible:GetSprite()
@@ -89,7 +89,7 @@ function ____exports.getCollectibleGfxFilename(self, collectibleType)
     return itemConfigItem.GfxFileName
 end
 function ____exports.getCollectibleIndex(self, collectible)
-    if collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
+    if collectible.Variant ~= 100 then
         error("You cannot get a collectible index for pickups of variant: " .. tostring(collectible.Variant))
     end
     local level = game:GetLevel()
@@ -100,9 +100,9 @@ function ____exports.getCollectibleIndex(self, collectible)
     local gridIndex = room:GetGridIndex(collectible.Position)
     local roomListIndex = getRoomListIndex(nil)
     if roomType == RoomType.ROOM_TREASURE then
-        return (((((tostring(stage) .. ",") .. tostring(stageType)) .. ",") .. tostring(gridIndex)) .. ",") .. tostring(collectible.InitSeed)
+        return (((((((tostring(stage) .. ",") .. tostring(stageType)) .. ",") .. tostring(gridIndex)) .. ",") .. tostring(collectible.SubType)) .. ",") .. tostring(collectible.InitSeed)
     end
-    return (((tostring(roomListIndex) .. ",") .. tostring(gridIndex)) .. ",") .. tostring(collectible.InitSeed)
+    return (((((tostring(roomListIndex) .. ",") .. tostring(gridIndex)) .. ",") .. tostring(collectible.SubType)) .. ",") .. tostring(collectible.InitSeed)
 end
 function ____exports.getCollectibleInitCharge(self, collectibleType)
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
@@ -137,7 +137,7 @@ function ____exports.getCollectibleName(self, collectibleType)
     return DEFAULT_COLLECTIBLE_NAME
 end
 function ____exports.getCollectiblePedestalType(self, collectible)
-    if collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
+    if collectible.Variant ~= 100 then
         error("You cannot get the pedestal type for pickups of variant: " .. tostring(collectible.Variant))
     end
     local sprite = collectible:GetSprite()
@@ -154,7 +154,7 @@ function ____exports.getCollectibles(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
     end
-    return getPickups(nil, PickupVariant.PICKUP_COLLECTIBLE, matchingSubType)
+    return getPickups(nil, 100, matchingSubType)
 end
 function ____exports.getMaxCollectibleType(self)
     return itemConfig:GetCollectibles().Size - 1
@@ -164,7 +164,7 @@ function ____exports.isActiveCollectible(self, collectibleType)
     return itemType == ItemType.ITEM_ACTIVE
 end
 function ____exports.isGlitchedCollectible(self, pickup)
-    return pickup.Variant == PickupVariant.PICKUP_COLLECTIBLE and pickup.SubType > GLITCHED_ITEM_THRESHOLD
+    return pickup.Variant == 100 and pickup.SubType > GLITCHED_ITEM_THRESHOLD
 end
 function ____exports.isPassiveCollectible(self, collectibleType)
     local itemType = ____exports.getCollectibleItemType(nil, collectibleType)
@@ -177,33 +177,33 @@ function ____exports.isSingleUseCollectible(self, collectibleType)
     return SINGLE_USE_ACTIVE_COLLECTIBLE_TYPES:has(collectibleType)
 end
 function ____exports.removeAllCollectibles(self, collectibleType, cap)
-    return removeAllPickups(nil, PickupVariant.PICKUP_COLLECTIBLE, collectibleType, cap)
+    return removeAllPickups(nil, 100, collectibleType, cap)
 end
 function ____exports.removeCollectibleFromItemTracker(self, collectibleType)
     local collectibleName = ____exports.getCollectibleName(nil, collectibleType)
     Isaac.DebugString(((("Removing collectible " .. tostring(collectibleType)) .. " (") .. collectibleName) .. ") on player 0 (Player)")
 end
 function ____exports.removeCollectiblePickupDelay(self, collectible)
-    if collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
+    if collectible.Variant ~= 100 then
         error("You cannot remove pickup delay for pickups of variant: " .. tostring(collectible.Variant))
     end
     collectible.Wait = 0
 end
 function ____exports.setCollectibleBlind(self, collectible)
-    if collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
+    if collectible.Variant ~= 100 then
         error("You cannot set a collectible to be blind for pickups of variant: " .. tostring(collectible.Variant))
     end
     ____exports.setCollectibleSprite(nil, collectible, BLIND_ITEM_PNG_PATH)
 end
 function ____exports.setCollectibleEmpty(self, collectible)
-    if collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
+    if collectible.Variant ~= 100 then
         error("You cannot set a collectible to be empty for pickups of variant: " .. tostring(collectible.Variant))
     end
     collectible.SubType = CollectibleType.COLLECTIBLE_NULL
     ____exports.clearCollectibleSprite(nil, collectible)
 end
 function ____exports.setCollectibleSubType(self, collectible, newCollectibleType)
-    if collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
+    if collectible.Variant ~= 100 then
         error("You cannot set a collectible sub-type for pickups of variant: " .. tostring(collectible.Variant))
     end
     if newCollectibleType == CollectibleType.COLLECTIBLE_NULL then
@@ -212,7 +212,7 @@ function ____exports.setCollectibleSubType(self, collectible, newCollectibleType
     end
     collectible:Morph(
         EntityType.ENTITY_PICKUP,
-        PickupVariant.PICKUP_COLLECTIBLE,
+        100,
         newCollectibleType,
         true,
         true,

package/dist/functions/spawnCollectible.lua

@@ -26,7 +26,7 @@ function ____exports.spawnCollectible(self, collectibleType, position, seed, opt
     end
     local collectible = game:Spawn(
         EntityType.ENTITY_PICKUP,
-        PickupVariant.PICKUP_COLLECTIBLE,
+        100,
         position,
         Vector.Zero,
         nil,

package/dist/functions/trinkets.lua

@@ -68,7 +68,7 @@ function ____exports.getTrinkets(self, matchingSubType)
     if matchingSubType == nil then
         matchingSubType = -1
     end
-    return getPickups(nil, PickupVariant.PICKUP_TRINKET, matchingSubType)
+    return getPickups(nil, 350, matchingSubType)
 end
 function ____exports.hasOpenTrinketSlot(self, player)
     local character = player:GetPlayerType()
@@ -82,7 +82,7 @@ function ____exports.isGoldenTrinket(self, trinketType)
     return trinketType > TRINKET_GOLDEN_FLAG
 end
 function ____exports.setTrinketSprite(self, trinket, pngPath)
-    if trinket.Variant ~= PickupVariant.PICKUP_TRINKET then
+    if trinket.Variant ~= 350 then
         error("You cannot set a trinket sprite for pickups of variant: " .. tostring(trinket.Variant))
     end
     local sprite = trinket:GetSprite()

package/dist/index.d.ts

@@ -3,7 +3,6 @@ export { initCustomDoor, spawnCustomDoor, } from "./callbacks/postCustomDoorEnte
 export { forceNewLevelCallback, forceNewRoomCallback, } from "./callbacks/reorderedCallbacks";
 export * from "./classes/DefaultMap";
 export * from "./classes/ModUpgraded";
-export * from "./classes/Null";
 export * from "./constants";
 export * from "./enums/CardType";
 export * from "./enums/CollectiblePedestalType";
@@ -13,7 +12,6 @@ export * from "./enums/PillEffectClass";
 export * from "./enums/PillEffectType";
 export * from "./enums/PocketItemType";
 export * from "./enums/SerializationType";
-export { isCollectiblePreviouslySeen } from "./features/collectiblesSeen";
 export { deployJSONRoom, deployRandomJSONRoom, emptyRoom, } from "./features/deployJSONRoom";
 export { disableAllInputs, disableAllInputsExceptFor, disableMovementInputs, disableShootingInputs, enableAllInputs, enableAllInputsExceptFor, } from "./features/disableInputs";
 export { disableAllSound, enableAllSound } from "./features/disableSound";

package/dist/index.lua

@@ -38,14 +38,6 @@ do
         end
     end
 end
-do
-    local ____export = require("classes.Null")
-    for ____exportKey, ____exportValue in pairs(____export) do
-        if ____exportKey ~= "default" then
-            ____exports[____exportKey] = ____exportValue
-        end
-    end
-end
 do
     local ____export = require("constants")
     for ____exportKey, ____exportValue in pairs(____export) do
@@ -118,11 +110,6 @@ do
         end
     end
 end
-do
-    local ____collectiblesSeen = require("features.collectiblesSeen")
-    local isCollectiblePreviouslySeen = ____collectiblesSeen.isCollectiblePreviouslySeen
-    ____exports.isCollectiblePreviouslySeen = isCollectiblePreviouslySeen
-end
 do
     local ____deployJSONRoom = require("features.deployJSONRoom")
     local deployJSONRoom = ____deployJSONRoom.deployJSONRoom

package/dist/objects/callbackRegisterFunctions.lua

@@ -4,6 +4,8 @@ local ____postBombInitLate = require("callbacks.subscriptions.postBombInitLate")
 local postBombInitLateRegister = ____postBombInitLate.postBombInitLateRegister
 local ____postBoneSwing = require("callbacks.subscriptions.postBoneSwing")
 local postBoneSwingRegister = ____postBoneSwing.postBoneSwingRegister
+local ____postCollectibleInitFirst = require("callbacks.subscriptions.postCollectibleInitFirst")
+local postCollectibleInitFirstRegister = ____postCollectibleInitFirst.postCollectibleInitFirstRegister
 local ____postCursedTeleport = require("callbacks.subscriptions.postCursedTeleport")
 local postCursedTeleportRegister = ____postCursedTeleport.postCursedTeleportRegister
 local ____postCustomDoorEnter = require("callbacks.subscriptions.postCustomDoorEnter")
@@ -128,6 +130,7 @@ ____exports.CALLBACK_REGISTER_FUNCTIONS = {
     [ModCallbacksCustom.MC_POST_PROJECTILE_INIT_LATE] = postProjectileInitLateRegister,
     [ModCallbacksCustom.MC_POST_NPC_INIT_LATE] = postNPCInitLateRegister,
     [ModCallbacksCustom.MC_POST_EFFECT_INIT_LATE] = postEffectInitLateRegister,
+    [ModCallbacksCustom.MC_POST_COLLECTIBLE_INIT_FIRST] = postCollectibleInitFirstRegister,
     [ModCallbacksCustom.MC_POST_PICKUP_COLLECT] = postPickupCollectRegister,
     [ModCallbacksCustom.MC_PRE_ITEM_PICKUP] = preItemPickupRegister,
     [ModCallbacksCustom.MC_POST_ITEM_PICKUP] = postItemPickupRegister,

package/dist/types/AddCallbackParametersCustom.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="isaac-typescript-definitions" />
 import { PostBombInitLateCallbackType } from "../callbacks/subscriptions/postBombInitLate";
 import { PostBoneSwingCallbackType } from "../callbacks/subscriptions/postBoneSwing";
+import { PostCollectibleInitFirstCallbackType } from "../callbacks/subscriptions/postCollectibleInitFirst";
 import { PostCursedTeleportCallbackType } from "../callbacks/subscriptions/postCursedTeleport";
 import { PostCustomDoorEnterCallbackType } from "../callbacks/subscriptions/postCustomDoorEnter";
 import { PostCustomReviveCallbackType } from "../callbacks/subscriptions/postCustomRevive";
@@ -127,7 +128,11 @@ export interface AddCallbackParametersCustom {
     ];
     [ModCallbacksCustom.MC_POST_EFFECT_INIT_LATE]: [
         callback: PostEffectInitLateCallbackType,
-        effectVariant?: EffectVariant
+        effectVariant?: EffectVariant | int
+    ];
+    [ModCallbacksCustom.MC_POST_COLLECTIBLE_INIT_FIRST]: [
+        callback: PostCollectibleInitFirstCallbackType,
+        collectibleType?: CollectibleType | int
     ];
     [ModCallbacksCustom.MC_POST_PICKUP_COLLECT]: [
         callback: PostPickupCollectCallbackType,

package/dist/upgradeMod.lua

@@ -10,6 +10,8 @@ local ____postBombInitLate = require("callbacks.postBombInitLate")
 local postBombInitLateCallbackInit = ____postBombInitLate.postBombInitLateCallbackInit
 local ____postBoneSwing = require("callbacks.postBoneSwing")
 local postBoneSwingCallbackInit = ____postBoneSwing.postBoneSwingCallbackInit
+local ____postCollectibleInitFirst = require("callbacks.postCollectibleInitFirst")
+local postCollectibleInitFirstCallbackInit = ____postCollectibleInitFirst.postCollectibleInitFirstCallbackInit
 local ____postCursedTeleport = require("callbacks.postCursedTeleport")
 local postCursedTeleportCallbackInit = ____postCursedTeleport.postCursedTeleportCallbackInit
 local ____postCustomDoorEnter = require("callbacks.postCustomDoorEnter")
@@ -76,8 +78,6 @@ local ____roomClearChange = require("callbacks.roomClearChange")
 local roomClearChangeCallbackInit = ____roomClearChange.roomClearChangeCallbackInit
 local ____ModUpgraded = require("classes.ModUpgraded")
 local ModUpgraded = ____ModUpgraded.ModUpgraded
-local ____collectiblesSeen = require("features.collectiblesSeen")
-local collectiblesSeenInit = ____collectiblesSeen.collectiblesSeenInit
 local ____deployJSONRoom = require("features.deployJSONRoom")
 local deployJSONRoomInit = ____deployJSONRoom.deployJSONRoomInit
 local ____disableInputs = require("features.disableInputs")
@@ -123,6 +123,7 @@ function initCustomCallbacks(self, mod)
     postProjectileInitLateCallbackInit(nil, mod)
     postNPCInitLateCallbackInit(nil, mod)
     postEffectInitLateCallbackInit(nil, mod)
+    postCollectibleInitFirstCallbackInit(nil, mod)
     postPickupCollectCallbackInit(nil, mod)
     itemPickupCallbacksInit(nil, mod)
     postPlayerChangeTypeCallbackInit(nil, mod)
@@ -156,7 +157,6 @@ function initFeatures(self, mod)
     isPonyActiveInit(nil, mod)
     playerInventoryInit(nil, mod)
     taintedLazarusPlayersInit(nil, mod)
-    collectiblesSeenInit(nil, mod)
 end
 function ____exports.upgradeMod(self, modVanilla, verbose)
     if verbose == nil then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.177",
+  "version": "1.2.180",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -25,7 +25,7 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "isaac-typescript-definitions": "^1.0.371",
+    "isaac-typescript-definitions": "^1.0.372",
     "isaacscript-lint": "^1.0.93",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.13",