isaacscript-common 1.0.499 → 1.0.503

package/dist/callbacks/postBombInitLate.lua

@@ -4,9 +4,6 @@ local ____exports = {}
 local hasSubscriptions, postBombUpdate, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____rooms = require("functions.rooms")
-local getRoomIndex = ____rooms.getRoomIndex
-local getRoomVisitedCount = ____rooms.getRoomVisitedCount
 local ____postBombInitLate = require("callbacks.subscriptions.postBombInitLate")
 local postBombInitLateFire = ____postBombInitLate.postBombInitLateFire
 local postBombInitLateHasSubscriptions = ____postBombInitLate.postBombInitLateHasSubscriptions
@@ -17,24 +14,13 @@ function postBombUpdate(self, bomb)
     if not hasSubscriptions(nil) then
         return
     end
-    local roomIndex = getRoomIndex(nil)
-    local roomVisitedCount = getRoomVisitedCount(nil)
-    if roomIndex ~= v.run.currentRoomIndex or roomVisitedCount ~= v.run.currentRoomVisitedCount then
-        v.run.currentRoomIndex = roomIndex
-        v.run.currentRoomVisitedCount = roomVisitedCount
-        v.run.firedSet:clear()
-    end
     local index = GetPtrHash(bomb)
-    if not v.run.firedSet:has(index) then
-        v.run.firedSet:add(index)
+    if not v.room.firedSet:has(index) then
+        v.room.firedSet:add(index)
         postBombInitLateFire(nil, bomb)
     end
 end
-v = {run = {
-    firedSet = __TS__New(Set),
-    currentRoomIndex = nil,
-    currentRoomVisitedCount = nil
-}}
+v = {room = {firedSet = __TS__New(Set)}}
 function ____exports.postBombInitLateCallbackInit(self, mod)
     saveDataManager(nil, "postBombInitLate", v, hasSubscriptions)
     mod:AddCallback(ModCallbacks.MC_POST_BOMB_UPDATE, postBombUpdate)

package/dist/callbacks/postEffectInitLate.lua

@@ -4,9 +4,6 @@ local ____exports = {}
 local hasSubscriptions, postEffectUpdate, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____rooms = require("functions.rooms")
-local getRoomIndex = ____rooms.getRoomIndex
-local getRoomVisitedCount = ____rooms.getRoomVisitedCount
 local ____postEffectInitLate = require("callbacks.subscriptions.postEffectInitLate")
 local postEffectInitLateFire = ____postEffectInitLate.postEffectInitLateFire
 local postEffectInitLateHasSubscriptions = ____postEffectInitLate.postEffectInitLateHasSubscriptions
@@ -17,24 +14,13 @@ function postEffectUpdate(self, effect)
     if not hasSubscriptions(nil) then
         return
     end
-    local roomIndex = getRoomIndex(nil)
-    local roomVisitedCount = getRoomVisitedCount(nil)
-    if roomIndex ~= v.run.currentRoomIndex or roomVisitedCount ~= v.run.currentRoomVisitedCount then
-        v.run.currentRoomIndex = roomIndex
-        v.run.currentRoomVisitedCount = roomVisitedCount
-        v.run.firedSet:clear()
-    end
     local index = GetPtrHash(effect)
-    if not v.run.firedSet:has(index) then
-        v.run.firedSet:add(index)
+    if not v.room.firedSet:has(index) then
+        v.room.firedSet:add(index)
         postEffectInitLateFire(nil, effect)
     end
 end
-v = {run = {
-    firedSet = __TS__New(Set),
-    currentRoomIndex = nil,
-    currentRoomVisitedCount = nil
-}}
+v = {room = {firedSet = __TS__New(Set)}}
 function ____exports.postEffectInitLateCallbackInit(self, mod)
     saveDataManager(nil, "postEffectInitLate", v, hasSubscriptions)
     mod:AddCallback(ModCallbacks.MC_POST_EFFECT_UPDATE, postEffectUpdate)

package/dist/callbacks/postFamiliarInitLate.lua

@@ -4,9 +4,6 @@ local ____exports = {}
 local hasSubscriptions, postFamiliarUpdate, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____rooms = require("functions.rooms")
