isaacscript-common 12.6.0 → 12.6.1

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 12.6.0
+isaacscript-common 12.6.1
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -41287,10 +41287,9 @@ local __TS__New = ____lualib.__TS__New
 local Map = ____lualib.Map
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
-local preUseItemWeNeedToGoDeeper, postNewRoomReordered, setDecorationsInvisible, respawnPersistentEntities, removeSpecificNPCs, fillRoomWithDecorations, spawnAllEntities, spawnGridEntityForJSONRoom, spawnNormalEntityForJSONRoom, storePersistentEntity, fixPitGraphics, getPitMap, getPitFrame, FEATURE_NAME, NPC_TYPES_TO_NOT_REMOVE, PERSISTENT_ENTITY_TYPES, GRID_ENTITY_XML_TYPE_SET, v
+local preUseItemWeNeedToGoDeeper, postNewRoomReordered, setDecorationsInvisible, respawnPersistentEntities, emptyRoomEntities, emptyRoomGridEntities, fillRoomWithDecorations, spawnAllEntities, spawnGridEntityForJSONRoom, spawnNormalEntityForJSONRoom, storePersistentEntity, fixPitGraphics, getPitMap, getPitFrame, FEATURE_NAME, PERSISTENT_ENTITY_TYPES, GRID_ENTITY_XML_TYPE_SET, EMPTY_ROOM_BLACKLIST_ENTITY_SET, EMPTY_ROOM_BLACKLIST_GRID_ENTITY_SET, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
-local EffectVariant = ____isaac_2Dtypescript_2Ddefinitions.EffectVariant
 local EntityCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.EntityCollisionClass
 local EntityFlag = ____isaac_2Dtypescript_2Ddefinitions.EntityFlag
 local EntityGridCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.EntityGridCollisionClass
@@ -41312,21 +41311,16 @@ local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNot
 local ____array = require("src.functions.array")
 local emptyArray = ____array.emptyArray
 local ____entities = require("src.functions.entities")
+local getEntities = ____entities.getEntities
 local getEntityIDFromConstituents = ____entities.getEntityIDFromConstituents
-local removeAllMatchingEntities = ____entities.removeAllMatchingEntities
 local spawn = ____entities.spawn
 local spawnWithSeed = ____entities.spawnWithSeed
-local ____entitiesSpecific = require("src.functions.entitiesSpecific")
-local getNPCs = ____entitiesSpecific.getNPCs
-local removeAllBombs = ____entitiesSpecific.removeAllBombs
-local removeAllPickups = ____entitiesSpecific.removeAllPickups
 local ____enums = require("src.functions.enums")
 local getEnumValues = ____enums.getEnumValues
 local ____gridEntities = require("src.functions.gridEntities")
 local convertXMLGridEntityType = ____gridEntities.convertXMLGridEntityType
 local getAllGridIndexes = ____gridEntities.getAllGridIndexes
 local getGridEntities = ____gridEntities.getGridEntities
-local removeAllGridEntitiesExcept = ____gridEntities.removeAllGridEntitiesExcept
 local removeGridEntity = ____gridEntities.removeGridEntity
 local setGridEntityInvisible = ____gridEntities.setGridEntityInvisible
 local spawnGridEntityWithVariant = ____gridEntities.spawnGridEntityWithVariant
@@ -41344,6 +41338,7 @@ local getRoomListIndex = ____roomData.getRoomListIndex
 local ____roomGrid = require("src.functions.roomGrid")
 local gridCoordinatesToWorldPosition = ____roomGrid.gridCoordinatesToWorldPosition
 local ____rooms = require("src.functions.rooms")
+local roomUpdateSafe = ____rooms.roomUpdateSafe
 local setRoomCleared = ____rooms.setRoomCleared
 local setRoomUncleared = ____rooms.setRoomUncleared
 local ____spawnCollectible = require("src.functions.spawnCollectible")
@@ -41430,38 +41425,50 @@ function ____exports.emptyRoom(self, fillWithDecorations)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
     local roomListIndex = getRoomListIndex(nil)
     v.level.deployedRoomListIndexes:add(roomListIndex)
