isaacscript-common 1.2.29 → 1.2.32

package/dist/callbacks/customRevive.lua

@@ -5,8 +5,8 @@ local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____collectibles = require("functions.collectibles")
 local removeCollectibleFromItemTracker = ____collectibles.removeCollectibleFromItemTracker
-local ____entity = require("functions.entity")
-local removeAllFamiliars = ____entity.removeAllFamiliars
+local ____familiars = require("functions.familiars")
+local removeAllFamiliars = ____familiars.removeAllFamiliars
 local ____player = require("functions.player")
 local getPlayerIndex = ____player.getPlayerIndex
 local ____ModCallbacksCustom = require("types.ModCallbacksCustom")

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/entity.d.ts

@@ -85,18 +85,6 @@ export declare function getEntityPositions(entities?: Entity[]): Map<PtrHash, Ve
  * times.
  */
 export declare function getEntityVelocities(entities?: Entity[]): Map<PtrHash, Vector>;
-/**
- * Helper function to get all of the familiars in the room.
- *
- * Example:
- * ```
- * // Make all of the familiars in the room invisible
- * for (const familiar of getFamiliars()) {
- *   familiar.Visible = false;
- * }
- * ```
- */
-export declare function getFamiliars(matchingVariant?: FamiliarVariant | int, matchingSubType?: number): EntityFamiliar[];
 /**
  * Helper function to get all of the knives in the room.
  *
@@ -197,15 +185,6 @@ export declare function removeAllBombs(variant?: BombVariant | int, subType?: in
  * @returns True if one or more effects was removed, false otherwise.
  */
 export declare function removeAllEffects(variant?: EffectVariant | int, subType?: int, cap?: int): boolean;
-/**
- * Helper function to remove all of the familiars in the room.
- *
- * @param variant Optional. If specified, will only remove familiars that match this variant.
- * @param subType Optional. If specified, will only remove familiars that match this sub-type.
- * @param cap Optional. If specified, will only remove the given amount of familiars.
- * @returns True if one or more familiars was removed, false otherwise.
- */
-export declare function removeAllFamiliars(variant?: FamiliarVariant | int, subType?: int, cap?: int): boolean;
 /**
  * Helper function to remove all of the knives in the room.
  *

package/dist/functions/entity.lua

@@ -118,23 +118,6 @@ function ____exports.getEntityVelocities(self, entities)
     end
     return entityVelocities
 end
-function ____exports.getFamiliars(self, matchingVariant, matchingSubType)
-    if matchingVariant == nil then
-        matchingVariant = -1
-    end
-    if matchingSubType == nil then
-        matchingSubType = -1
-    end
-    local entities = ____exports.getEntities(nil, EntityType.ENTITY_FAMILIAR, matchingVariant, matchingSubType)
-    local familiars = {}
-    for ____, entity in ipairs(entities) do
-        local familiar = entity:ToFamiliar()
-        if familiar ~= nil then
-            __TS__ArrayPush(familiars, familiar)
-        end
-    end
-    return familiars
-end
 function ____exports.getKnives(self, matchingVariant, matchingSubType)
     if matchingVariant == nil then
         matchingVariant = -1
@@ -266,10 +249,6 @@ function ____exports.removeAllEffects(self, variant, subType, cap)
     local effects = ____exports.getEffects(nil, variant, subType)
     return ____exports.removeEntities(nil, effects, cap)
 end
-function ____exports.removeAllFamiliars(self, variant, subType, cap)
-    local familiars = ____exports.getFamiliars(nil, variant, subType)
-    return ____exports.removeEntities(nil, familiars, cap)
-end
 function ____exports.removeAllKnives(self, variant, subType, cap)
     local knives = ____exports.getKnives(nil, variant, subType)
     return ____exports.removeEntities(nil, knives, cap)

package/dist/functions/familiars.d.ts

@@ -1,2 +1,40 @@
 /// <reference types="isaac-typescript-definitions" />
+/**
+ * Helper function to add and remove familiars based on the amount of associated collectibles that a
+ * player has. Use this instead of the `EntityPlayer.CheckFamiliar` method so that the InitSeed of
+ * the spawned familiar will be set properly.
+ *
+ * This function is meant to be called in the EvaluateCache callback (when the cache flag is equal
+ * to `CacheFlag.CACHE_FAMILIARS`).
+ *
+ * @param player The player that has the collectibles for this familiar.
+ * @param collectibleType The collectible type of the collectible associated with this familiar.
+ * @param familiarVariant The variant of the familiar to spawn or remove.
+ * @param familiarSubType The sub-type of the familiar to spawn
+ * @returns The amount of familiars that were added or removed. For example, the player has 0
+ * collectibles and there were 2 familiars, this function would remove the 2 familiars and return
+ * -2.
+ */
+export declare function checkFamiliar(player: EntityPlayer, collectibleType: int, familiarVariant: int, familiarSubType?: int): int;
+/**
+ * Helper function to get all of the familiars in the room.
+ *
+ * Example:
+ * ```
+ * // Make all of the familiars in the room invisible
+ * for (const familiar of getFamiliars()) {
+ *   familiar.Visible = false;
+ * }
+ * ```
+ */
+export declare function getFamiliars(matchingVariant?: FamiliarVariant | int, matchingSubType?: number): EntityFamiliar[];
 export declare function isFamiliarThatShootsPlayerTears(familiar: EntityFamiliar): boolean;