-local getRoomIndex = ____rooms.getRoomIndex
-local getRoomVisitedCount = ____rooms.getRoomVisitedCount
 local ____postFamiliarInitLate = require("callbacks.subscriptions.postFamiliarInitLate")
 local postFamiliarInitLateFire = ____postFamiliarInitLate.postFamiliarInitLateFire
 local postFamiliarInitLateHasSubscriptions = ____postFamiliarInitLate.postFamiliarInitLateHasSubscriptions
@@ -17,24 +14,13 @@ function postFamiliarUpdate(self, familiar)
     if not hasSubscriptions(nil) then
         return
     end
-    local roomIndex = getRoomIndex(nil)
-    local roomVisitedCount = getRoomVisitedCount(nil)
-    if roomIndex ~= v.run.currentRoomIndex or roomVisitedCount ~= v.run.currentRoomVisitedCount then
-        v.run.currentRoomIndex = roomIndex
-        v.run.currentRoomVisitedCount = roomVisitedCount
-        v.run.firedSet:clear()
-    end
     local index = GetPtrHash(familiar)
     if not v.run.firedSet:has(index) then
         v.run.firedSet:add(index)
         postFamiliarInitLateFire(nil, familiar)
     end
 end
-v = {run = {
-    firedSet = __TS__New(Set),
-    currentRoomIndex = nil,
-    currentRoomVisitedCount = nil
-}}
+v = {run = {firedSet = __TS__New(Set)}}
 function ____exports.postFamiliarInitLateCallbackInit(self, mod)
     saveDataManager(nil, "postFamiliarInitLate", v, hasSubscriptions)
     mod:AddCallback(ModCallbacks.MC_FAMILIAR_UPDATE, postFamiliarUpdate)

package/dist/callbacks/postKnifeInitLate.lua

@@ -4,9 +4,6 @@ local ____exports = {}
 local hasSubscriptions, postKnifeUpdate, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____rooms = require("functions.rooms")
-local getRoomIndex = ____rooms.getRoomIndex
-local getRoomVisitedCount = ____rooms.getRoomVisitedCount
 local ____postKnifeInitLate = require("callbacks.subscriptions.postKnifeInitLate")
 local postKnifeInitLateFire = ____postKnifeInitLate.postKnifeInitLateFire
 local postKnifeInitLateHasSubscriptions = ____postKnifeInitLate.postKnifeInitLateHasSubscriptions
@@ -17,24 +14,13 @@ function postKnifeUpdate(self, knife)
     if not hasSubscriptions(nil) then
         return
     end
-    local roomIndex = getRoomIndex(nil)
-    local roomVisitedCount = getRoomVisitedCount(nil)
-    if roomIndex ~= v.run.currentRoomIndex or roomVisitedCount ~= v.run.currentRoomVisitedCount then
-        v.run.currentRoomIndex = roomIndex
-        v.run.currentRoomVisitedCount = roomVisitedCount
-        v.run.firedSet:clear()
-    end
     local index = GetPtrHash(knife)
-    if not v.run.firedSet:has(index) then
-        v.run.firedSet:add(index)
+    if not v.room.firedSet:has(index) then
+        v.room.firedSet:add(index)
         postKnifeInitLateFire(nil, knife)
     end
 end
-v = {run = {
-    firedSet = __TS__New(Set),
-    currentRoomIndex = nil,
-    currentRoomVisitedCount = nil
-}}
+v = {room = {firedSet = __TS__New(Set)}}
 function ____exports.postKnifeInitLateCallbackInit(self, mod)
     saveDataManager(nil, "postKnifeInitLate", v, hasSubscriptions)
     mod:AddCallback(ModCallbacks.MC_POST_KNIFE_UPDATE, postKnifeUpdate)

package/dist/callbacks/postLaserInitLate.lua

@@ -4,9 +4,6 @@ local ____exports = {}
 local hasSubscriptions, postLaserUpdate, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____rooms = require("functions.rooms")
