isaacscript-common 1.2.30 → 1.2.31

package/dist/callbacks/postNewRoomEarly.lua

@@ -29,6 +29,9 @@ function checkRoomChanged(self)
     local topLeftWall = room:GetGridEntity(topLeftWallGridIndex)
     if topLeftWall == nil then
         topLeftWall = spawnGridEntity(nil, GridEntityType.GRID_WALL, topLeftWallGridIndex)
+        if topLeftWall == nil then
+            return
+        end
     end
     local topLeftWallPtrHash = GetPtrHash(topLeftWall)
     if topLeftWallPtrHash ~= currentRoomTopLeftWallPtrHash then

package/dist/features/deployJSONRoom.lua

@@ -6,7 +6,7 @@ local Map = ____lualib.Map
 local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
-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 postNewRoom, setDecorationsInvisible, respawnPersistentEntities, removeSpecificNPCs, fillRoomWithDecorations, spawnAllEntities, spawnGridEntityForJSONRoom, spawnNormalEntityForJSONRoom, 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")
@@ -18,6 +18,7 @@ local convertXMLGridEntityType = ____gridEntity.convertXMLGridEntityType
 local getGridEntities = ____gridEntity.getGridEntities
 local removeAllGridEntitiesExceptFor = ____gridEntity.removeAllGridEntitiesExceptFor
 local setGridEntityInvisible = ____gridEntity.setGridEntityInvisible
+local spawnGridEntityWithVariant = ____gridEntity.spawnGridEntityWithVariant
 local ____jsonRoom = require("functions.jsonRoom")
 local getRandomJSONRoom = ____jsonRoom.getRandomJSONRoom
 local ____log = require("functions.log")
@@ -138,7 +139,9 @@ function fillRoomWithDecorations(self)
                 end
                 local position = room:GetGridPosition(gridIndex)
                 local decoration = Isaac.GridSpawn(GridEntityType.GRID_DECORATION, 0, position, true)
-                setGridEntityInvisible(nil, decoration)
+                if decoration ~= nil then
+                    setGridEntityInvisible(nil, decoration)
+                end
                 __TS__ArrayPush(decorationGridIndexes, gridIndex)
             end
             ::__continue34::
@@ -185,7 +188,7 @@ function spawnAllEntities(self, jsonRoom, seed, verbose)
             if verbose then
                 log(((((((("Spawning grid entity " .. tostring(entityType)) .. ".") .. tostring(variant)) .. " at: (") .. tostring(x)) .. ", ") .. tostring(y)) .. ")")
             end
