isaacscript-common 6.16.1 → 6.17.1

package/dist/functions/rockAlt.lua

@@ -47,11 +47,11 @@ local getRandomVector = ____vector.getRandomVector
 function spawnRockAltRewardUrn(self, position, rng)
     local chance = getRandom(nil, rng)
     local totalChance = 0
-    totalChance = totalChance + ROCK_ALT_CHANCES.Nothing
+    totalChance = totalChance + ROCK_ALT_CHANCES.NOTHING
     if chance < totalChance then
         return false
     end
-    totalChance = totalChance + ROCK_ALT_CHANCES.BasicDrop
+    totalChance = totalChance + ROCK_ALT_CHANCES.BASIC_DROP
     if chance < totalChance then
         local numCoinsChance = getRandom(nil, rng)
         local numCoins = numCoinsChance < 0.5 and 1 or 2
@@ -73,12 +73,12 @@ function spawnRockAltRewardUrn(self, position, rng)
         )
         return true
     end
-    totalChance = totalChance + ROCK_ALT_CHANCES.Trinket
+    totalChance = totalChance + ROCK_ALT_CHANCES.TRINKET
     if chance < totalChance then
         spawnTrinketWithSeed(nil, TrinketType.SWALLOWED_PENNY, position, rng)
         return true
     end
-    totalChance = totalChance + ROCK_ALT_CHANCES.Collectible
+    totalChance = totalChance + ROCK_ALT_CHANCES.COLLECTIBLE
     if chance < totalChance then
         local stillInPools = isCollectibleInItemPool(nil, CollectibleType.QUARTER, ItemPoolType.DEVIL)
         if stillInPools then
@@ -113,21 +113,21 @@ function spawnRockAltRewardMushroom(self, position, rng)
     local roomType = room:GetType()
     local chance = getRandom(nil, rng)
     local totalChance = 0
-    totalChance = totalChance + ROCK_ALT_CHANCES.Nothing
+    totalChance = totalChance + ROCK_ALT_CHANCES.NOTHING
     if chance < totalChance then
         return false
     end
-    totalChance = totalChance + ROCK_ALT_CHANCES.BasicDrop
+    totalChance = totalChance + ROCK_ALT_CHANCES.BASIC_DROP
     if chance < totalChance then
         spawnPillWithSeed(nil, PillColor.NULL, position, rng)
         return true
     end
-    totalChance = totalChance + ROCK_ALT_CHANCES.Trinket
+    totalChance = totalChance + ROCK_ALT_CHANCES.TRINKET
     if chance < totalChance then
         spawnTrinketWithSeed(nil, TrinketType.LIBERTY_CAP, position, rng)
         return true
     end
-    totalChance = totalChance + ROCK_ALT_CHANCES.Collectible
+    totalChance = totalChance + ROCK_ALT_CHANCES.COLLECTIBLE
     if chance < totalChance then
         if roomType == RoomType.SECRET then
             local wavyCapChance = getRandom(nil, rng)
@@ -169,21 +169,21 @@ end
 function spawnRockAltRewardSkull(self, position, rng)
     local chance = getRandom(nil, rng)
     local totalChance = 0
-    totalChance = totalChance + ROCK_ALT_CHANCES.Nothing
+    totalChance = totalChance + ROCK_ALT_CHANCES.NOTHING
     if chance < totalChance then
         return false
     end
-    totalChance = totalChance + ROCK_ALT_CHANCES.BasicDrop
+    totalChance = totalChance + ROCK_ALT_CHANCES.BASIC_DROP
     if chance < totalChance then
         spawnCardWithSeed(nil, Card.NULL, position, rng)
         return true
     end
-    totalChance = totalChance + ROCK_ALT_CHANCES.Trinket
+    totalChance = totalChance + ROCK_ALT_CHANCES.TRINKET
     if chance < totalChance then
         spawnHeartWithSeed(nil, HeartSubType.BLACK, position, rng)
         return true
     end
-    totalChance = totalChance + ROCK_ALT_CHANCES.Collectible
+    totalChance = totalChance + ROCK_ALT_CHANCES.COLLECTIBLE
     if chance < totalChance then
         local ghostBabyStillInPools = isCollectibleInItemPool(nil, CollectibleType.GHOST_BABY, ItemPoolType.TREASURE)
         local dryBabyStillInPools = isCollectibleInItemPool(nil, CollectibleType.DRY_BABY, ItemPoolType.TREASURE)