-local getRoomIndex = ____rooms.getRoomIndex
-local getRoomVisitedCount = ____rooms.getRoomVisitedCount
 local ____postLaserInitLate = require("callbacks.subscriptions.postLaserInitLate")
 local postLaserInitLateFire = ____postLaserInitLate.postLaserInitLateFire
 local postLaserInitLateHasSubscriptions = ____postLaserInitLate.postLaserInitLateHasSubscriptions
@@ -17,24 +14,13 @@ function postLaserUpdate(self, laser)
     if not hasSubscriptions(nil) then
         return
     end
-    local roomIndex = getRoomIndex(nil)
-    local roomVisitedCount = getRoomVisitedCount(nil)
-    if roomIndex ~= v.run.currentRoomIndex or roomVisitedCount ~= v.run.currentRoomVisitedCount then
-        v.run.currentRoomIndex = roomIndex
-        v.run.currentRoomVisitedCount = roomVisitedCount
-        v.run.firedSet:clear()
-    end
     local index = GetPtrHash(laser)
-    if not v.run.firedSet:has(index) then
-        v.run.firedSet:add(index)
+    if not v.room.firedSet:has(index) then
+        v.room.firedSet:add(index)
         postLaserInitLateFire(nil, laser)
     end
 end
-v = {run = {
-    firedSet = __TS__New(Set),
-    currentRoomIndex = nil,
-    currentRoomVisitedCount = nil
-}}
+v = {room = {firedSet = __TS__New(Set)}}
 function ____exports.postLaserInitLateCallbackInit(self, mod)
     saveDataManager(nil, "postLaserInitLate", v, hasSubscriptions)
     mod:AddCallback(ModCallbacks.MC_POST_LASER_UPDATE, postLaserUpdate)

package/dist/callbacks/postNPCInitLate.lua

@@ -4,9 +4,6 @@ local ____exports = {}
 local hasSubscriptions, postNPCUpdate, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____rooms = require("functions.rooms")
-local getRoomIndex = ____rooms.getRoomIndex
-local getRoomVisitedCount = ____rooms.getRoomVisitedCount
 local ____postNPCInitLate = require("callbacks.subscriptions.postNPCInitLate")
 local postNPCInitLateFire = ____postNPCInitLate.postNPCInitLateFire
 local postNPCInitLateHasSubscriptions = ____postNPCInitLate.postNPCInitLateHasSubscriptions
@@ -17,24 +14,13 @@ function postNPCUpdate(self, npc)
     if not hasSubscriptions(nil) then
         return
     end
-    local roomIndex = getRoomIndex(nil)
-    local roomVisitedCount = getRoomVisitedCount(nil)
-    if roomIndex ~= v.run.currentRoomIndex or roomVisitedCount ~= v.run.currentRoomVisitedCount then
-        v.run.currentRoomIndex = roomIndex
-        v.run.currentRoomVisitedCount = roomVisitedCount
-        v.run.firedSet:clear()
-    end
     local index = GetPtrHash(npc)
-    if not v.run.firedSet:has(index) then
-        v.run.firedSet:add(index)
+    if not v.room.firedSet:has(index) then
+        v.room.firedSet:add(index)
         postNPCInitLateFire(nil, npc)
     end
 end
-v = {run = {
-    firedSet = __TS__New(Set),
-    currentRoomIndex = nil,
-    currentRoomVisitedCount = nil
-}}
+v = {room = {firedSet = __TS__New(Set)}}
 function ____exports.postNPCInitLateCallbackInit(self, mod)
     saveDataManager(nil, "postNPCInitLate", v, hasSubscriptions)
     mod:AddCallback(ModCallbacks.MC_NPC_UPDATE, postNPCUpdate)

package/dist/callbacks/postNewRoomEarly.d.ts

@@ -0,0 +1,2 @@
+import { ModUpgraded } from "../types/ModUpgraded";
+export declare function postNewRoomEarlyCallbackInit(mod: ModUpgraded): void;

package/dist/callbacks/postNewRoomEarly.lua