-            spawnGridEntity(
+            spawnGridEntityForJSONRoom(
                 nil,
                 entityType,
                 variant,
@@ -197,7 +200,7 @@ function spawnAllEntities(self, jsonRoom, seed, verbose)
             if verbose then
                 log(((((((((("Spawning normal entity " .. tostring(entityType)) .. ".") .. tostring(variant)) .. ".") .. tostring(subType)) .. " at: (") .. tostring(x)) .. ", ") .. tostring(y)) .. ")")
             end
-            local entity = spawnNormalEntity(
+            local entity = spawnNormalEntityForJSONRoom(
                 nil,
                 entityType,
                 variant,
@@ -222,28 +225,28 @@ function spawnAllEntities(self, jsonRoom, seed, verbose)
     end
     return seed
 end
-function spawnGridEntity(self, xmlEntityType, xmlEntityVariant, x, y)
-    local gridEntityArray = convertXMLGridEntityType(nil, xmlEntityType, xmlEntityVariant)
-    if gridEntityArray == nil then
+function spawnGridEntityForJSONRoom(self, xmlEntityType, xmlEntityVariant, x, y)
+    local game = Game()
+    local room = game:GetRoom()
+    local gridEntityTuple = convertXMLGridEntityType(nil, xmlEntityType, xmlEntityVariant)
+    if gridEntityTuple == nil then
         return nil
     end
-    local entityType, variant = table.unpack(gridEntityArray)
+    local gridEntityType, variant = table.unpack(gridEntityTuple)
     local position = gridToPos(nil, x, y)
-    local gridEntity = Isaac.GridSpawn(entityType, variant, position, true)
-    if entityType == GridEntityType.GRID_PIT then
-        local pit = gridEntity:ToPit()
-        if pit ~= nil then
-            pit:UpdateCollision()
-        end
+    local gridIndex = room:GetGridIndex(position)
+    local gridEntity = spawnGridEntityWithVariant(nil, gridEntityType, variant, gridIndex)
+    if gridEntity == nil then
+        return gridEntity
     end
-    if entityType == GridEntityType.GRID_POOP then
+    if gridEntityType == GridEntityType.GRID_POOP then
         local sprite = gridEntity:GetSprite()
         sprite:Play("State1", true)
         sprite:SetLastFrame()
     end
     return gridEntity
 end
-function spawnNormalEntity(self, entityType, variant, subType, x, y, seed)
+function spawnNormalEntityForJSONRoom(self, entityType, variant, subType, x, y, seed)
     local game = Game()
     local room = game:GetRoom()
     local roomType = room:GetType()

package/dist/functions/gridEntity.d.ts

@@ -106,7 +106,7 @@ export declare function spawnGiantPoop(topLeftGridIndex: int): void;
  * - removes existing grid entities on the same tile, if any
  * - allows you to specify the grid index instead of the position
  */
-export declare function spawnGridEntity(gridEntityType: GridEntityType, gridIndex: int): GridEntity;
+export declare function spawnGridEntity(gridEntityType: GridEntityType, gridIndex: int): GridEntity | undefined;
 /**
  * Helper function to spawn a grid entity with a specific variant. Use this instead of the
  * `Isaac.GridSpawn()` method since it:
@@ -114,9 +114,9 @@ export declare function spawnGridEntity(gridEntityType: GridEntityType, gridInde
  * - removes existing grid entities on the same tile, if any
  * - allows you to specify the grid index instead of the position
  */
-export declare function spawnGridEntityWithVariant(gridEntityType: GridEntityType, variant: int, gridIndex: int): GridEntity;
+export declare function spawnGridEntityWithVariant(gridEntityType: GridEntityType, variant: int, gridIndex: int): GridEntity | undefined;
 /**
  * Helper function to spawn a Void Portal. This is more complicated than simply spawning a trapdoor
  * with the appropriate variant, as the game does not give it the correct sprite automatically.
  */
-export declare function spawnVoidPortal(gridIndex: int): void;
+export declare function spawnVoidPortal(gridIndex: int): GridEntity | undefined;

package/dist/functions/gridEntity.lua

@@ -48,6 +48,9 @@ function ____exports.spawnGridEntityWithVariant(self, gridEntityType, variant, g
     end
     local position = room:GetGridPosition(gridIndex)
     local gridEntity = Isaac.GridSpawn(gridEntityType, variant, position, true)
+    if gridEntity == nil then
+        return gridEntity
+    end
     if gridEntityType == GridEntityType.GRID_PIT then
         local pit = gridEntity:ToPit()
         if pit ~= nil then
@@ -221,8 +224,12 @@ function ____exports.spawnGridEntity(self, gridEntityType, gridIndex)
 end
 function ____exports.spawnVoidPortal(self, gridIndex)
     local voidPortal = ____exports.spawnGridEntityWithVariant(nil, GridEntityType.GRID_TRAPDOOR, 1, gridIndex)
+    if voidPortal == nil then
+        return voidPortal
+    end
     voidPortal.VarData = 1
     local sprite = voidPortal:GetSprite()
     sprite:Load("gfx/grid/voidtrapdoor.anm2", true)
+    return voidPortal
 end
 return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.30",
+  "version": "1.2.31",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -26,10 +26,10 @@
   ],
   "devDependencies": {
     "@zamiell/typescript-to-lua": "^1.4.0",
-    "isaac-typescript-definitions": "^1.0.341",
+    "isaac-typescript-definitions": "^1.0.343",
     "isaacscript-lint": "^1.0.79",
     "isaacscript-tsconfig": "^1.1.8",
-    "typedoc": "^0.22.11",
+    "typedoc": "^0.22.12",
     "typescript": "^4.5.5"
   }
 }