@@ -216,21 +216,21 @@ end
 function spawnRockAltRewardPolyp(self, position, rng)
     local chance = getRandom(nil, rng)
     local totalChance = 0
-    totalChance = totalChance + ROCK_ALT_CHANCES.Nothing
+    totalChance = totalChance + ROCK_ALT_CHANCES.NOTHING
     if chance < totalChance then
         return false
     end
-    totalChance = totalChance + ROCK_ALT_CHANCES.BasicDrop
+    totalChance = totalChance + ROCK_ALT_CHANCES.BASIC_DROP
     if chance < totalChance then
         spawnHeartWithSeed(nil, HeartSubType.NULL, position, rng)
         return true
     end
-    totalChance = totalChance + ROCK_ALT_CHANCES.Trinket
+    totalChance = totalChance + ROCK_ALT_CHANCES.TRINKET
     if chance < totalChance then
         spawnTrinketWithSeed(nil, TrinketType.UMBILICAL_CORD, position, rng)
         return true
     end
-    totalChance = totalChance + ROCK_ALT_CHANCES.Collectible
+    totalChance = totalChance + ROCK_ALT_CHANCES.COLLECTIBLE
     if chance < totalChance then
         local placentaStillInPools = isCollectibleInItemPool(nil, CollectibleType.PLACENTA, ItemPoolType.BOSS)
         local bloodClotStillInPools = isCollectibleInItemPool(nil, CollectibleType.BLOOD_CLOT, ItemPoolType.BOSS)
@@ -269,13 +269,13 @@ end
 function spawnRockAltRewardBucket(self, _position, rng, _variant)
     local chance = getRandom(nil, rng)
     local totalChance = 0
-    totalChance = totalChance + ROCK_ALT_CHANCES.Nothing
+    totalChance = totalChance + ROCK_ALT_CHANCES.NOTHING
     if chance < totalChance then
         return false
     end
     return false
 end
-ROCK_ALT_CHANCES = {Nothing = 0.68, BasicDrop = 0.0967, Trinket = 0.025, Collectible = 0.005}
+ROCK_ALT_CHANCES = {NOTHING = 0.68, BASIC_DROP = 0.0967, TRINKET = 0.025, COLLECTIBLE = 0.005}
 POLYP_PROJECTILE_SPEED = 10
 POLYP_NUM_PROJECTILES = 6
 --- Helper function to get the alternate rock type (i.e. urn, mushroom, etc.) that the current room

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