@@ -0,0 +1,50 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+local hasSubscriptions, postNewRoom, preEntitySpawn, checkRoomChanged, currentRoomTopLeftWallPtrHash
+local ____gridEntity = require("functions.gridEntity")
+local getTopLeftWallGridIndex = ____gridEntity.getTopLeftWallGridIndex
+local spawnGridEntity = ____gridEntity.spawnGridEntity
+local ____postNewRoomEarly = require("callbacks.subscriptions.postNewRoomEarly")
+local postNewRoomEarlyFire = ____postNewRoomEarly.postNewRoomEarlyFire
+local postNewRoomEarlyHasSubscriptions = ____postNewRoomEarly.postNewRoomEarlyHasSubscriptions
+function hasSubscriptions(self)
+    return postNewRoomEarlyHasSubscriptions(nil)
+end
+function postNewRoom(self)
+    if not hasSubscriptions(nil) then
+        return
+    end
+    checkRoomChanged(nil)
+end
+function preEntitySpawn(self)
+    if not hasSubscriptions(nil) then
+        return
+    end
+    checkRoomChanged(nil)
+end
+function checkRoomChanged(self)
+    local game = Game()
+    local room = game:GetRoom()
+    local topLeftWallGridIndex = getTopLeftWallGridIndex(nil)
+    local topLeftWall = room:GetGridEntity(topLeftWallGridIndex)
+    if topLeftWall == nil then
+        topLeftWall = spawnGridEntity(nil, GridEntityType.GRID_WALL, topLeftWallGridIndex)
+    end
+    local ____temp_0
+    if topLeftWall == nil then
+        ____temp_0 = nil
+    else
+        ____temp_0 = GetPtrHash(topLeftWall)
+    end
+    local topLeftWallPtrHash = ____temp_0
+    if topLeftWallPtrHash ~= currentRoomTopLeftWallPtrHash then
+        currentRoomTopLeftWallPtrHash = topLeftWallPtrHash
+        postNewRoomEarlyFire(nil)
+    end
+end
+currentRoomTopLeftWallPtrHash = nil
+function ____exports.postNewRoomEarlyCallbackInit(self, mod)
+    mod:AddCallback(ModCallbacks.MC_POST_NEW_ROOM, postNewRoom)
+    mod:AddCallback(ModCallbacks.MC_PRE_ENTITY_SPAWN, preEntitySpawn)
+end
+return ____exports

package/dist/callbacks/postPickupInitLate.lua

@@ -4,9 +4,6 @@ local ____exports = {}
 local hasSubscriptions, postPickupUpdate, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____rooms = require("functions.rooms")
-local getRoomIndex = ____rooms.getRoomIndex
-local getRoomVisitedCount = ____rooms.getRoomVisitedCount
 local ____postPickupInitLate = require("callbacks.subscriptions.postPickupInitLate")
 local postPickupInitLateFire = ____postPickupInitLate.postPickupInitLateFire
 local postPickupInitLateHasSubscriptions = ____postPickupInitLate.postPickupInitLateHasSubscriptions
@@ -17,24 +14,13 @@ function postPickupUpdate(self, pickup)
     if not hasSubscriptions(nil) then
         return
     end
-    local roomIndex = getRoomIndex(nil)
-    local roomVisitedCount = getRoomVisitedCount(nil)
-    if roomIndex ~= v.run.currentRoomIndex or roomVisitedCount ~= v.run.currentRoomVisitedCount then
-        v.run.currentRoomIndex = roomIndex
-        v.run.currentRoomVisitedCount = roomVisitedCount
-        v.run.firedSet:clear()
-    end
     local index = GetPtrHash(pickup)
-    if not v.run.firedSet:has(index) then
-        v.run.firedSet:add(index)
+    if not v.room.firedSet:has(index) then
+        v.room.firedSet:add(index)
         postPickupInitLateFire(nil, pickup)
     end
 end
-v = {run = {
-    firedSet = __TS__New(Set),
-    currentRoomIndex = nil,
-    currentRoomVisitedCount = nil
-}}
+v = {room = {firedSet = __TS__New(Set)}}
 function ____exports.postPickupInitLateCallbackInit(self, mod)
     saveDataManager(nil, "postPickupInitLate", v, hasSubscriptions)
     mod:AddCallback(ModCallbacks.MC_POST_PICKUP_UPDATE, postPickupUpdate)

