isaacscript-common 20.18.0 → 20.18.1

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 20.18.0
+isaacscript-common 20.18.1
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -19906,6 +19906,53 @@ local ____vector = require("src.functions.vector")
 local doesVectorHaveLength = ____vector.doesVectorHaveLength
 local isVector = ____vector.isVector
 local vectorToString = ____vector.vectorToString
+function ____exports.countEntities(self, entityType, variant, subType, ignoreFriendly)
+    if entityType == nil then
+        entityType = -1
+    end
+    if variant == nil then
+        variant = -1
+    end
+    if subType == nil then
+        subType = -1
+    end
+    if ignoreFriendly == nil then
+        ignoreFriendly = false
+    end
+    if not ignoreFriendly then
+        return Isaac.CountEntities(nil, entityType, variant, subType)
+    end
+    local entities = Isaac.FindByType(
+        entityType,
+        variant,
+        subType,
+        false,
+        ignoreFriendly
+    )
+    return #entities
+end
+function ____exports.doesEntityExist(self, entityType, variant, subType, ignoreFriendly)
+    if entityType == nil then
+        entityType = -1
+    end
+    if variant == nil then
+        variant = -1
+    end
+    if subType == nil then
+        subType = -1
+    end
+    if ignoreFriendly == nil then
+        ignoreFriendly = false
+    end
+    local count = ____exports.countEntities(
+        nil,
+        entityType,
+        variant,
+        subType,
+        ignoreFriendly
+    )
+    return count > 0
+end
 function setPrimitiveEntityFields(self, entity, metatable, entityFields)
     local propGetTable = metatable.__propget
     if propGetTable == nil then
@@ -19944,31 +19991,6 @@ local DAMAGE_FLASH_COLOR = Color(
     0 / 255,
     0 / 255
 )
-function ____exports.countEntities(self, entityType, variant, subType, ignoreFriendly)
-    if entityType == nil then
-        entityType = -1
-    end
-    if variant == nil then
-        variant = -1
-    end
-    if subType == nil then
-        subType = -1
-    end
-    if ignoreFriendly == nil then
-        ignoreFriendly = false
-    end
-    if not ignoreFriendly then
-        return Isaac.CountEntities(nil, entityType, variant, subType)
-    end
-    local entities = Isaac.FindByType(
-        entityType,
-        variant,
-        subType,
-        false,
-        ignoreFriendly
-    )
-    return #entities
-end
 function ____exports.doesAnyEntityExist(self, entityTypes, ignoreFriendly)
     if ignoreFriendly == nil then
         ignoreFriendly = false