+/**
+ * Helper function to remove all of the familiars in the room.
+ *
+ * @param variant Optional. If specified, will only remove familiars that match this variant.
+ * @param subType Optional. If specified, will only remove familiars that match this sub-type.
+ * @param cap Optional. If specified, will only remove the given amount of familiars.
+ * @returns True if one or more familiars was removed, false otherwise.
+ */
+export declare function removeAllFamiliars(variant?: FamiliarVariant | int, subType?: int, cap?: int): boolean;

package/dist/functions/familiars.lua

@@ -1,10 +1,85 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
+local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
+local __TS__ArrayPush = ____lualib.__TS__ArrayPush
 local ____exports = {}
 local ____constants = require("constants")
 local FAMILIARS_THAT_SHOOT_PLAYER_TEARS = ____constants.FAMILIARS_THAT_SHOOT_PLAYER_TEARS
+local ____entity = require("functions.entity")
+local getEntities = ____entity.getEntities
+local removeEntities = ____entity.removeEntities
+function ____exports.getFamiliars(self, matchingVariant, matchingSubType)
+    if matchingVariant == nil then
+        matchingVariant = -1
+    end
+    if matchingSubType == nil then
+        matchingSubType = -1
+    end
+    local entities = getEntities(nil, EntityType.ENTITY_FAMILIAR, matchingVariant, matchingSubType)
+    local familiars = {}
+    for ____, entity in ipairs(entities) do
+        local familiar = entity:ToFamiliar()
+        if familiar ~= nil then
+            __TS__ArrayPush(familiars, familiar)
+        end
+    end
+    return familiars
+end
+function ____exports.checkFamiliar(self, player, collectibleType, familiarVariant, familiarSubType)
+    local game = Game()
+    local familiarSubTypeToSearchFor = familiarSubType == nil and -1 or familiarSubType
+    local playerPtrHash = GetPtrHash(player)
+    local familiars = ____exports.getFamiliars(nil, familiarVariant, familiarSubTypeToSearchFor)
+    local familiarsForThisPlayer = __TS__ArrayFilter(
+        familiars,
+        function(____, familiar) return GetPtrHash(familiar.Player) == playerPtrHash end
+    )
+    local numCollectibles = player:GetCollectibleNum(collectibleType)
+    if #familiarsForThisPlayer == numCollectibles then
+        return 0
+    end
+    if #familiarsForThisPlayer > numCollectibles then
+        local numFamiliarsToRemove = #familiarsForThisPlayer - numCollectibles
+        do
+            local i = 0
+            while i < numFamiliarsToRemove do
+                local familiar = familiarsForThisPlayer[i + 1]
+                familiar:Remove()
+                i = i + 1
+            end
+        end
+        return numFamiliarsToRemove * -1
+    end
+    local numFamiliarsToSpawn = numCollectibles - #familiarsForThisPlayer
+    local collectibleRNG = player:GetCollectibleRNG(collectibleType)
+    local familiarSubTypeToUse = familiarSubType == nil and 0 or familiarSubType
+    do
+        local i = 0
+        while i < numFamiliarsToSpawn do
+            collectibleRNG:Next()
+            local familiar = game:Spawn(
+                EntityType.ENTITY_FAMILIAR,
+                familiarVariant,
+                player.Position,
+                Vector.Zero,
+                nil,
+                familiarSubTypeToUse,
+                collectibleRNG:GetSeed()
+            ):ToFamiliar()
+            if familiar ~= nil then
+                familiar.Player = player
+            end
+            i = i + 1
+        end
+    end
+    return numFamiliarsToSpawn
+end
 function ____exports.isFamiliarThatShootsPlayerTears(self, familiar)
     return FAMILIARS_THAT_SHOOT_PLAYER_TEARS:has(familiar.Type)
 end
+function ____exports.removeAllFamiliars(self, variant, subType, cap)
+    local familiars = ____exports.getFamiliars(nil, variant, subType)
+    return removeEntities(nil, familiars, cap)
+end
 return ____exports

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/dist/functions/npc.lua

@@ -81,7 +81,10 @@ NON_ALIVE_NPCS_TYPE_VARIANT = __TS__New(
 )
 NON_ALIVE_NPCS_TYPE_VARIANT_SUBTYPE = __TS__New(
     Set,
-    {(((tostring(EntityType.ENTITY_CHARGER) .. ".") .. 0) .. ".") .. 1}
+    {
+        (((tostring(EntityType.ENTITY_CHARGER) .. ".") .. 0) .. ".") .. 1,
+        (((tostring(EntityType.ENTITY_MOTHER) .. ".") .. 0) .. ".") .. 1
+    }
 )
 function ____exports.fireProjectiles(self, npc, position, velocity, projectilesMode, projectileParams)
     if projectilesMode == nil then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.29",
+  "version": "1.2.32",
   "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.339",
+    "isaac-typescript-definitions": "^1.0.347",
     "isaacscript-lint": "^1.0.79",
     "isaacscript-tsconfig": "^1.1.8",
-    "typedoc": "^0.22.11",
+    "typedoc": "^0.22.12",
     "typescript": "^4.5.5"
   }
 }