package/dist/callbacks/postProjectileInitLate.lua

@@ -4,9 +4,6 @@ local ____exports = {}
 local hasSubscriptions, postProjectileUpdate, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____rooms = require("functions.rooms")
-local getRoomIndex = ____rooms.getRoomIndex
-local getRoomVisitedCount = ____rooms.getRoomVisitedCount
 local ____postProjectileInitLate = require("callbacks.subscriptions.postProjectileInitLate")
 local postProjectileInitLateFire = ____postProjectileInitLate.postProjectileInitLateFire
 local postProjectileInitLateHasSubscriptions = ____postProjectileInitLate.postProjectileInitLateHasSubscriptions
@@ -17,24 +14,13 @@ function postProjectileUpdate(self, projectile)
     if not hasSubscriptions(nil) then
         return
     end
-    local roomIndex = getRoomIndex(nil)
-    local roomVisitedCount = getRoomVisitedCount(nil)
-    if roomIndex ~= v.run.currentRoomIndex or roomVisitedCount ~= v.run.currentRoomVisitedCount then
-        v.run.currentRoomIndex = roomIndex
-        v.run.currentRoomVisitedCount = roomVisitedCount
-        v.run.firedSet:clear()
-    end
     local index = GetPtrHash(projectile)
-    if not v.run.firedSet:has(index) then
-        v.run.firedSet:add(index)
+    if not v.room.firedSet:has(index) then
+        v.room.firedSet:add(index)
         postProjectileInitLateFire(nil, projectile)
     end
 end
-v = {run = {
-    firedSet = __TS__New(Set),
-    currentRoomIndex = nil,
-    currentRoomVisitedCount = nil
-}}
+v = {room = {firedSet = __TS__New(Set)}}
 function ____exports.postProjectileInitLateCallbackInit(self, mod)
     saveDataManager(nil, "postProjectileInitLate", v, hasSubscriptions)
     mod:AddCallback(ModCallbacks.MC_POST_PROJECTILE_UPDATE, postProjectileUpdate)

package/dist/callbacks/postTearInitLate.lua

@@ -4,9 +4,6 @@ local ____exports = {}
 local hasSubscriptions, postTearUpdate, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____rooms = require("functions.rooms")
-local getRoomIndex = ____rooms.getRoomIndex
-local getRoomVisitedCount = ____rooms.getRoomVisitedCount
 local ____postTearInitLate = require("callbacks.subscriptions.postTearInitLate")
 local postTearInitLateFire = ____postTearInitLate.postTearInitLateFire
 local postTearInitLateHasSubscriptions = ____postTearInitLate.postTearInitLateHasSubscriptions
@@ -17,24 +14,13 @@ function postTearUpdate(self, tear)
     if not hasSubscriptions(nil) then
         return
     end
-    local roomIndex = getRoomIndex(nil)
-    local roomVisitedCount = getRoomVisitedCount(nil)
-    if roomIndex ~= v.run.currentRoomIndex or roomVisitedCount ~= v.run.currentRoomVisitedCount then
-        v.run.currentRoomIndex = roomIndex
-        v.run.currentRoomVisitedCount = roomVisitedCount
-        v.run.firedSet:clear()
-    end
     local index = GetPtrHash(tear)
-    if not v.run.firedSet:has(index) then
-        v.run.firedSet:add(index)
+    if not v.room.firedSet:has(index) then
+        v.room.firedSet:add(index)
         postTearInitLateFire(nil, tear)
     end
 end
-v = {run = {
-    firedSet = __TS__New(Set),
-    currentRoomIndex = nil,
-    currentRoomVisitedCount = nil
-}}
+v = {room = {firedSet = __TS__New(Set)}}
 function ____exports.postTearInitLateCallbackInit(self, mod)
     saveDataManager(nil, "postTearInitLate", v, hasSubscriptions)
     mod:AddCallback(ModCallbacks.MC_POST_TEAR_UPDATE, postTearUpdate)

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