@@ -1 +1 @@
-{"version":3,"file":"saveFile.d.ts","sourceRoot":"","sources":["../../src/functions/saveFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG7E;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CACnC,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,GACzB,OAAO,CAMT"}
+{"version":3,"file":"saveFile.d.ts","sourceRoot":"","sources":["../../src/functions/saveFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAI7E;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CACnC,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,GACzB,OAAO,CAMT"}

package/dist/functions/saveFile.lua

@@ -1,4 +1,6 @@
 local ____exports = {}
+local ____itemPool = require("functions.itemPool")
+local isCollectibleInItemPool = ____itemPool.isCollectibleInItemPool
 local ____players = require("functions.players")
 local anyPlayerHasCollectible = ____players.anyPlayerHasCollectible
 --- Helper function to see if the given collectible is unlocked on the current save file. This
@@ -17,6 +19,6 @@ function ____exports.isCollectibleUnlocked(self, collectibleType, itemPoolType)
     if anyPlayerHasCollectible(nil, collectibleType) then
         return true
     end
-    return ____exports.isCollectibleUnlocked(nil, collectibleType, itemPoolType)
+    return isCollectibleInItemPool(nil, collectibleType, itemPoolType)
 end
 return ____exports

package/dist/index.d.ts

@@ -12,7 +12,7 @@ export * from "./enums/SerializationType";
 export { ConversionHeartSubType, registerCharacterHealthConversion, } from "./features/characterHealthConversion";
 export { registerCharacterStats } from "./features/characterStats";
 export { getCollectibleItemPoolType } from "./features/collectibleItemPoolType";
-export { removeCustomGrid, spawnCustomGridEntity as spawnCustomGrid, } from "./features/customGridEntity";
+export { removeCustomGridEntity as removeCustomGrid, spawnCustomGridEntity as spawnCustomGrid, } from "./features/customGridEntity";
 export * from "./features/customStage/exports";
 export * from "./features/customTrapdoor/exports";
 export * from "./features/debugDisplay/exports";

package/dist/index.d.ts.map

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

package/dist/index.lua

@@ -104,7 +104,7 @@ do
 end
 do
     local ____customGridEntity = require("features.customGridEntity")
-    local removeCustomGrid = ____customGridEntity.removeCustomGrid
+    local removeCustomGrid = ____customGridEntity.removeCustomGridEntity
     local spawnCustomGrid = ____customGridEntity.spawnCustomGridEntity
     ____exports.removeCustomGrid = removeCustomGrid
     ____exports.spawnCustomGrid = spawnCustomGrid

package/dist/interfaces/{CustomGridEntityData.d.ts → GridEntityCustomData.d.ts}

@@ -1,5 +1,5 @@
 import { GridCollisionClass, GridEntityType } from "isaac-typescript-definitions";
-export interface CustomGridEntityData {
+export interface GridEntityCustomData {
     /**
      * This is not a real `GridEntityType`; rather it is an arbitrary integer selected by end-user
      * mods.
@@ -11,4 +11,4 @@ export interface CustomGridEntityData {
     defaultAnimation?: string;
     gridCollisionClass: GridCollisionClass;
 }
-//# sourceMappingURL=CustomGridEntityData.d.ts.map
+//# sourceMappingURL=GridEntityCustomData.d.ts.map

package/dist/interfaces/{CustomGridEntityData.d.ts.map → GridEntityCustomData.d.ts.map}

@@ -1 +1 @@
-{"version":3,"file":"CustomGridEntityData.d.ts","sourceRoot":"","sources":["../../src/interfaces/CustomGridEntityData.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACf,MAAM,8BAA8B,CAAC;AAEtC,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,oBAAoB,EAAE,cAAc,CAAC;IAErC,aAAa,EAAE,GAAG,CAAC;IACnB,SAAS,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,kBAAkB,CAAC;CACxC"}
+{"version":3,"file":"GridEntityCustomData.d.ts","sourceRoot":"","sources":["../../src/interfaces/GridEntityCustomData.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,cAAc,EACf,MAAM,8BAA8B,CAAC;AAEtC,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,oBAAoB,EAAE,cAAc,CAAC;IAErC,aAAa,EAAE,GAAG,CAAC;IACnB,SAAS,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,kBAAkB,CAAC;CACxC"}

package/dist/interfaces/PlayerHealth.d.ts

@@ -4,13 +4,16 @@ export interface PlayerHealth {
     maxHearts: int;
     hearts: int;
     eternalHearts: int;
+    /** For soul hearts to apply, they also have to be specified in the `soulHeartTypes` array. */
     soulHearts: int;
+    /** For bone hearts to apply, they also have to be specified in the `soulHeartTypes` array. */
     boneHearts: int;
     goldenHearts: int;
     rottenHearts: int;
     brokenHearts: int;
     soulCharges: int;
     bloodCharges: int;
-    soulHeartTypes: HeartSubType[];
+    soulHeartTypes: SoulHeartType[];
 }
+export declare type SoulHeartType = HeartSubType.SOUL | HeartSubType.BLACK | HeartSubType.BONE;
 //# sourceMappingURL=PlayerHealth.d.ts.map

package/dist/interfaces/PlayerHealth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PlayerHealth.d.ts","sourceRoot":"","sources":["../../src/interfaces/PlayerHealth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,4EAA4E;AAC5E,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,EAAE,GAAG,CAAC;IACZ,aAAa,EAAE,GAAG,CAAC;IACnB,UAAU,EAAE,GAAG,CAAC;IAChB,UAAU,EAAE,GAAG,CAAC;IAChB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;IACjB,YAAY,EAAE,GAAG,CAAC;IAClB,cAAc,EAAE,YAAY,EAAE,CAAC;CAChC"}
+{"version":3,"file":"PlayerHealth.d.ts","sourceRoot":"","sources":["../../src/interfaces/PlayerHealth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,4EAA4E;AAC5E,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,EAAE,GAAG,CAAC;IACZ,aAAa,EAAE,GAAG,CAAC;IAEnB,8FAA8F;IAC9F,UAAU,EAAE,GAAG,CAAC;IAEhB,8FAA8F;IAC9F,UAAU,EAAE,GAAG,CAAC;IAEhB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;IACjB,YAAY,EAAE,GAAG,CAAC;IAElB,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC;AAED,oBAAY,aAAa,GACrB,YAAY,CAAC,IAAI,GACjB,YAAY,CAAC,KAAK,GAClB,YAAY,CAAC,IAAI,CAAC"}

package/dist/interfaces/RoomDescription.d.ts

@@ -10,5 +10,6 @@ export interface RoomDescription {
     roomName: string;
     roomGridIndex: int;
     roomListIndex: int;
+    roomVisitedCount: int;
 }
 //# sourceMappingURL=RoomDescription.d.ts.map

package/dist/interfaces/RoomDescription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomDescription.d.ts","sourceRoot":"","sources":["../../src/interfaces/RoomDescription.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,QAAQ,EACR,OAAO,EACP,SAAS,EACV,MAAM,8BAA8B,CAAC;AAEtC,wCAAwC;AACxC,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,GAAG,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IACnB,aAAa,EAAE,GAAG,CAAC;CACpB"}
+{"version":3,"file":"RoomDescription.d.ts","sourceRoot":"","sources":["../../src/interfaces/RoomDescription.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,QAAQ,EACR,OAAO,EACP,SAAS,EACV,MAAM,8BAA8B,CAAC;AAEtC,wCAAwC;AACxC,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,GAAG,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IACnB,aAAa,EAAE,GAAG,CAAC;IACnB,gBAAgB,EAAE,GAAG,CAAC;CACvB"}

package/package.json

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

package/src/enums/ModCallbackCustom.ts

@@ -564,7 +564,7 @@ export enum ModCallbackCustom {
    * - When registering the callback, takes an optional second argument that will make the callback
    *   only fire if it matches the `ItemType` provided.
    * - When registering the callback, takes an optional third argument that will make the callback
-   *   only fire if the `CollectibleType` or the `TrinketType` matches the ID provided.
+   *   only fire if the `CollectibleType` or the `TrinketType` matches the sub-type provided.
    *
    * ```ts
    * function postItemPickup(

package/src/features/customGridEntity.ts

@@ -2,6 +2,7 @@ import {
   ActiveSlot,
   CollectibleType,
   DamageFlag,
+  EntityFlag,
   EntityType,
   GridCollisionClass,
   GridEntityType,
@@ -15,7 +16,7 @@ import { ModUpgraded } from "../classes/ModUpgraded";
 import { DecorationVariant } from "../enums/DecorationVariant";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
-import { spawnNPC } from "../functions/entitiesSpecific";
+import { spawn } from "../functions/entities";
 import { hasFlag } from "../functions/flag";
 import {
   removeGridEntity,
@@ -23,22 +24,23 @@ import {
 } from "../functions/gridEntities";
 import { getRoomListIndex } from "../functions/roomData";
 import { isVector } from "../functions/vector";
-import { CustomGridEntityData } from "../interfaces/CustomGridEntityData";
+import { GridEntityCustomData } from "../interfaces/GridEntityCustomData";
 import { runNextGameFrame } from "./runInNFrames";
 import { saveDataManager } from "./saveDataManager/exports";
 
 const FEATURE_NAME = "customGridEntity";
+const GENERIC_PROP_SIZE_MULTIPLIER = 0.66;
 
 const v = {
   level: {
     /** Indexed by room list index and grid index. */
-    customGridEntities: new DefaultMap<int, Map<int, CustomGridEntityData>>(
+    customGridEntities: new DefaultMap<int, Map<int, GridEntityCustomData>>(
       () => new Map(),
     ),
   },
 
   room: {
-    dummyPtrHashes: new Set<PtrHash>(),
+    genericPropPtrHashes: new Set<PtrHash>(),
     manuallyUsingShovel: false,
   },
 };
@@ -49,8 +51,8 @@ export function customGridEntityInit(mod: ModUpgraded): void {
 
   mod.AddCallback(
     ModCallback.ENTITY_TAKE_DMG,
-    entityTakeDmgDummy,
-    EntityType.DUMMY,
+    entityTakeDmgGenericProp,
+    EntityType.GENERIC_PROP,
   ); // 11
 
   mod.AddCallback(
@@ -66,8 +68,8 @@ export function customGridEntityInit(mod: ModUpgraded): void {
 }
 
 // ModCallback.ENTITY_TAKE_DMG (11)
-// EntityType.DUMMY (964)
-function entityTakeDmgDummy(
+// EntityType.GENERIC_PROP (960)
+function entityTakeDmgGenericProp(
   tookDamage: Entity,
   _damageAmount: float,
   damageFlags: BitFlags<DamageFlag>,
@@ -75,7 +77,7 @@ function entityTakeDmgDummy(
   _damageCountdownFrames: int,
 ): boolean | undefined {
   const ptrHash = GetPtrHash(tookDamage);
-  if (!v.room.dummyPtrHashes.has(ptrHash)) {
+  if (!v.room.genericPropPtrHashes.has(ptrHash)) {
     return undefined;
   }
 
@@ -105,8 +107,8 @@ function entityTakeDmgDummy(
 
   postGridEntityCustomBrokenFire(gridEntity, data.gridEntityTypeCustom);
 
-  // Even though the custom grid entity is now broke, we do not want to remove it, as the end-user
-  // could intend for it to persist with different graphics.
+  // Even though the custom grid entity is now broken, we do not want to remove it, as the end-user
+  // could intend for it to persist with different graphics (or take multiple hits to be destroyed).
   return false;
 }
 
@@ -261,6 +263,7 @@ export function spawnCustomGridEntity(
   if (decoration === undefined) {
     error("Failed to spawn a decoration for a custom grid entity.");
   }
+  decoration.CollisionClass = gridCollisionClass;
 
   const sprite = decoration.GetSprite();
   sprite.Load(anm2Path, true);
@@ -270,7 +273,7 @@ export function spawnCustomGridEntity(
       : defaultAnimation;
   sprite.Play(animationToPlay, true);
 
-  const customGridEntityData: CustomGridEntityData = {
+  const customGridEntityData: GridEntityCustomData = {
     gridEntityTypeCustom,
     roomListIndex,
     gridIndex,
@@ -287,8 +290,18 @@ export function spawnCustomGridEntity(
   // the monitoring for explosions in the `ENTITY_TAKE_DMG` callback.
   if (breakable) {
     const position = room.GetGridPosition(gridIndex);
-    const dummy = spawnNPC(EntityType.DUMMY, 0, 0, position);
-    dummy.Visible = false;
+    const entity = spawn(EntityType.GENERIC_PROP, 0, 0, position);
+    entity.ClearEntityFlags(EntityFlag.APPEAR);
+    entity.Visible = false;
+
+    // By default, it is larger than a grid tile, so make it a bit smaller.
+    entity.SizeMulti = Vector(
+      GENERIC_PROP_SIZE_MULTIPLIER,
+      GENERIC_PROP_SIZE_MULTIPLIER,
+    );
+
+    const ptrHash = GetPtrHash(entity);
+    v.room.genericPropPtrHashes.add(ptrHash);
   }
 
   return decoration;
@@ -309,7 +322,7 @@ export function spawnCustomGridEntity(
  * @returns The grid entity that was removed. Returns undefined if no grid entity was found at the
  *          given location or if the given grid entity was not a custom grid entity.
  */
-export function removeCustomGrid(
+export function removeCustomGridEntity(
   gridIndexOrPositionOrGridEntity: int | Vector | GridEntity,
   updateRoom = true,
 ): GridEntity | undefined {
@@ -356,7 +369,7 @@ export function removeCustomGrid(
  * containing the raw decoration grid entity and the associated entity data.
  */
 export function getCustomGridEntities(): Array<
-  [gridEntity: GridEntity, data: CustomGridEntityData]
+  [gridEntity: GridEntity, data: GridEntityCustomData]
 > {
   const roomListIndex = getRoomListIndex();
   const roomCustomGridEntities = v.level.customGridEntities.get(roomListIndex);
@@ -365,7 +378,7 @@ export function getCustomGridEntities(): Array<
   }
 
   const room = game.GetRoom();
-  const customGridEntities: Array<[GridEntity, CustomGridEntityData]> = [];
+  const customGridEntities: Array<[GridEntity, GridEntityCustomData]> = [];
   for (const [gridIndex, data] of roomCustomGridEntities.entries()) {
     const gridEntity = room.GetGridEntity(gridIndex);
     if (gridEntity !== undefined) {

package/src/features/extraConsoleCommands/listCommands.ts

@@ -64,7 +64,7 @@ import { getEnumValues } from "../../functions/enums";
 import { addFlag } from "../../functions/flag";
 import { spawnGridEntity } from "../../functions/gridEntities";
 import {
-  logEffects,
+  logPlayerEffects,
   logRoom,
   logSeedEffects,
   logSounds,
@@ -515,7 +515,7 @@ export function dungeon(): void {
 /** Logs the player's current temporary effects to the "log.txt" file. */
 export function effects(): void {
   const player = Isaac.GetPlayer();
-  logEffects(player);
+  logPlayerEffects(player);
   printConsole('Logged the player\'s effects to the "log.txt" file.');
 }
 

package/src/features/persistentEntities.ts

@@ -8,7 +8,7 @@ import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
 import { spawn } from "../functions/entities";
 import { getRoomListIndex } from "../functions/roomData";
-import { getLatestRoomDescription } from "./roomHistory";
+import { getLatestRoomDescription, isLeavingRoom } from "./roomHistory";
 import { saveDataManager } from "./saveDataManager/exports";
 
 interface PersistentEntityDescription {
@@ -56,6 +56,10 @@ export function persistentEntitiesInit(mod: ModUpgraded): void {
 
 // ModCallback.POST_ENTITY_REMOVE (67)
 function postEntityRemove(entity: Entity) {
+  checkDespawningFromPlayerLeavingRoom(entity);
+}
+
+function checkDespawningFromPlayerLeavingRoom(entity: Entity) {
   const ptrHash = GetPtrHash(entity);
   const tuple = v.room.spawnedPersistentEntities.get(ptrHash);
   if (tuple === undefined) {
@@ -63,10 +67,20 @@ function postEntityRemove(entity: Entity) {
   }
   const index = tuple[0];
 
-  // The persistent entity is despawning, presumably because the player is in the process of leaving
-  // the room. Keep track of the position for later. We use the previous room list index because
-  // even though the `POST_NEW_ROOM` callback was not fired yet, we have already traveled to the
-  // next room.
+  if (!isLeavingRoom()) {
+    return;
+  }
+
+  trackDespawningPickupPosition(entity, index);
+}
+
+/**
+ * The persistent entity is despawning because the player is in the process of leaving the room.
+ * Keep track of the position for later.
+ */
+function trackDespawningPickupPosition(entity: Entity, index: int) {
+  // (The "latest" room description is really the previous room, because the `POST_NEW_ROOM`
+  // callback was not fired yet.)
   const previousRoomDescription = getLatestRoomDescription();
   const previousRoomListIndex = previousRoomDescription.roomListIndex;
   const persistentEntityDescription: PersistentEntityDescription = {

package/src/features/pickupIndex.ts

@@ -14,7 +14,7 @@ import { getRoomListIndex } from "../functions/roomData";
 import { onAscent } from "../functions/stage";
 import { vectorEquals } from "../functions/vector";
 import { PickupIndex } from "../types/PickupIndex";
-import { getLatestRoomDescription } from "./roomHistory";
+import { getLatestRoomDescription, isLeavingRoom } from "./roomHistory";
 import { saveDataManager } from "./saveDataManager/exports";
 
 interface PickupDescription {
@@ -27,7 +27,6 @@ const FEATURE_NAME = "pickupIndex";
 const v = {
   run: {
     pickupCounter: 0 as PickupIndex,
-    currentRoomListIndex: 0,
 
     pickupDataTreasureRooms: new Map<PickupIndex, PickupDescription>(),
     pickupDataBossRooms: new Map<PickupIndex, PickupDescription>(),
@@ -81,9 +80,6 @@ function postPickupInit(pickup: EntityPickup) {
 
   v.run.pickupCounter++;
   v.room.pickupIndexes.set(ptrHash, v.run.pickupCounter);
-
-  // Additionally, keep track of which room we are storing the pointer hashes for.
-  v.run.currentRoomListIndex = getRoomListIndex();
 }
 
 // ModCallback.POST_ENTITY_REMOVE (67)
@@ -99,10 +95,7 @@ function checkDespawningFromPlayerLeavingRoom(entity: Entity) {
     return;
   }
 
-  const roomListIndex = getRoomListIndex();
-  if (roomListIndex === v.run.currentRoomListIndex) {
-    // This is a pickup that is despawning in the current room. For example, it could be a heart
-    // pickup that the player picked up. Thus, we do not need to keep track of it's metadata.
+  if (!isLeavingRoom()) {
     return;
   }
 
@@ -111,13 +104,14 @@ function checkDespawningFromPlayerLeavingRoom(entity: Entity) {
 
 /**
  * This is a pickup that is despawning because the player is in the process of leaving the room.
- * Keep track of the metadata for later. We need to use the previous room list index because even
- * though the `POST_NEW_ROOM` callback was not fired yet, we have already traveled to the next room.
+ * Keep track of the metadata for later.
  */
 function trackDespawningPickupMetadata(
   entity: Entity,
   pickupIndex: PickupIndex,
 ) {
+  // The "latest" room description is really the previous room, because the `POST_NEW_ROOM` callback
+  // was not fired yet.
   const previousRoomDescription = getLatestRoomDescription();
   const previousRoomListIndex = previousRoomDescription.roomListIndex;
   const pickupDescriptions = v.level.pickupData.getAndSetDefault(
@@ -176,10 +170,10 @@ function postNewRoomReordered() {
     }
 
     if (pickupIndex === undefined) {
-      const entityID = getEntityID(pickup);
-      error(
-        `Failed to find a pickup index corresponding to existing pickup: ${entityID}`,
-      );
+      // At this point, if we do not already have an existing pickup index, we need to create a new
+      // one in order to cover the cases where mods spawn items in the `POST_NEW_ROOM` callback.
+      v.run.pickupCounter++;
+      pickupIndex = v.run.pickupCounter;
     }
 
     const ptrHash = GetPtrHash(pickup);

package/src/features/roomHistory.ts

@@ -10,6 +10,7 @@ import {
   getRoomStageID,
   getRoomSubType,
   getRoomVariant,
+  getRoomVisitedCount,
 } from "../functions/roomData";
 import { RoomDescription } from "../interfaces/RoomDescription";
 import { saveDataManager } from "./saveDataManager/exports";
@@ -45,6 +46,7 @@ function postNewRoomEarly() {
   const roomName = getRoomName();
   const roomGridIndex = getRoomGridIndex();
   const roomListIndex = getRoomListIndex();
+  const roomVisitedCount = getRoomVisitedCount();
 
   const roomDescription: RoomDescription = {
     stage,
@@ -56,6 +58,7 @@ function postNewRoomEarly() {
     roomName,
     roomGridIndex,
     roomListIndex,
+    roomVisitedCount,
   };
   v.run.roomHistory.push(roomDescription);
 }
@@ -96,10 +99,7 @@ export function getPreviousRoomDescription(): RoomDescription {
  * Helper function to get information about the most recent room that is stored in the room history
  * array.
  *
- * This is useful in the `POST_ENTITY_REMOVE` callback, since if an entity is despawning due to a
- * player having left the room, the current room will have changed already, but the `POST_NEW_ROOM`
- * callback will not have fired yet, and there will not be an entry in the room history array for
- * the current room.
+ * This is useful in the `POST_ENTITY_REMOVE` callback; see the `isLeavingRoom` function.
  */
 export function getLatestRoomDescription(): RoomDescription {
   const latestRoomDescription = getLastElement(v.run.roomHistory);
@@ -111,3 +111,23 @@ export function getLatestRoomDescription(): RoomDescription {
 
   return latestRoomDescription;
 }
+
+/**
+ * Helper function to detect if the game is in the state where the room index has changed to a new
+ * room, but the entities from the previous room are currently in the process of despawning. (At
+ * this point, the `POST_NEW_ROOM` callback will not have fired yet, and there will not be an entry
+ * in the room history array for the current room.)
+ *
+ * This function is intended to be used in the `POST_ENTITY_REMOVE` callback to detect when an
+ * entity is pseudo-persistent entity such as a pickup is despawning.
+ */
+export function isLeavingRoom(): boolean {
+  const roomListIndex = getRoomListIndex();
+  const roomVisitedCount = getRoomVisitedCount();
+  const latestRoomDescription = getLatestRoomDescription();
+
+  return (
+    roomListIndex !== latestRoomDescription.roomListIndex ||
+    roomVisitedCount !== latestRoomDescription.roomVisitedCount
+  );
+}