-    removeAllBombs(nil)
-    removeAllPickups(nil)
-    removeAllMatchingEntities(nil, EntityType.SLOT)
-    removeSpecificNPCs(nil)
-    removeAllMatchingEntities(nil, EntityType.EFFECT, EffectVariant.DEVIL)
-    removeAllMatchingEntities(nil, EntityType.EFFECT, EffectVariant.ANGEL)
-    removeAllGridEntitiesExcept(nil, GridEntityType.WALL, GridEntityType.DOOR)
+    emptyRoomEntities(nil)
+    emptyRoomGridEntities(nil)
     setRoomCleared(nil)
     if fillWithDecorations then
         fillRoomWithDecorations(nil)
     end
 end
-function removeSpecificNPCs(self)
+function emptyRoomEntities(self)
     local room = game:GetRoom()
-    for ____, npc in ipairs(getNPCs(nil)) do
+    for ____, entity in ipairs(getEntities(nil)) do
         do
-            if NPC_TYPES_TO_NOT_REMOVE:has(npc.Type) then
+            if EMPTY_ROOM_BLACKLIST_ENTITY_SET:has(entity.Type) then
                 goto __continue33
             end
-            if npc:HasEntityFlags(EntityFlag.CHARM) or npc:HasEntityFlags(EntityFlag.FRIENDLY) or npc:HasEntityFlags(EntityFlag.PERSISTENT) then
+            if entity:HasEntityFlags(EntityFlag.CHARM) or entity:HasEntityFlags(EntityFlag.FRIENDLY) or entity:HasEntityFlags(EntityFlag.PERSISTENT) then
                 goto __continue33
             end
-            npc:ClearEntityFlags(EntityFlag.APPEAR)
-            npc:Remove()
-            if npc.Type == EntityType.FIREPLACE then
-                local gridIndex = room:GetGridIndex(npc.Position)
+            entity:ClearEntityFlags(EntityFlag.APPEAR)
+            entity:Remove()
+            if entity.Type == EntityType.FIREPLACE then
+                local gridIndex = room:GetGridIndex(entity.Position)
                 room:SetGridPath(gridIndex, 0)
             end
         end
         ::__continue33::
     end
 end
+function emptyRoomGridEntities(self)
+    local removedOneOrMoreGridEntities = false
+    for ____, gridEntity in ipairs(getGridEntities(nil)) do
+        do
+            local gridEntityType = gridEntity:GetType()
+            if EMPTY_ROOM_BLACKLIST_GRID_ENTITY_SET:has(gridEntityType) then
+                goto __continue39
+            end
+            removeGridEntity(nil, gridEntity, false)
+            removedOneOrMoreGridEntities = true
+        end
+        ::__continue39::
+    end
+    if removedOneOrMoreGridEntities then
+        roomUpdateSafe(nil)
+    end
+end
 function fillRoomWithDecorations(self)
     local room = game:GetRoom()
     local roomListIndex = getRoomListIndex(nil)
@@ -41470,7 +41477,7 @@ function fillRoomWithDecorations(self)
         do
             local existingGridEntity = room:GetGridEntity(gridIndex)
             if existingGridEntity ~= nil then
-                goto __continue39
+                goto __continue44
             end
             local position = room:GetGridPosition(gridIndex)
             local decoration = Isaac.GridSpawn(GridEntityType.DECORATION, 0, position)
