isaacscript-common 1.0.468 → 1.0.472

package/dist/features/deployJSONRoom.d.ts

@@ -29,7 +29,7 @@ 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, persistent
- * NPCs, doors, and walls.
+ * 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

@@ -1,7 +1,7 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 require("lualib_bundle");
 local ____exports = {}
-local postNewRoom, setDecorationsInvisible, respawnPersistentEntities, removeSpecificNPCs, fillRoomWithDecorations, spawnAllEntities, spawnGridEntity, spawnNormalEntity, storePersistentEntity, fixPitGraphics, getPitMap, getPitFrame, FEATURE_NAME, NPCS_TO_NOT_REMOVE, PERSISTENT_ENTITY_TYPES, initialized, v
+local postNewRoom, setDecorationsInvisible, respawnPersistentEntities, removeSpecificNPCs, fillRoomWithDecorations, spawnAllEntities, spawnGridEntity, spawnNormalEntity, storePersistentEntity, fixPitGraphics, getPitMap, getPitFrame, FEATURE_NAME, NPC_TYPES_TO_NOT_REMOVE, PERSISTENT_ENTITY_TYPES, initialized, v
 local ____errors = require("errors")
 local getUpgradeErrorMsg = ____errors.getUpgradeErrorMsg
 local ____entity = require("functions.entity")
@@ -75,6 +75,8 @@ 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
@@ -88,7 +90,7 @@ function removeSpecificNPCs(self)
         getNPCs(nil)
     ) do
         do
-            if NPCS_TO_NOT_REMOVE:has(npc.Type) then
+            if NPC_TYPES_TO_NOT_REMOVE:has(npc.Type) then
                 goto __continue20
             end
             if (npc:HasEntityFlags(EntityFlag.FLAG_CHARM) or npc:HasEntityFlags(EntityFlag.FLAG_FRIENDLY)) or npc:HasEntityFlags(EntityFlag.FLAG_PERSISTENT) then
@@ -145,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(
@@ -344,7 +350,7 @@ function getPitFrame(self, L, R, U, D, UL, UR, DL, DR)
     return F
 end
 FEATURE_NAME = "JSON room deployer"
-NPCS_TO_NOT_REMOVE = __TS__New(Set, {EntityType.ENTITY_DARK_ESAU})
+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 = {

package/dist/functions/jsonRoom.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="isaac-typescript-definitions" />
 import { JSONRoom } from "../types/JSONRoom";
-export declare function getJSONRoomOfVariant(jsonRooms: JSONRoom[], variant: int): JSONRoom | null;
+export declare function getJSONRoomOfVariant(jsonRooms: JSONRoom[], variant: int): JSONRoom | undefined;
 export declare function getJSONRoomsOfSubType(jsonRooms: JSONRoom[], subType: int): JSONRoom[];
 export declare function getRandomJSONRoom(jsonRooms: JSONRoom[], seed?: number): JSONRoom;

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.468",
+  "version": "1.0.472",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",