isaacscript-common 1.2.178 → 1.2.179

package/dist/callbacks/postCollectibleInitFirst.lua

@@ -24,6 +24,6 @@ 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, PickupVariant.PICKUP_COLLECTIBLE)
+    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/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/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,8 +22,8 @@ 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
@@ -35,6 +35,9 @@ export declare function getCollectibleGfxFilename(collectibleType: CollectibleTy
  * - 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.
+ * - The sub-type 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. (For the
+ * purposes of this index, the "shifted" items are considered to be separate collectibles.)
  * - 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,9 +46,9 @@ 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.
  */

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.178",
+  "version": "1.2.179",
   "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",