isaacscript-common 12.5.2 → 12.6.1

package/dist/index.d.ts

@@ -1779,7 +1779,7 @@ export declare function deployJSONRoom(jsonRoom: JSONRoom | Readonly<JSONRoom>,
  * @param verbose Optional. If specified, will write entries to the "log.txt" file that describe
  *                what the function is doing. Default is false.
  */
-export declare function deployRandomJSONRoom(jsonRooms: JSONRoom[] | readonly JSONRoom[], seedOrRNG?: Seed | RNG, verbose?: boolean): void;
+export declare function deployRandomJSONRoom(jsonRooms: JSONRoom[], seedOrRNG?: Seed | RNG, verbose?: boolean): void;
 
 /**
  * Helper function to convert a `SerializedBitSet128` object to a normal `BitSet128` object. (This
@@ -4527,6 +4527,21 @@ export declare function getRandomFromWeightedArray<T>(weightedArray: WeightedArr
  */
 export declare function getRandomInt(min: int, max: int, seedOrRNG?: Seed | RNG, exceptions?: int[] | readonly int[]): int;
 
+/**
+ * Helper function to get a random JSON entity from an array of JSON entities.
+ *
+ * Note that this function does not simply choose a random element in the provided array; it will
+ * properly account for each room weight using the algorithm from:
+ * https://stackoverflow.com/questions/1761626/weighted-random-numbers
+ *
+ * @param jsonEntities The array of entities to randomly choose between.
+ * @param seedOrRNG Optional. The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
+ *                  `RNG.Next` method will be called. Default is `getRandomSeed()`.
+ * @param verbose Optional. If specified, will write entries to the "log.txt" file that describe
+ *                what the function is doing. Default is false.
+ */
+export declare function getRandomJSONEntity(jsonEntities: JSONEntity[], seedOrRNG?: Seed | RNG, verbose?: boolean): JSONEntity;
+
 /**
  * Helper function to get a random JSON room from an array of JSON rooms.
  *
@@ -4534,13 +4549,13 @@ export declare function getRandomInt(min: int, max: int, seedOrRNG?: Seed | RNG,
  * properly account for each room weight using the algorithm from:
  * https://stackoverflow.com/questions/1761626/weighted-random-numbers
  *
- * @param jsonRooms The array of rooms to random choose between.
+ * @param jsonRooms The array of rooms to randomly choose between.
  * @param seedOrRNG Optional. The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
  *                  `RNG.Next` method will be called. Default is `getRandomSeed()`.
  * @param verbose Optional. If specified, will write entries to the "log.txt" file that describe
  *                what the function is doing. Default is false.
  */
-export declare function getRandomJSONRoom(jsonRooms: JSONRoom[] | readonly JSONRoom[], seedOrRNG?: Seed | RNG, verbose?: boolean): JSONRoom;
+export declare function getRandomJSONRoom(jsonRooms: JSONRoom[], seedOrRNG?: Seed | RNG, verbose?: boolean): JSONRoom;
 
 /**
  * Helper function to get a random color.

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 12.5.2
+isaacscript-common 12.6.1
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -19235,6 +19235,7 @@ local RockVariant = ____isaac_2Dtypescript_2Ddefinitions.RockVariant
 local StatueVariant = ____isaac_2Dtypescript_2Ddefinitions.StatueVariant
 local TrapdoorVariant = ____isaac_2Dtypescript_2Ddefinitions.TrapdoorVariant
 ____exports.GRID_ENTITY_XML_MAP = __TS__New(Map, {
+    {GridEntityXMLType.DECORATION, {GridEntityType.DECORATION, 0}},
     {GridEntityXMLType.ROCK, {GridEntityType.ROCK, RockVariant.NORMAL}},
     {GridEntityXMLType.ROCK_BOMB, {GridEntityType.ROCK_BOMB, 0}},
     {GridEntityXMLType.ROCK_ALT, {GridEntityType.ROCK_ALT, 0}},
@@ -40810,7 +40811,7 @@ local ____lualib = require("lualib_bundle")
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local ____exports = {}
-local getTotalWeightOfJSONRooms, getJSONRoomWithChosenWeight
+local getTotalWeightOfJSONObject, getJSONObjectWithChosenWeight
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.src.index")
 local DoorSlotFlagZero = ____isaac_2Dtypescript_2Ddefinitions.DoorSlotFlagZero
 local ____array = require("src.functions.array")
@@ -40826,33 +40827,34 @@ local ____random = require("src.functions.random")
 local getRandomFloat = ____random.getRandomFloat
 local ____rng = require("src.functions.rng")
 local getRandomSeed = ____rng.getRandomSeed
-function getTotalWeightOfJSONRooms(self, jsonRooms)
+function getTotalWeightOfJSONObject(self, jsonOjectArray)
     local weights = __TS__ArrayMap(
-        jsonRooms,
-        function(____, jsonRoom)
-            local roomWeightString = jsonRoom["$"].weight
-            local roomWeight = tonumber(roomWeightString)
-            if roomWeight == nil then
-                error(("Failed to parse the weight of a JSON room: " .. roomWeightString) .. ".")
+        jsonOjectArray,
+        function(____, jsonObject)
+            local weightString = jsonObject["$"].weight
+            local weight = tonumber(weightString)
+            if weight == nil then
+                error(("Failed to parse the weight of a JSON object: " .. tostring(weightString)) .. ".")
             end
-            return roomWeight
+            return weight
         end
     )
     return sumArray(nil, weights)
 end
-function getJSONRoomWithChosenWeight(self, jsonRooms, chosenWeight)
-    for ____, jsonRoom in ipairs(jsonRooms) do
-        local roomWeightString = jsonRoom["$"].weight
-        local roomWeight = tonumber(roomWeightString)
-        if roomWeight == nil then
-            error("Failed to parse the weight of a JSON room: " .. roomWeightString)
+function getJSONObjectWithChosenWeight(self, jsonOjectArray, chosenWeight)
+    local weightAccumulator = 0
+    for ____, jsonObject in ipairs(jsonOjectArray) do
+        local weightString = jsonObject["$"].weight
+        local weight = tonumber(weightString)
+        if weight == nil then
+            error("Failed to parse the weight of a JSON object: " .. tostring(weightString))
         end
-        if chosenWeight < roomWeight then
-            return jsonRoom
+        weightAccumulator = weightAccumulator + weight
+        if weightAccumulator >= chosenWeight then
+            return jsonObject
         end
-        chosenWeight = chosenWeight - roomWeight
     end
-    error("Failed to get a JSON room with chosen weight: " .. tostring(chosenWeight))
+    return nil
 end
 function ____exports.getJSONRoomDoorSlotFlags(self, jsonRoom)
     local roomShapeString = jsonRoom["$"].shape
@@ -40919,6 +40921,33 @@ function ____exports.getJSONRoomsOfSubType(self, jsonRooms, subType)
         end
     )
 end
+function ____exports.getRandomJSONEntity(self, jsonEntities, seedOrRNG, verbose)
+    if seedOrRNG == nil then
+        seedOrRNG = getRandomSeed(nil)
+    end
+    if verbose == nil then
+        verbose = false
+    end
+    local totalWeight = getTotalWeightOfJSONObject(nil, jsonEntities)
+    if verbose then
+        log(
+            nil,
+            "Total weight of the JSON entities provided: " .. tostring(totalWeight)
+        )
+    end
+    local chosenWeight = getRandomFloat(nil, 0, totalWeight, seedOrRNG)
+    if verbose then
+        log(
+            nil,
+            "Randomly chose weight for JSON entity: " .. tostring(chosenWeight)
+        )
+    end
+    local randomJSONEntity = getJSONObjectWithChosenWeight(nil, jsonEntities, chosenWeight)
+    if randomJSONEntity == nil then
+        error("Failed to get a JSON entity with chosen weight: " .. tostring(chosenWeight))
+    end
+    return randomJSONEntity
+end
 function ____exports.getRandomJSONRoom(self, jsonRooms, seedOrRNG, verbose)
     if seedOrRNG == nil then
         seedOrRNG = getRandomSeed(nil)
@@ -40926,7 +40955,7 @@ function ____exports.getRandomJSONRoom(self, jsonRooms, seedOrRNG, verbose)
     if verbose == nil then
         verbose = false
     end
-    local totalWeight = getTotalWeightOfJSONRooms(nil, jsonRooms)
+    local totalWeight = getTotalWeightOfJSONObject(nil, jsonRooms)
     if verbose then
         log(
             nil,
@@ -40940,7 +40969,11 @@ function ____exports.getRandomJSONRoom(self, jsonRooms, seedOrRNG, verbose)
             "Randomly chose weight for JSON room: " .. tostring(chosenWeight)
         )
     end
-    return getJSONRoomWithChosenWeight(nil, jsonRooms, chosenWeight)
+    local randomJSONRoom = getJSONObjectWithChosenWeight(nil, jsonRooms, chosenWeight)
+    if randomJSONRoom == nil then
+        error("Failed to get a JSON room with chosen weight: " .. tostring(chosenWeight))
+    end
+    return randomJSONRoom
 end
 return ____exports
  end,
@@ -41254,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
@@ -41279,25 +41311,21 @@ 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
 local ____jsonRoom = require("src.functions.jsonRoom")
+local getRandomJSONEntity = ____jsonRoom.getRandomJSONEntity
 local getRandomJSONRoom = ____jsonRoom.getRandomJSONRoom
 local ____log = require("src.functions.log")
 local log = ____log.log
@@ -41310,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")
@@ -41396,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)
@@ -41436,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)
@@ -41445,7 +41486,7 @@ function fillRoomWithDecorations(self)
             end
             decorationGridIndexes[#decorationGridIndexes + 1] = gridIndex
         end
-        ::__continue39::
+        ::__continue44::
     end
 end
 function spawnAllEntities(self, jsonRoom, rng, verbose)
@@ -41464,24 +41505,18 @@ function spawnAllEntities(self, jsonRoom, rng, verbose)
         if y == nil then
             error("Failed to convert the following y coordinate to a number (for a spawn): " .. yString)
         end
-        if #jsonSpawn.entity > 1 then
-            error("Stacked entities are not implemented for JSON rooms.")
-        end
-        local firstXMLEntity = jsonSpawn.entity[1]
-        if firstXMLEntity == nil then
-            error("Failed to get the first JSON entity from an \"entity\" array.")
-        end
-        local entityTypeString = firstXMLEntity["$"].type
+        local jsonEntity = getRandomJSONEntity(nil, jsonSpawn.entity)
+        local entityTypeString = jsonEntity["$"].type
         local entityTypeNumber = tonumber(entityTypeString)
         if entityTypeNumber == nil then
             error("Failed to convert the entity type to a number: " .. entityTypeString)
         end
-        local variantString = firstXMLEntity["$"].variant
+        local variantString = jsonEntity["$"].variant
         local variant = tonumber(variantString)
         if variant == nil then
             error("Failed to convert the entity variant to a number: " .. tostring(variant))
         end
-        local subTypeString = firstXMLEntity["$"].subtype
+        local subTypeString = jsonEntity["$"].subtype
         local subType = tonumber(subTypeString)
         if subType == nil then
             error("Failed to convert the entity sub-type to a number: " .. tostring(subType))
@@ -41709,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

@@ -62,7 +62,7 @@ export declare function deployJSONRoom(jsonRoom: JSONRoom | Readonly<JSONRoom>,
  * @param verbose Optional. If specified, will write entries to the "log.txt" file that describe
  *                what the function is doing. Default is false.
  */
-export declare function deployRandomJSONRoom(jsonRooms: JSONRoom[] | readonly JSONRoom[], seedOrRNG?: Seed | RNG, verbose?: boolean): void;
+export declare function deployRandomJSONRoom(jsonRooms: JSONRoom[], seedOrRNG?: Seed | RNG, verbose?: boolean): void;
 /**
  * Helper function to remove all naturally spawning entities and grid entities from a room. Notably,
  * this will not remove players (1), tears (2), familiars (3), lasers (7), knives (8), projectiles

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,GAAG,SAAS,QAAQ,EAAE,EAC3C,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,25 +28,21 @@ 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
 local ____jsonRoom = require("src.functions.jsonRoom")
+local getRandomJSONEntity = ____jsonRoom.getRandomJSONEntity
 local getRandomJSONRoom = ____jsonRoom.getRandomJSONRoom
 local ____log = require("src.functions.log")
 local log = ____log.log
@@ -60,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")
@@ -154,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)
@@ -194,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)
@@ -203,7 +211,7 @@ function fillRoomWithDecorations(self)
             end
             decorationGridIndexes[#decorationGridIndexes + 1] = gridIndex
         end
-        ::__continue39::
+        ::__continue44::
     end
 end
 function spawnAllEntities(self, jsonRoom, rng, verbose)
@@ -222,24 +230,18 @@ function spawnAllEntities(self, jsonRoom, rng, verbose)
         if y == nil then
             error("Failed to convert the following y coordinate to a number (for a spawn): " .. yString)
         end
-        if #jsonSpawn.entity > 1 then
-            error("Stacked entities are not implemented for JSON rooms.")
-        end
-        local firstXMLEntity = jsonSpawn.entity[1]
-        if firstXMLEntity == nil then
-            error("Failed to get the first JSON entity from an \"entity\" array.")
-        end
-        local entityTypeString = firstXMLEntity["$"].type
+        local jsonEntity = getRandomJSONEntity(nil, jsonSpawn.entity)
+        local entityTypeString = jsonEntity["$"].type
         local entityTypeNumber = tonumber(entityTypeString)
         if entityTypeNumber == nil then
             error("Failed to convert the entity type to a number: " .. entityTypeString)
         end
-        local variantString = firstXMLEntity["$"].variant
+        local variantString = jsonEntity["$"].variant
         local variant = tonumber(variantString)
         if variant == nil then
             error("Failed to convert the entity variant to a number: " .. tostring(variant))
         end
-        local subTypeString = firstXMLEntity["$"].subtype
+        local subTypeString = jsonEntity["$"].subtype
         local subType = tonumber(subTypeString)
         if subType == nil then
             error("Failed to convert the entity sub-type to a number: " .. tostring(subType))
@@ -467,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/dist/src/functions/jsonRoom.d.ts

@@ -1,5 +1,5 @@
 import { DoorSlotFlag } from "isaac-typescript-definitions";
-import { JSONRoom } from "../interfaces/JSONRoomsFile";
+import { JSONEntity, JSONRoom } from "../interfaces/JSONRoomsFile";
 /**
  * Helper function to calculate what the resulting `BitFlags<DoorSlotFlag>` value would be for a
  * given JSON room.
@@ -20,6 +20,20 @@ export declare function getJSONRoomOfVariant(jsonRooms: JSONRoom[] | readonly JS
  * @param subType The sub-type to match.
  */
 export declare function getJSONRoomsOfSubType(jsonRooms: JSONRoom[] | readonly JSONRoom[], subType: int): JSONRoom[];
+/**
+ * Helper function to get a random JSON entity from an array of JSON entities.
+ *
+ * Note that this function does not simply choose a random element in the provided array; it will
+ * properly account for each room weight using the algorithm from:
+ * https://stackoverflow.com/questions/1761626/weighted-random-numbers
+ *
+ * @param jsonEntities The array of entities to randomly choose between.
+ * @param seedOrRNG Optional. The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
+ *                  `RNG.Next` method will be called. Default is `getRandomSeed()`.
+ * @param verbose Optional. If specified, will write entries to the "log.txt" file that describe
+ *                what the function is doing. Default is false.
+ */
+export declare function getRandomJSONEntity(jsonEntities: JSONEntity[], seedOrRNG?: Seed | RNG, verbose?: boolean): JSONEntity;
 /**
  * Helper function to get a random JSON room from an array of JSON rooms.
  *
@@ -27,11 +41,11 @@ export declare function getJSONRoomsOfSubType(jsonRooms: JSONRoom[] | readonly J
  * properly account for each room weight using the algorithm from:
  * https://stackoverflow.com/questions/1761626/weighted-random-numbers
  *
- * @param jsonRooms The array of rooms to random choose between.
+ * @param jsonRooms The array of rooms to randomly choose between.
  * @param seedOrRNG Optional. The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
  *                  `RNG.Next` method will be called. Default is `getRandomSeed()`.
  * @param verbose Optional. If specified, will write entries to the "log.txt" file that describe
  *                what the function is doing. Default is false.
  */
-export declare function getRandomJSONRoom(jsonRooms: JSONRoom[] | readonly JSONRoom[], seedOrRNG?: Seed | RNG, verbose?: boolean): JSONRoom;
+export declare function getRandomJSONRoom(jsonRooms: JSONRoom[], seedOrRNG?: Seed | RNG, verbose?: boolean): JSONRoom;
 //# sourceMappingURL=jsonRoom.d.ts.map

package/dist/src/functions/jsonRoom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonRoom.d.ts","sourceRoot":"","sources":["../../../src/functions/jsonRoom.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAQvD;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,GACjB,QAAQ,CAAC,YAAY,CAAC,CAgDxB;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,QAAQ,EAAE,EAC3C,OAAO,EAAE,GAAG,GACX,QAAQ,GAAG,SAAS,CAoBtB;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,QAAQ,EAAE,EAC3C,OAAO,EAAE,GAAG,GACX,QAAQ,EAAE,CAMZ;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,QAAQ,EAAE,EAC3C,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,OAAO,UAAQ,GACd,QAAQ,CAYV"}
+{"version":3,"file":"jsonRoom.d.ts","sourceRoot":"","sources":["../../../src/functions/jsonRoom.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAanE;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,GACjB,QAAQ,CAAC,YAAY,CAAC,CAgDxB;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,QAAQ,EAAE,EAC3C,OAAO,EAAE,GAAG,GACX,QAAQ,GAAG,SAAS,CAoBtB;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,QAAQ,EAAE,EAC3C,OAAO,EAAE,GAAG,GACX,QAAQ,EAAE,CAMZ;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,UAAU,EAAE,EAC1B,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,OAAO,UAAQ,GACd,UAAU,CAoBZ;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,QAAQ,EAAE,EACrB,SAAS,GAAE,IAAI,GAAG,GAAqB,EACvC,OAAO,UAAQ,GACd,QAAQ,CAiBV"}

package/dist/src/functions/jsonRoom.lua

@@ -2,7 +2,7 @@ local ____lualib = require("lualib_bundle")
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local ____exports = {}
-local getTotalWeightOfJSONRooms, getJSONRoomWithChosenWeight
+local getTotalWeightOfJSONObject, getJSONObjectWithChosenWeight
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local DoorSlotFlagZero = ____isaac_2Dtypescript_2Ddefinitions.DoorSlotFlagZero
 local ____array = require("src.functions.array")
@@ -18,33 +18,34 @@ local ____random = require("src.functions.random")
 local getRandomFloat = ____random.getRandomFloat
 local ____rng = require("src.functions.rng")
 local getRandomSeed = ____rng.getRandomSeed
-function getTotalWeightOfJSONRooms(self, jsonRooms)
+function getTotalWeightOfJSONObject(self, jsonOjectArray)
     local weights = __TS__ArrayMap(
-        jsonRooms,
-        function(____, jsonRoom)
-            local roomWeightString = jsonRoom["$"].weight
-            local roomWeight = tonumber(roomWeightString)
-            if roomWeight == nil then
-                error(("Failed to parse the weight of a JSON room: " .. roomWeightString) .. ".")
+        jsonOjectArray,
+        function(____, jsonObject)
+            local weightString = jsonObject["$"].weight
+            local weight = tonumber(weightString)
+            if weight == nil then
+                error(("Failed to parse the weight of a JSON object: " .. tostring(weightString)) .. ".")
             end
-            return roomWeight
+            return weight
         end
     )
     return sumArray(nil, weights)
 end
-function getJSONRoomWithChosenWeight(self, jsonRooms, chosenWeight)
-    for ____, jsonRoom in ipairs(jsonRooms) do
-        local roomWeightString = jsonRoom["$"].weight
-        local roomWeight = tonumber(roomWeightString)
-        if roomWeight == nil then
-            error("Failed to parse the weight of a JSON room: " .. roomWeightString)
+function getJSONObjectWithChosenWeight(self, jsonOjectArray, chosenWeight)
+    local weightAccumulator = 0
+    for ____, jsonObject in ipairs(jsonOjectArray) do
+        local weightString = jsonObject["$"].weight
+        local weight = tonumber(weightString)
+        if weight == nil then
+            error("Failed to parse the weight of a JSON object: " .. tostring(weightString))
         end
-        if chosenWeight < roomWeight then
-            return jsonRoom
+        weightAccumulator = weightAccumulator + weight
+        if weightAccumulator >= chosenWeight then
+            return jsonObject
         end
-        chosenWeight = chosenWeight - roomWeight
     end
-    error("Failed to get a JSON room with chosen weight: " .. tostring(chosenWeight))
+    return nil
 end
 --- Helper function to calculate what the resulting `BitFlags<DoorSlotFlag>` value would be for a
 -- given JSON room.
@@ -122,13 +123,51 @@ function ____exports.getJSONRoomsOfSubType(self, jsonRooms, subType)
         end
     )
 end
+--- Helper function to get a random JSON entity from an array of JSON entities.
+-- 
+-- Note that this function does not simply choose a random element in the provided array; it will
+-- properly account for each room weight using the algorithm from:
+-- https://stackoverflow.com/questions/1761626/weighted-random-numbers
+-- 
+-- @param jsonEntities The array of entities to randomly choose between.
+-- @param seedOrRNG Optional. The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
+-- `RNG.Next` method will be called. Default is `getRandomSeed()`.
+-- @param verbose Optional. If specified, will write entries to the "log.txt" file that describe
+-- what the function is doing. Default is false.
+function ____exports.getRandomJSONEntity(self, jsonEntities, seedOrRNG, verbose)
+    if seedOrRNG == nil then
+        seedOrRNG = getRandomSeed(nil)
+    end
+    if verbose == nil then
+        verbose = false
+    end
+    local totalWeight = getTotalWeightOfJSONObject(nil, jsonEntities)
+    if verbose then
+        log(
+            nil,
+            "Total weight of the JSON entities provided: " .. tostring(totalWeight)
+        )
+    end
+    local chosenWeight = getRandomFloat(nil, 0, totalWeight, seedOrRNG)
+    if verbose then
+        log(
+            nil,
+            "Randomly chose weight for JSON entity: " .. tostring(chosenWeight)
+        )
+    end
+    local randomJSONEntity = getJSONObjectWithChosenWeight(nil, jsonEntities, chosenWeight)
+    if randomJSONEntity == nil then
+        error("Failed to get a JSON entity with chosen weight: " .. tostring(chosenWeight))
+    end
+    return randomJSONEntity
+end
 --- Helper function to get a random JSON room from an array of JSON rooms.
 -- 
 -- Note that this function does not simply choose a random element in the provided array; it will
 -- properly account for each room weight using the algorithm from:
 -- https://stackoverflow.com/questions/1761626/weighted-random-numbers
 -- 
--- @param jsonRooms The array of rooms to random choose between.
+-- @param jsonRooms The array of rooms to randomly choose between.
 -- @param seedOrRNG Optional. The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
 -- `RNG.Next` method will be called. Default is `getRandomSeed()`.
 -- @param verbose Optional. If specified, will write entries to the "log.txt" file that describe
@@ -140,7 +179,7 @@ function ____exports.getRandomJSONRoom(self, jsonRooms, seedOrRNG, verbose)
     if verbose == nil then
         verbose = false
     end
-    local totalWeight = getTotalWeightOfJSONRooms(nil, jsonRooms)
+    local totalWeight = getTotalWeightOfJSONObject(nil, jsonRooms)
     if verbose then
         log(
             nil,
@@ -154,6 +193,10 @@ function ____exports.getRandomJSONRoom(self, jsonRooms, seedOrRNG, verbose)
             "Randomly chose weight for JSON room: " .. tostring(chosenWeight)
         )
     end
-    return getJSONRoomWithChosenWeight(nil, jsonRooms, chosenWeight)
+    local randomJSONRoom = getJSONObjectWithChosenWeight(nil, jsonRooms, chosenWeight)
+    if randomJSONRoom == nil then
+        error("Failed to get a JSON room with chosen weight: " .. tostring(chosenWeight))
+    end
+    return randomJSONRoom
 end
 return ____exports

package/dist/src/maps/gridEntityXMLMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gridEntityXMLMap.d.ts","sourceRoot":"","sources":["../../../src/maps/gridEntityXMLMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,iBAAiB,EAOlB,MAAM,8BAA8B,CAAC;AAEtC;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAC3C,iBAAiB,EACjB;IAAC,cAAc;IAAE,GAAG;CAAC,CA6JrB,CAAC"}
+{"version":3,"file":"gridEntityXMLMap.d.ts","sourceRoot":"","sources":["../../../src/maps/gridEntityXMLMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,iBAAiB,EAOlB,MAAM,8BAA8B,CAAC;AAEtC;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAC3C,iBAAiB,EACjB;IAAC,cAAc;IAAE,GAAG;CAAC,CAgKrB,CAAC"}

package/dist/src/maps/gridEntityXMLMap.lua

@@ -15,6 +15,7 @@ local TrapdoorVariant = ____isaac_2Dtypescript_2Ddefinitions.TrapdoorVariant
 --- This maps the GridEntityXMLType (i.e. the type contained in the room XML/STB file) to the
 -- GridEntityType and the variant used by the game.
 ____exports.GRID_ENTITY_XML_MAP = __TS__New(Map, {
+    {GridEntityXMLType.DECORATION, {GridEntityType.DECORATION, 0}},
     {GridEntityXMLType.ROCK, {GridEntityType.ROCK, RockVariant.NORMAL}},
     {GridEntityXMLType.ROCK_BOMB, {GridEntityType.ROCK_BOMB, 0}},
     {GridEntityXMLType.ROCK_ALT, {GridEntityType.ROCK_ALT, 0}},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "12.5.2",
+  "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,32 +25,30 @@ 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,
 } from "../functions/gridEntities";
-import { getRandomJSONRoom } from "../functions/jsonRoom";
+import { getRandomJSONEntity, getRandomJSONRoom } from "../functions/jsonRoom";
 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>(),
@@ -316,7 +325,7 @@ export function deployJSONRoom(
  *                what the function is doing. Default is false.
  */
 export function deployRandomJSONRoom(
-  jsonRooms: JSONRoom[] | readonly JSONRoom[],
+  jsonRooms: JSONRoom[],
   seedOrRNG: Seed | RNG = getRandomSeed(),
   verbose = false,
 ): void {
@@ -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,
@@ -469,16 +483,9 @@ function spawnAllEntities(
       );
     }
 
-    if (jsonSpawn.entity.length > 1) {
-      error("Stacked entities are not implemented for JSON rooms.");
-    }
-
-    const firstXMLEntity = jsonSpawn.entity[0];
-    if (firstXMLEntity === undefined) {
-      error('Failed to get the first JSON entity from an "entity" array.');
-    }
+    const jsonEntity = getRandomJSONEntity(jsonSpawn.entity);
 
-    const entityTypeString = firstXMLEntity.$.type;
+    const entityTypeString = jsonEntity.$.type;
     const entityTypeNumber = tonumber(entityTypeString);
     if (entityTypeNumber === undefined) {
       error(
@@ -486,13 +493,13 @@ function spawnAllEntities(
       );
     }
 
-    const variantString = firstXMLEntity.$.variant;
+    const variantString = jsonEntity.$.variant;
     const variant = tonumber(variantString);
     if (variant === undefined) {
       error(`Failed to convert the entity variant to a number: ${variant}`);
     }
 
-    const subTypeString = firstXMLEntity.$.subtype;
+    const subTypeString = jsonEntity.$.subtype;
     const subType = tonumber(subTypeString);
     if (subType === undefined) {
       error(`Failed to convert the entity sub-type to a number: ${subType}`);

package/src/functions/jsonRoom.ts

@@ -3,7 +3,7 @@ import {
   DoorSlotFlagZero,
   RoomShape,
 } from "isaac-typescript-definitions";
-import { JSONRoom } from "../interfaces/JSONRoomsFile";
+import { JSONEntity, JSONRoom } from "../interfaces/JSONRoomsFile";
 import { sumArray } from "./array";
 import { doorSlotToDoorSlotFlag, getRoomShapeDoorSlot } from "./doors";
 import { addFlag } from "./flag";
@@ -11,6 +11,11 @@ import { log } from "./log";
 import { getRandomFloat } from "./random";
 import { getRandomSeed } from "./rng";
 
+/** This represents either a `JSONRoom` or a `JSONEntity`. */
+interface JSONObject {
+  $: { weight: string | undefined };
+}
+
 /**
  * Helper function to calculate what the resulting `BitFlags<DoorSlotFlag>` value would be for a
  * given JSON room.
@@ -116,6 +121,45 @@ export function getJSONRoomsOfSubType(
   });
 }
 
+/**
+ * Helper function to get a random JSON entity from an array of JSON entities.
+ *
+ * Note that this function does not simply choose a random element in the provided array; it will
+ * properly account for each room weight using the algorithm from:
+ * https://stackoverflow.com/questions/1761626/weighted-random-numbers
+ *
+ * @param jsonEntities The array of entities to randomly choose between.
+ * @param seedOrRNG Optional. The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
+ *                  `RNG.Next` method will be called. Default is `getRandomSeed()`.
+ * @param verbose Optional. If specified, will write entries to the "log.txt" file that describe
+ *                what the function is doing. Default is false.
+ */
+export function getRandomJSONEntity(
+  jsonEntities: JSONEntity[],
+  seedOrRNG: Seed | RNG = getRandomSeed(),
+  verbose = false,
+): JSONEntity {
+  const totalWeight = getTotalWeightOfJSONObject(jsonEntities);
+  if (verbose) {
+    log(`Total weight of the JSON entities provided: ${totalWeight}`);
+  }
+
+  const chosenWeight = getRandomFloat(0, totalWeight, seedOrRNG);
+  if (verbose) {
+    log(`Randomly chose weight for JSON entity: ${chosenWeight}`);
+  }
+
+  const randomJSONEntity = getJSONObjectWithChosenWeight(
+    jsonEntities,
+    chosenWeight,
+  );
+  if (randomJSONEntity === undefined) {
+    error(`Failed to get a JSON entity with chosen weight: ${chosenWeight}`);
+  }
+
+  return randomJSONEntity;
+}
+
 /**
  * Helper function to get a random JSON room from an array of JSON rooms.
  *
@@ -123,18 +167,18 @@ export function getJSONRoomsOfSubType(
  * properly account for each room weight using the algorithm from:
  * https://stackoverflow.com/questions/1761626/weighted-random-numbers
  *
- * @param jsonRooms The array of rooms to random choose between.
+ * @param jsonRooms The array of rooms to randomly choose between.
  * @param seedOrRNG Optional. The `Seed` or `RNG` object to use. If an `RNG` object is provided, the
  *                  `RNG.Next` method will be called. Default is `getRandomSeed()`.
  * @param verbose Optional. If specified, will write entries to the "log.txt" file that describe
  *                what the function is doing. Default is false.
  */
 export function getRandomJSONRoom(
-  jsonRooms: JSONRoom[] | readonly JSONRoom[],
+  jsonRooms: JSONRoom[],
   seedOrRNG: Seed | RNG = getRandomSeed(),
   verbose = false,
 ): JSONRoom {
-  const totalWeight = getTotalWeightOfJSONRooms(jsonRooms);
+  const totalWeight = getTotalWeightOfJSONObject(jsonRooms);
   if (verbose) {
     log(`Total weight of the JSON rooms provided: ${totalWeight}`);
   }
@@ -144,41 +188,46 @@ export function getRandomJSONRoom(
     log(`Randomly chose weight for JSON room: ${chosenWeight}`);
   }
 
-  return getJSONRoomWithChosenWeight(jsonRooms, chosenWeight);
+  const randomJSONRoom = getJSONObjectWithChosenWeight(jsonRooms, chosenWeight);
+  if (randomJSONRoom === undefined) {
+    error(`Failed to get a JSON room with chosen weight: ${chosenWeight}`);
+  }
+
+  return randomJSONRoom;
 }
 
-function getTotalWeightOfJSONRooms(
-  jsonRooms: JSONRoom[] | readonly JSONRoom[],
-): float {
-  const weights = jsonRooms.map((jsonRoom) => {
-    const roomWeightString = jsonRoom.$.weight;
-    const roomWeight = tonumber(roomWeightString);
-    if (roomWeight === undefined) {
-      error(`Failed to parse the weight of a JSON room: ${roomWeightString}.`);
+function getTotalWeightOfJSONObject(jsonOjectArray: JSONObject[]): float {
+  const weights = jsonOjectArray.map((jsonObject) => {
+    const weightString = jsonObject.$.weight;
+    const weight = tonumber(weightString);
+    if (weight === undefined) {
+      error(`Failed to parse the weight of a JSON object: ${weightString}.`);
     }
-    return roomWeight;
+
+    return weight;
   });
 
   return sumArray(weights);
 }
 
-function getJSONRoomWithChosenWeight(
-  jsonRooms: JSONRoom[] | readonly JSONRoom[],
+function getJSONObjectWithChosenWeight<T extends JSONObject>(
+  jsonOjectArray: T[],
   chosenWeight: float,
-): JSONRoom {
-  for (const jsonRoom of jsonRooms) {
-    const roomWeightString = jsonRoom.$.weight;
-    const roomWeight = tonumber(roomWeightString);
-    if (roomWeight === undefined) {
-      error(`Failed to parse the weight of a JSON room: ${roomWeightString}`);
+): T | undefined {
+  let weightAccumulator = 0;
+
+  for (const jsonObject of jsonOjectArray) {
+    const weightString = jsonObject.$.weight;
+    const weight = tonumber(weightString);
+    if (weight === undefined) {
+      error(`Failed to parse the weight of a JSON object: ${weightString}`);
     }
 
-    if (chosenWeight < roomWeight) {
-      return jsonRoom;
+    weightAccumulator += weight;
+    if (weightAccumulator >= chosenWeight) {
+      return jsonObject;
     }
-
-    chosenWeight -= roomWeight;
   }
 
-  error(`Failed to get a JSON room with chosen weight: ${chosenWeight}`);
+  return undefined;
 }

package/src/maps/gridEntityXMLMap.ts

@@ -18,6 +18,9 @@ export const GRID_ENTITY_XML_MAP: ReadonlyMap<
   GridEntityXMLType,
   [GridEntityType, int]
 > = new Map([
+  // 0
+  [GridEntityXMLType.DECORATION, [GridEntityType.DECORATION, 0]],
+
   // 1000
   [GridEntityXMLType.ROCK, [GridEntityType.ROCK, RockVariant.NORMAL]],