@@ -0,0 +1,4 @@
+export declare type PostNewRoomEarlyCallbackType = () => void;
+export declare function postNewRoomEarlyHasSubscriptions(): boolean;
+export declare function postNewRoomEarlyRegister(callback: PostNewRoomEarlyCallbackType): void;
+export declare function postNewRoomEarlyFire(): void;

package/dist/callbacks/subscriptions/postNewRoomEarly.lua

@@ -0,0 +1,18 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+require("lualib_bundle");
+local ____exports = {}
+local subscriptions = {}
+function ____exports.postNewRoomEarlyHasSubscriptions(self)
+    return #subscriptions > 0
+end
+function ____exports.postNewRoomEarlyRegister(self, callback)
+    __TS__ArrayPush(subscriptions, {callback})
+end
+function ____exports.postNewRoomEarlyFire(self)
+    local callback
+    for ____, ____value in ipairs(subscriptions) do
+        callback = ____value[1]
+        callback(nil)
+    end
+end
+return ____exports

package/dist/features/deployJSONRoom.lua

@@ -22,7 +22,7 @@ local getNPCs = ____npc.getNPCs
 local ____random = require("functions.random")
 local nextSeed = ____random.nextSeed
 local ____rooms = require("functions.rooms")
-local getRoomIndex = ____rooms.getRoomIndex
+local getRoomListIndex = ____rooms.getRoomListIndex
 local gridToPos = ____rooms.gridToPos
 local setRoomCleared = ____rooms.setRoomCleared
 local setRoomUncleared = ____rooms.setRoomUncleared
@@ -31,8 +31,8 @@ local spawnCollectible = ____spawnCollectible.spawnCollectible
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 function postNewRoom(self)
-    local roomIndex = getRoomIndex(nil)
-    if not v.level.deployedRoomIndexes:has(roomIndex) then
+    local roomListIndex = getRoomListIndex(nil)
+    if not v.level.deployedRoomListIndexes:has(roomListIndex) then
         return
     end
     setDecorationsInvisible(nil)
@@ -41,8 +41,8 @@ end
 function setDecorationsInvisible(self)
     local game = Game()
     local room = game:GetRoom()
-    local roomIndex = getRoomIndex(nil)
-    local decorationGridIndexes = v.level.decorationGridIndexes:get(roomIndex)
+    local roomListIndex = getRoomListIndex(nil)
+    local decorationGridIndexes = v.level.decorationGridIndexes:get(roomListIndex)
     if decorationGridIndexes == nil then
         return
     end
@@ -56,8 +56,8 @@ end
 function respawnPersistentEntities(self)
     local game = Game()
     local room = game:GetRoom()
-    local roomIndex = getRoomIndex(nil)
-    local persistentEntities = v.level.persistentEntities:get(roomIndex)
+    local roomListIndex = getRoomListIndex(nil)
+    local persistentEntities = v.level.persistentEntities:get(roomListIndex)
     if persistentEntities == nil then
         return
     end
@@ -78,8 +78,8 @@ function ____exports.emptyRoom(self, fillWithDecorations)
         local msg = getUpgradeErrorMsg(nil, FEATURE_NAME)
         error(msg)
     end
-    local roomIndex = getRoomIndex(nil)
-    v.level.deployedRoomIndexes:add(roomIndex)
+    local roomListIndex = getRoomListIndex(nil)
+    v.level.deployedRoomListIndexes:add(roomListIndex)
     removeAllBombs(nil)
     removeAllPickups(nil)
     removeAllMatchingEntities(nil, EntityType.ENTITY_SLOT)
@@ -117,11 +117,11 @@ function fillRoomWithDecorations(self)
     local game = Game()
     local room = game:GetRoom()
     local gridSize = room:GetGridSize()
-    local roomIndex = getRoomIndex(nil)
-    local decorationGridIndexes = v.level.decorationGridIndexes:get(roomIndex)
+    local roomListIndex = getRoomListIndex(nil)
+    local decorationGridIndexes = v.level.decorationGridIndexes:get(roomListIndex)
     if decorationGridIndexes == nil then
         decorationGridIndexes = {}
