isaacscript-common 1.0.467 → 1.0.471

package/dist/features/deployJSONRoom.d.ts

@@ -28,8 +28,8 @@ export declare function deployRandomJSONRoom(jsonRooms: JSONRoom[], seed?: numbe
 /**
  * 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 (9), blacklisted NPCs such as Dark Esau, charmed NPCs, friendly NPCs, and persistent
- * NPCs.
+ * projectiles (9), blacklisted NPCs such as Dark Esau, charmed NPCs, friendly NPCs, persistent
+ * NPCs, most effects (1000), doors, and walls.
  *
  * @param fillWithDecorations Optional. Set to true to fill every grid tile with an invisible
  * decoration, which prevents vanilla entities in the room from respawning the next time that the

package/dist/features/deployJSONRoom.lua

@@ -11,6 +11,7 @@ local removeAllPickups = ____entity.removeAllPickups
 local ____gridEntity = require("functions.gridEntity")
 local convertXMLGridEntityType = ____gridEntity.convertXMLGridEntityType
 local getGridEntities = ____gridEntity.getGridEntities
+local removeAllGridEntitiesExceptFor = ____gridEntity.removeAllGridEntitiesExceptFor
 local setGridEntityInvisible = ____gridEntity.setGridEntityInvisible
 local ____jsonRoom = require("functions.jsonRoom")
 local getRandomJSONRoom = ____jsonRoom.getRandomJSONRoom
@@ -74,6 +75,9 @@ function ____exports.emptyRoom(self, fillWithDecorations)
     removeAllPickups(nil)
     removeAllMatchingEntities(nil, EntityType.ENTITY_SLOT)
     removeSpecificNPCs(nil)
+    removeAllMatchingEntities(nil, EntityType.ENTITY_EFFECT, EffectVariant.DEVIL)
+    removeAllMatchingEntities(nil, EntityType.ENTITY_EFFECT, EffectVariant.ANGEL)
+    removeAllGridEntitiesExceptFor(nil, GridEntityType.GRID_WALL, GridEntityType.GRID_DOOR)
     setRoomCleared(nil)
     if fillWithDecorations then
         fillRoomWithDecorations(nil)
@@ -143,19 +147,23 @@ function spawnAllEntities(self, jsonRoom, seed)
         if y == nil then
             error("Failed to convert the following y coordinate to a number (for a spawn): " .. yString)
         end
-        local entityTypeString = spawn.entity["$"].type
+        if #spawn.entity > 1 then
+            error("Stacked entities are not implemented for JSON rooms.")
+        end
+        local xmlEntity = spawn.entity[1]
+        local entityTypeString = xmlEntity["$"].type
         local entityType = tonumber(entityTypeString)
         if entityType == nil then
             error("Failed to convert the entity type to a number: " .. entityTypeString)
         end
-        local variantString = spawn.entity["$"].variant
+        local variantString = xmlEntity["$"].variant
         local variant = tonumber(variantString)
         if variant == nil then
             error(
                 "Failed to convert the entity variant to a number: " .. tostring(variant)
             )
         end
-        local subTypeString = spawn.entity["$"].subtype
+        local subTypeString = xmlEntity["$"].subtype
         local subType = tonumber(subTypeString)
         if subType == nil then
             error(

package/dist/types/JSONSpawn.d.ts

@@ -6,5 +6,5 @@ export interface JSONSpawn {
         /** Needs to be converted to an int. */
         y: string;
     };
-    entity: JSONEntity;
+    entity: JSONEntity[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.467",
+  "version": "1.0.471",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",