@@ -19976,7 +19998,7 @@ function ____exports.doesAnyEntityExist(self, entityTypes, ignoreFriendly)
     local entityTypesArray = isTSTLSet(nil, entityTypes) and ({__TS__Spread(entityTypes:values())}) or entityTypes
     return __TS__ArraySome(
         entityTypesArray,
-        function(____, entityType) return ____exports.countEntities(
+        function(____, entityType) return ____exports.doesEntityExist(
             nil,
             entityType,
             -1,
@@ -19985,28 +20007,6 @@ function ____exports.doesAnyEntityExist(self, entityTypes, ignoreFriendly)
         ) end
     )
 end
-function ____exports.doesEntityExist(self, entityType, variant, subType, ignoreFriendly)
-    if entityType == nil then
-        entityType = -1
-    end
-    if variant == nil then
-        variant = -1
-    end
-    if subType == nil then
-        subType = -1
-    end
-    if ignoreFriendly == nil then
-        ignoreFriendly = false
-    end
-    local count = ____exports.countEntities(
-        nil,
-        entityType,
-        variant,
-        subType,
-        ignoreFriendly
-    )
-    return count > 0
-end
 function ____exports.getClosestEntityTo(self, referenceEntity, entities, filterFunc)
     local closestEntity
     local closestDistance = math.huge

package/dist/src/functions/entities.lua

@@ -34,6 +34,68 @@ local ____vector = require("src.functions.vector")
 local doesVectorHaveLength = ____vector.doesVectorHaveLength
 local isVector = ____vector.isVector
 local vectorToString = ____vector.vectorToString
+--- Helper function to count the number of entities in room. Use this over the vanilla
+-- `Isaac.CountEntities` method to avoid having to specify a spawner and to handle ignoring charmed
+-- enemies.
+-- 
+-- @param entityType Optional. Default is -1, which matches every entity type.
+-- @param variant Optional. Default is -1, which matches every variant.
+-- @param subType Optional. Default is -1, which matches every sub-type.
+-- @param ignoreFriendly Optional. Default is false.
+function ____exports.countEntities(self, entityType, variant, subType, ignoreFriendly)
+    if entityType == nil then
+        entityType = -1
+    end
+    if variant == nil then
+        variant = -1
+    end
+    if subType == nil then
+        subType = -1
+    end
+    if ignoreFriendly == nil then
+        ignoreFriendly = false
+    end
+    if not ignoreFriendly then
+        return Isaac.CountEntities(nil, entityType, variant, subType)
+    end
+    local entities = Isaac.FindByType(
+        entityType,
+        variant,
+        subType,
+        false,
+        ignoreFriendly
+    )
+    return #entities
+end
+--- Helper function to check if one or more of a specific kind of entity is present in the current
+-- room. It uses the `countEntities` helper function to determine this.
+-- 
+-- @param entityType Optional. Default is -1, which matches every entity type.
+-- @param variant Optional. Default is -1, which matches every variant.
+-- @param subType Optional. Default is -1, which matches every sub-type.
+-- @param ignoreFriendly Optional. Default is false.
+function ____exports.doesEntityExist(self, entityType, variant, subType, ignoreFriendly)
+    if entityType == nil then
+        entityType = -1
+    end
+    if variant == nil then
+        variant = -1
+    end
+    if subType == nil then
+        subType = -1
+    end
+    if ignoreFriendly == nil then
+        ignoreFriendly = false
+    end
+    local count = ____exports.countEntities(
+        nil,
+        entityType,
+        variant,
+        subType,
+        ignoreFriendly
+    )
+    return count > 0
+end
 function setPrimitiveEntityFields(self, entity, metatable, entityFields)
     local propGetTable = metatable.__propget
     if propGetTable == nil then
@@ -78,39 +140,6 @@ local DAMAGE_FLASH_COLOR = Color(
     0 / 255,
     0 / 255
 )
---- Helper function to count the number of entities in room. Use this over the vanilla
--- `Isaac.CountEntities` method to avoid having to specify a spawner and to handle ignoring charmed
--- enemies.
--- 
--- @param entityType Optional. Default is -1, which matches every entity type.
--- @param variant Optional. Default is -1, which matches every variant.
--- @param subType Optional. Default is -1, which matches every sub-type.
--- @param ignoreFriendly Optional. Default is false.
-function ____exports.countEntities(self, entityType, variant, subType, ignoreFriendly)
-    if entityType == nil then
-        entityType = -1
-    end
-    if variant == nil then
-        variant = -1
-    end
-    if subType == nil then
-        subType = -1
-    end
-    if ignoreFriendly == nil then
-        ignoreFriendly = false
-    end
-    if not ignoreFriendly then
-        return Isaac.CountEntities(nil, entityType, variant, subType)
-    end
-    local entities = Isaac.FindByType(
-        entityType,
-        variant,
-        subType,
-        false,
-        ignoreFriendly
-    )
-    return #entities
-end
 --- Helper function to check if one or more matching entities exist in the current room. It uses the
 -- `doesEntityExist` helper function to determine this.
 -- 
@@ -124,7 +153,7 @@ function ____exports.doesAnyEntityExist(self, entityTypes, ignoreFriendly)
     local entityTypesArray = isTSTLSet(nil, entityTypes) and ({__TS__Spread(entityTypes:values())}) or entityTypes
     return __TS__ArraySome(
         entityTypesArray,
-        function(____, entityType) return ____exports.countEntities(
+        function(____, entityType) return ____exports.doesEntityExist(
             nil,
             entityType,
             -1,
@@ -133,35 +162,6 @@ function ____exports.doesAnyEntityExist(self, entityTypes, ignoreFriendly)
         ) end
     )
 end
---- Helper function to check if one or more of a specific kind of entity is present in the current
--- room. It uses the `countEntities` helper function to determine this.
--- 
--- @param entityType Optional. Default is -1, which matches every entity type.
--- @param variant Optional. Default is -1, which matches every variant.
--- @param subType Optional. Default is -1, which matches every sub-type.
--- @param ignoreFriendly Optional. Default is false.
-function ____exports.doesEntityExist(self, entityType, variant, subType, ignoreFriendly)
-    if entityType == nil then
-        entityType = -1
-    end
-    if variant == nil then
-        variant = -1
-    end
-    if subType == nil then
-        subType = -1
-    end
-    if ignoreFriendly == nil then
-        ignoreFriendly = false
-    end
-    local count = ____exports.countEntities(
-        nil,
-        entityType,
-        variant,
-        subType,
-        ignoreFriendly
-    )
-    return count > 0
-end
 --- Given an array of entities, this helper function returns the closest one to a provided reference
 -- entity.
 -- 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "20.18.0",
+  "version": "20.18.1",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/functions/entities.ts

@@ -76,7 +76,7 @@ export function doesAnyEntityExist(
     : (entityTypes as EntityType[]);
 
   return entityTypesArray.some((entityType) =>
-    countEntities(entityType, -1, -1, ignoreFriendly),
+    doesEntityExist(entityType, -1, -1, ignoreFriendly),
   );
 }