-        v.level.decorationGridIndexes:set(roomIndex, decorationGridIndexes)
+        v.level.decorationGridIndexes:set(roomListIndex, decorationGridIndexes)
     end
     do
         local gridIndex = 0
@@ -278,12 +278,12 @@ function storePersistentEntity(self, entity)
     local game = Game()
     local room = game:GetRoom()
     local gridIndex = room:GetGridIndex(entity.Position)
-    local roomIndex = getRoomIndex(nil)
+    local roomListIndex = getRoomListIndex(nil)
     local persistentEntity = {gridIndex = gridIndex, type = entity.Type, variant = entity.Variant, subType = entity.SubType}
-    local persistentEntities = v.level.persistentEntities:get(roomIndex)
+    local persistentEntities = v.level.persistentEntities:get(roomListIndex)
     if persistentEntities == nil then
         persistentEntities = {}
-        v.level.persistentEntities:set(roomIndex, persistentEntities)
+        v.level.persistentEntities:set(roomListIndex, persistentEntities)
     end
     __TS__ArrayPush(persistentEntities, persistentEntity)
 end
@@ -405,7 +405,7 @@ NPC_TYPES_TO_NOT_REMOVE = __TS__New(Set, {EntityType.ENTITY_DARK_ESAU})
 PERSISTENT_ENTITY_TYPES = __TS__New(Set, {EntityType.ENTITY_WALL_HUGGER})
 initialized = false
 v = {level = {
-    deployedRoomIndexes = __TS__New(Set),
+    deployedRoomListIndexes = __TS__New(Set),
     persistentEntities = __TS__New(Map),
     decorationGridIndexes = __TS__New(Map)
 }}

package/dist/features/getCollectibleItemPoolType.lua

@@ -17,12 +17,7 @@ function postPickupInitCollectible(self, pickup)
 end
 local FEATURE_NAME = "get collectible item pool type"
 local initialized = false
-v = {run = {
-    collectibleQueue = {},
-    collectibleItemPoolTypeMap = __TS__New(Map),
-    currentRoomIndex = nil,
-    currentRoomVisitedCount = nil
-}}
+v = {run = {collectibleItemPoolTypeMap = __TS__New(Map)}}
 function ____exports.getCollectibleItemPoolTypeInit(self, mod)
     initialized = true
     saveDataManager(nil, "getCollectibleItemPoolType", v)

package/dist/features/saveDataManager/main.lua

@@ -1,6 +1,6 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
-local postPlayerInit, preGameExit, postNewLevel, postNewRoom, restoreDefaultsAll, restoreDefaults, clearAndCopyAllElements, mod, loadedDataOnThisRun
+local postPlayerInit, preGameExit, postNewLevel, postNewRoomEarly, restoreDefaultsAll, restoreDefaults, clearAndCopyAllElements, mod, loadedDataOnThisRun
 local ____errors = require("errors")
 local getUpgradeErrorMsg = ____errors.getUpgradeErrorMsg
 local ____deepCopy = require("functions.deepCopy")
@@ -8,6 +8,8 @@ local deepCopy = ____deepCopy.deepCopy
 local SerializationType = ____deepCopy.SerializationType
 local ____util = require("functions.util")
 local tableClear = ____util.tableClear
+local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
+local ModCallbacksCustom = ____ModCallbacksCustom.ModCallbacksCustom
 local ____SaveData = require("types.SaveData")
 local SaveDataKeys = ____SaveData.SaveDataKeys
 local ____load = require("features.saveDataManager.load")
@@ -47,7 +49,7 @@ end
 function postNewLevel(self)
     restoreDefaults(nil, SaveDataKeys.Level)
 end
-function postNewRoom(self)
+function postNewRoomEarly(self)
     restoreDefaults(nil, SaveDataKeys.Room)
 end
 function restoreDefaultsAll(self)
@@ -94,7 +96,7 @@ function ____exports.saveDataManagerInit(self, incomingMod)
     mod:AddCallback(ModCallbacks.MC_POST_PLAYER_INIT, postPlayerInit)
     mod:AddCallback(ModCallbacks.MC_PRE_GAME_EXIT, preGameExit)
     mod:AddCallback(ModCallbacks.MC_POST_NEW_LEVEL, postNewLevel)