@@ -41479,7 +41486,7 @@ function fillRoomWithDecorations(self)
             end
             decorationGridIndexes[#decorationGridIndexes + 1] = gridIndex
         end
-        ::__continue39::
+        ::__continue44::
     end
 end
 function spawnAllEntities(self, jsonRoom, rng, verbose)
@@ -41737,10 +41744,19 @@ function getPitFrame(self, L, R, U, D, UL, UR, DL, DR)
     return F
 end
 FEATURE_NAME = "deployJSONRoom"
-NPC_TYPES_TO_NOT_REMOVE = __TS__New(Set, {EntityType.DARK_ESAU})
 PERSISTENT_ENTITY_TYPES = __TS__New(Set, {EntityType.WALL_HUGGER})
 local gridEntityXMLTypes = getEnumValues(nil, GridEntityXMLType)
 GRID_ENTITY_XML_TYPE_SET = __TS__New(Set, gridEntityXMLTypes)
+EMPTY_ROOM_BLACKLIST_ENTITY_SET = __TS__New(Set, {
+    EntityType.PLAYER,
+    EntityType.TEAR,
+    EntityType.FAMILIAR,
+    EntityType.LASER,
+    EntityType.KNIFE,
+    EntityType.PROJECTILE,
+    EntityType.DARK_ESAU
+})
+EMPTY_ROOM_BLACKLIST_GRID_ENTITY_SET = __TS__New(Set, {GridEntityType.WALL, GridEntityType.DOOR})
 v = {
     level = {
         deployedRoomListIndexes = __TS__New(Set),

package/dist/src/features/deployJSONRoom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployJSONRoom.d.ts","sourceRoot":"","sources":["../../../src/features/deployJSONRoom.ts"],"names":[],"mappings":";;AAwDA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AA4KvD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,EACvC,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,OAAO,UAAQ,GACd,IAAI,CAuBN;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,QAAQ,EAAE,EACrB,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,OAAO,UAAQ,GACd,IAAI,CAaN;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,mBAAmB,EAAE,OAAO,GAAG,IAAI,CAwB5D"}
+{"version":3,"file":"deployJSONRoom.d.ts","sourceRoot":"","sources":["../../../src/features/deployJSONRoom.ts"],"names":[],"mappings":";;AAqDA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAwLvD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,EACvC,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,OAAO,UAAQ,GACd,IAAI,CAuBN;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,QAAQ,EAAE,EACrB,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,OAAO,UAAQ,GACd,IAAI,CAaN;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,mBAAmB,EAAE,OAAO,GAAG,IAAI,CAa5D"}

package/dist/src/features/deployJSONRoom.lua

@@ -4,10 +4,9 @@ local __TS__New = ____lualib.__TS__New
 local Map = ____lualib.Map
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
-local preUseItemWeNeedToGoDeeper, postNewRoomReordered, setDecorationsInvisible, respawnPersistentEntities, removeSpecificNPCs, fillRoomWithDecorations, spawnAllEntities, spawnGridEntityForJSONRoom, spawnNormalEntityForJSONRoom, storePersistentEntity, fixPitGraphics, getPitMap, getPitFrame, FEATURE_NAME, NPC_TYPES_TO_NOT_REMOVE, PERSISTENT_ENTITY_TYPES, GRID_ENTITY_XML_TYPE_SET, v
+local preUseItemWeNeedToGoDeeper, postNewRoomReordered, setDecorationsInvisible, respawnPersistentEntities, emptyRoomEntities, emptyRoomGridEntities, fillRoomWithDecorations, spawnAllEntities, spawnGridEntityForJSONRoom, spawnNormalEntityForJSONRoom, storePersistentEntity, fixPitGraphics, getPitMap, getPitFrame, FEATURE_NAME, PERSISTENT_ENTITY_TYPES, GRID_ENTITY_XML_TYPE_SET, EMPTY_ROOM_BLACKLIST_ENTITY_SET, EMPTY_ROOM_BLACKLIST_GRID_ENTITY_SET, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
-local EffectVariant = ____isaac_2Dtypescript_2Ddefinitions.EffectVariant
 local EntityCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.EntityCollisionClass
 local EntityFlag = ____isaac_2Dtypescript_2Ddefinitions.EntityFlag
 local EntityGridCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.EntityGridCollisionClass
@@ -29,21 +28,16 @@ local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNot
 local ____array = require("src.functions.array")
 local emptyArray = ____array.emptyArray
 local ____entities = require("src.functions.entities")
+local getEntities = ____entities.getEntities
 local getEntityIDFromConstituents = ____entities.getEntityIDFromConstituents
-local removeAllMatchingEntities = ____entities.removeAllMatchingEntities
 local spawn = ____entities.spawn
 local spawnWithSeed = ____entities.spawnWithSeed
-local ____entitiesSpecific = require("src.functions.entitiesSpecific")
-local getNPCs = ____entitiesSpecific.getNPCs
-local removeAllBombs = ____entitiesSpecific.removeAllBombs
-local removeAllPickups = ____entitiesSpecific.removeAllPickups
 local ____enums = require("src.functions.enums")
 local getEnumValues = ____enums.getEnumValues
 local ____gridEntities = require("src.functions.gridEntities")
 local convertXMLGridEntityType = ____gridEntities.convertXMLGridEntityType
 local getAllGridIndexes = ____gridEntities.getAllGridIndexes
 local getGridEntities = ____gridEntities.getGridEntities
-local removeAllGridEntitiesExcept = ____gridEntities.removeAllGridEntitiesExcept
 local removeGridEntity = ____gridEntities.removeGridEntity
 local setGridEntityInvisible = ____gridEntities.setGridEntityInvisible
 local spawnGridEntityWithVariant = ____gridEntities.spawnGridEntityWithVariant
@@ -61,6 +55,7 @@ local getRoomListIndex = ____roomData.getRoomListIndex
 local ____roomGrid = require("src.functions.roomGrid")
 local gridCoordinatesToWorldPosition = ____roomGrid.gridCoordinatesToWorldPosition
 local ____rooms = require("src.functions.rooms")
+local roomUpdateSafe = ____rooms.roomUpdateSafe
 local setRoomCleared = ____rooms.setRoomCleared
 local setRoomUncleared = ____rooms.setRoomUncleared
 local ____spawnCollectible = require("src.functions.spawnCollectible")
@@ -155,38 +150,50 @@ function ____exports.emptyRoom(self, fillWithDecorations)
     errorIfFeaturesNotInitialized(nil, FEATURE_NAME)
     local roomListIndex = getRoomListIndex(nil)
     v.level.deployedRoomListIndexes:add(roomListIndex)
-    removeAllBombs(nil)
-    removeAllPickups(nil)
-    removeAllMatchingEntities(nil, EntityType.SLOT)
-    removeSpecificNPCs(nil)
-    removeAllMatchingEntities(nil, EntityType.EFFECT, EffectVariant.DEVIL)
-    removeAllMatchingEntities(nil, EntityType.EFFECT, EffectVariant.ANGEL)
-    removeAllGridEntitiesExcept(nil, GridEntityType.WALL, GridEntityType.DOOR)
+    emptyRoomEntities(nil)
+    emptyRoomGridEntities(nil)
     setRoomCleared(nil)
     if fillWithDecorations then
         fillRoomWithDecorations(nil)
     end
 end
-function removeSpecificNPCs(self)
+function emptyRoomEntities(self)
     local room = game:GetRoom()
-    for ____, npc in ipairs(getNPCs(nil)) do
+    for ____, entity in ipairs(getEntities(nil)) do
         do
-            if NPC_TYPES_TO_NOT_REMOVE:has(npc.Type) then
+            if EMPTY_ROOM_BLACKLIST_ENTITY_SET:has(entity.Type) then
                 goto __continue33
             end
-            if npc:HasEntityFlags(EntityFlag.CHARM) or npc:HasEntityFlags(EntityFlag.FRIENDLY) or npc:HasEntityFlags(EntityFlag.PERSISTENT) then
+            if entity:HasEntityFlags(EntityFlag.CHARM) or entity:HasEntityFlags(EntityFlag.FRIENDLY) or entity:HasEntityFlags(EntityFlag.PERSISTENT) then
                 goto __continue33
             end
-            npc:ClearEntityFlags(EntityFlag.APPEAR)
-            npc:Remove()
-            if npc.Type == EntityType.FIREPLACE then
-                local gridIndex = room:GetGridIndex(npc.Position)
+            entity:ClearEntityFlags(EntityFlag.APPEAR)
+            entity:Remove()
+            if entity.Type == EntityType.FIREPLACE then
+                local gridIndex = room:GetGridIndex(entity.Position)
                 room:SetGridPath(gridIndex, 0)
             end
         end
         ::__continue33::
     end
 end
+function emptyRoomGridEntities(self)
+    local removedOneOrMoreGridEntities = false
+    for ____, gridEntity in ipairs(getGridEntities(nil)) do
+        do
+            local gridEntityType = gridEntity:GetType()
+            if EMPTY_ROOM_BLACKLIST_GRID_ENTITY_SET:has(gridEntityType) then
+                goto __continue39
+            end
+            removeGridEntity(nil, gridEntity, false)
+            removedOneOrMoreGridEntities = true
+        end
+        ::__continue39::
+    end
+    if removedOneOrMoreGridEntities then
+        roomUpdateSafe(nil)
+    end
+end
 function fillRoomWithDecorations(self)
     local room = game:GetRoom()
     local roomListIndex = getRoomListIndex(nil)
@@ -195,7 +202,7 @@ function fillRoomWithDecorations(self)
         do
             local existingGridEntity = room:GetGridEntity(gridIndex)
             if existingGridEntity ~= nil then
-                goto __continue39
+                goto __continue44
             end
             local position = room:GetGridPosition(gridIndex)
             local decoration = Isaac.GridSpawn(GridEntityType.DECORATION, 0, position)
@@ -204,7 +211,7 @@ function fillRoomWithDecorations(self)
             end
             decorationGridIndexes[#decorationGridIndexes + 1] = gridIndex
         end
-        ::__continue39::
+        ::__continue44::
     end
 end
 function spawnAllEntities(self, jsonRoom, rng, verbose)
@@ -462,10 +469,19 @@ function getPitFrame(self, L, R, U, D, UL, UR, DL, DR)
     return F
 end
 FEATURE_NAME = "deployJSONRoom"
-NPC_TYPES_TO_NOT_REMOVE = __TS__New(Set, {EntityType.DARK_ESAU})
 PERSISTENT_ENTITY_TYPES = __TS__New(Set, {EntityType.WALL_HUGGER})
 local gridEntityXMLTypes = getEnumValues(nil, GridEntityXMLType)
 GRID_ENTITY_XML_TYPE_SET = __TS__New(Set, gridEntityXMLTypes)
+EMPTY_ROOM_BLACKLIST_ENTITY_SET = __TS__New(Set, {
+    EntityType.PLAYER,
+    EntityType.TEAR,
+    EntityType.FAMILIAR,
+    EntityType.LASER,
+    EntityType.KNIFE,
+    EntityType.PROJECTILE,
+    EntityType.DARK_ESAU
+})
+EMPTY_ROOM_BLACKLIST_GRID_ENTITY_SET = __TS__New(Set, {GridEntityType.WALL, GridEntityType.DOOR})
 v = {
     level = {
         deployedRoomListIndexes = __TS__New(Set),

package/package.json

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

package/src/features/deployJSONRoom.ts

@@ -6,7 +6,6 @@
 import {
   ActiveSlot,
   CollectibleType,
-  EffectVariant,
   EntityCollisionClass,
   EntityFlag,
   EntityGridCollisionClass,
@@ -26,22 +25,16 @@ import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { errorIfFeaturesNotInitialized } from "../featuresInitialized";
 import { emptyArray } from "../functions/array";
 import {
+  getEntities,
   getEntityIDFromConstituents,
-  removeAllMatchingEntities,
   spawn,
   spawnWithSeed,
 } from "../functions/entities";
-import {
-  getNPCs,
-  removeAllBombs,
-  removeAllPickups,
-} from "../functions/entitiesSpecific";
 import { getEnumValues } from "../functions/enums";
 import {
   convertXMLGridEntityType,
   getAllGridIndexes,
   getGridEntities,
-  removeAllGridEntitiesExcept,
   removeGridEntity,
   setGridEntityInvisible,
   spawnGridEntityWithVariant,
@@ -51,7 +44,11 @@ import { log } from "../functions/log";
 import { getRandomSeed, isRNG, newRNG } from "../functions/rng";
 import { getRoomListIndex } from "../functions/roomData";
 import { gridCoordinatesToWorldPosition } from "../functions/roomGrid";
-import { setRoomCleared, setRoomUncleared } from "../functions/rooms";
+import {
+  roomUpdateSafe,
+  setRoomCleared,
+  setRoomUncleared,
+} from "../functions/rooms";
 import { spawnCollectible } from "../functions/spawnCollectible";
 import { asCollectibleType, asNumber } from "../functions/types";
 import { JSONRoom } from "../interfaces/JSONRoomsFile";
@@ -67,10 +64,6 @@ interface PersistentEntityDescription {
 
 const FEATURE_NAME = "deployJSONRoom";
 
-const NPC_TYPES_TO_NOT_REMOVE: ReadonlySet<EntityType> = new Set([
-  EntityType.DARK_ESAU,
-]);
-
 const PERSISTENT_ENTITY_TYPES: ReadonlySet<EntityType> = new Set([
   EntityType.WALL_HUGGER,
 ]);
@@ -80,6 +73,22 @@ const GRID_ENTITY_XML_TYPE_SET: ReadonlySet<number> = new Set(
   gridEntityXMLTypes,
 );
 
+const EMPTY_ROOM_BLACKLIST_ENTITY_SET: ReadonlySet<EntityType> = new Set([
+  EntityType.PLAYER, // 1
+  EntityType.TEAR, // 2
+  EntityType.FAMILIAR, // 3
+  EntityType.LASER, // 7
+  EntityType.KNIFE, // 8
+  EntityType.PROJECTILE, // 9
+  EntityType.DARK_ESAU, // 866
+]);
+
+const EMPTY_ROOM_BLACKLIST_GRID_ENTITY_SET: ReadonlySet<GridEntityType> =
+  new Set([
+    GridEntityType.WALL, // 15
+    GridEntityType.DOOR, // 16
+  ]);
+
 const v = {
   level: {
     deployedRoomListIndexes: new Set<int>(),
@@ -348,21 +357,10 @@ export function emptyRoom(fillWithDecorations: boolean): void {
   errorIfFeaturesNotInitialized(FEATURE_NAME);
 
   const roomListIndex = getRoomListIndex();
-
   v.level.deployedRoomListIndexes.add(roomListIndex);
 
-  removeAllBombs(); // 4
-  removeAllPickups(); // 5
-  removeAllMatchingEntities(EntityType.SLOT); // 6
-  removeSpecificNPCs();
-  removeAllMatchingEntities(EntityType.EFFECT, EffectVariant.DEVIL);
-  removeAllMatchingEntities(EntityType.EFFECT, EffectVariant.ANGEL);
-
-  removeAllGridEntitiesExcept(
-    GridEntityType.WALL, // 15
-    GridEntityType.DOOR, // 16
-  );
-
+  emptyRoomEntities();
+  emptyRoomGridEntities();
   setRoomCleared();
 
   if (fillWithDecorations) {
@@ -371,38 +369,54 @@ export function emptyRoom(fillWithDecorations: boolean): void {
 }
 
 /**
- * We remove entities in the `POST_NEW_ROOM` callback instead of in the PreRoomEntitySpawn callback
- * so that they will not re-appear when we re-enter the room.
+ * We remove entities in the `POST_NEW_ROOM` callback instead of in the `PRE_ROOM_ENTITY_SPAWN`
+ * callback so that they will not re-appear when we re-enter the room.
  */
-function removeSpecificNPCs() {
+function emptyRoomEntities() {
   const room = game.GetRoom();
 
-  for (const npc of getNPCs()) {
-    if (NPC_TYPES_TO_NOT_REMOVE.has(npc.Type)) {
+  for (const entity of getEntities()) {
+    if (EMPTY_ROOM_BLACKLIST_ENTITY_SET.has(entity.Type)) {
       continue;
     }
 
     if (
-      npc.HasEntityFlags(EntityFlag.CHARM) ||
-      npc.HasEntityFlags(EntityFlag.FRIENDLY) ||
-      npc.HasEntityFlags(EntityFlag.PERSISTENT)
+      entity.HasEntityFlags(EntityFlag.CHARM) ||
+      entity.HasEntityFlags(EntityFlag.FRIENDLY) ||
+      entity.HasEntityFlags(EntityFlag.PERSISTENT)
     ) {
       continue;
     }
 
-    npc.ClearEntityFlags(EntityFlag.APPEAR);
-    npc.Remove();
+    entity.ClearEntityFlags(EntityFlag.APPEAR);
+    entity.Remove();
 
     // When fire places are removed, they will leave behind a "path" that will prevent future grid
     // entities from being spawned on the same tile. Thus, reset the path for this tile if this is a
     // fire place.
-    if (npc.Type === EntityType.FIREPLACE) {
-      const gridIndex = room.GetGridIndex(npc.Position);
+    if (entity.Type === EntityType.FIREPLACE) {
+      const gridIndex = room.GetGridIndex(entity.Position);
       room.SetGridPath(gridIndex, 0);
     }
   }
 }
 
+function emptyRoomGridEntities() {
+  let removedOneOrMoreGridEntities = false;
+  for (const gridEntity of getGridEntities()) {
+    const gridEntityType = gridEntity.GetType();
+    if (EMPTY_ROOM_BLACKLIST_GRID_ENTITY_SET.has(gridEntityType)) {
+      continue;
+    }
+
+    removeGridEntity(gridEntity, false);
+    removedOneOrMoreGridEntities = true;
+  }
+  if (removedOneOrMoreGridEntities) {
+    roomUpdateSafe();
+  }
+}
+
 /**
  * We removed most normal entities, which should prevent them from respawning when the player
  * re-enters the room. However, this is not the case for grid entities; even if they are removed,