-    mod:AddCallback(ModCallbacks.MC_POST_NEW_ROOM, postNewRoom)
+    mod:AddCallbackCustom(ModCallbacksCustom.MC_POST_NEW_ROOM_EARLY, postNewRoomEarly)
 end
 function ____exports.isSaveDataManagerInitialized(self)
     return mod ~= nil

package/dist/functions/collectibles.d.ts

@@ -57,9 +57,9 @@ export declare function isGlitchedCollectible(entity: Entity): boolean;
 export declare function isPassiveCollectible(collectibleType: CollectibleType | int): boolean;
 export declare function isQuestCollectible(collectibleType: CollectibleType | int): boolean;
 /**
- * Helper function to see if a particular collectible will disappear from the player's inventory
- * upon use. Note that this will not work will modded items, as there is no way to dynamically know
- * if a modded item will disappear.
+ * Helper function to determine if a particular collectible will disappear from the player's
+ * inventory upon use. Note that this will not work will modded items, as there is no way to
+ * dynamically know if a modded item will disappear.
  */
 export declare function isSingleUseCollectible(collectibleType: CollectibleType | int): boolean;
 /**
@@ -89,14 +89,14 @@ export declare function setCollectibleBlind(collectible: EntityPickup): void;
  * player has already taken the item. This is accomplished by setting its sprite to an empty/missing
  * PNG file.
  *
- * For more information, see the documentation for the "EMPTY_PNG_FILENAME" constant.
+ * For more information, see the documentation for the "emptySprite" helper function.
  */
 export declare function setCollectibleEmpty(collectible: EntityPickup): void;
 /**
  * Helper function to change the sprite of a collectible pedestal entity.
  *
  * For more information about removing the collectible sprite, see the documentation for the
- * "EMPTY_PNG_FILENAME" constant.
+ * "emptySprite" helper function.
  *
  * @param collectible The collectible whose sprite you want to modify.
  * @param pngPath Optional. Equal to the spritesheet path to load (e.g.

package/dist/functions/collectibles.lua

@@ -178,6 +178,10 @@ function ____exports.setCollectibleSubType(self, collectible, newCollectibleType
     if collectible.Variant ~= PickupVariant.PICKUP_COLLECTIBLE then
         error("You cannot set a collectible sub type for pickups of variant: " .. tostring(collectible.Variant))
     end
+    if newCollectibleType == CollectibleType.COLLECTIBLE_NULL then
+        ____exports.setCollectibleEmpty(nil, collectible)
+        return
+    end
     collectible:Morph(
         EntityType.ENTITY_PICKUP,
         PickupVariant.PICKUP_COLLECTIBLE,

package/dist/functions/flag.d.ts

@@ -23,7 +23,7 @@
  */
 export declare function addFlag(flags: int, ...flag: int[]): int;
 /**
- * Helper function to check to see if a particular bit flag is set to true.
+ * Helper function to determine if a particular bit flag is set to true.
  * This is a variadic function, so pass as many flags as you want to check for.
  * If passed multiple flags, it will only return true if all of the flags are set.
  *

package/dist/functions/gridEntity.d.ts

@@ -26,10 +26,16 @@ export declare function convertXMLGridEntityType(gridEntityXMLType: int, gridEnt
  * ```
  */
 export declare function getGridEntities(...gridEntityTypes: GridEntityType[]): GridEntity[];
+export declare function getTopLeftWall(): GridEntity | undefined;
+/**
+ * Helper function to get the grid index of the top left wall.
+ * (This will depend on what the current room shape is.)
+ */
+export declare function getTopLeftWallGridIndex(): int;
 export declare function getSurroundingGridEntities(gridEntity: GridEntity): GridEntity[];
 /**
- * Helper function to see if all of the pressure plates in the current room are pushed. Returns true
- * if there are no pressure plates in the room.
+ * Helper function to determine if all of the pressure plates in the current room are pushed.
+ * Returns true if there are no pressure plates in the room.
  */
 export declare function isAllPressurePlatesPushed(): boolean;
 /**