isaacscript-common 1.2.87 → 1.2.90

package/dist/functions/npc.d.ts

@@ -19,16 +19,16 @@ export declare function fireProjectiles(npc: EntityNPC, position: Vector, veloci
  * This function will not include bosses on an internal blacklist, such as Death's scythes or Big
  * Horn holes.
  */
-export declare function getAliveBosses(): EntityNPC[];
+export declare function getAliveBosses(matchingEntityType?: EntityType | int, matchingVariant?: int, matchingSubType?: int, ignoreFriendly?: boolean): EntityNPC[];
 /**
  * Helper function to get all of the non-dead NPCs in the room.
  *
  * This function will not include NPCs on an internal blacklist, such as Death's scythes or Big Horn
  * holes.
  */
-export declare function getAliveNPCs(): EntityNPC[];
+export declare function getAliveNPCs(matchingEntityType?: EntityType | int, matchingVariant?: int, matchingSubType?: int, ignoreFriendly?: boolean): EntityNPC[];
 /** Helper function to get all of the bosses in the room. */
-export declare function getBosses(): EntityNPC[];
+export declare function getBosses(matchingEntityType?: EntityType | int, matchingVariant?: int, matchingSubType?: int, ignoreFriendly?: boolean): EntityNPC[];
 /** The same thing as the `getEntities()` function, but returns only NPCs. */
 export declare function getNPCs(matchingEntityType?: EntityType | int, matchingVariant?: int, matchingSubType?: int, ignoreFriendly?: boolean): EntityNPC[];
 /**

package/dist/functions/npc.lua

@@ -14,8 +14,17 @@ local getFilteredNewEntities = ____entity.getFilteredNewEntities
 local removeEntities = ____entity.removeEntities
 local ____entitySpecific = require("functions.entitySpecific")
 local getProjectiles = ____entitySpecific.getProjectiles
-function ____exports.getAliveNPCs(self)
-    local npcs = ____exports.getNPCs(nil)
+function ____exports.getAliveNPCs(self, matchingEntityType, matchingVariant, matchingSubType, ignoreFriendly)
+    if ignoreFriendly == nil then
+        ignoreFriendly = false
+    end
+    local npcs = ____exports.getNPCs(
+        nil,
+        matchingEntityType,
+        matchingVariant,
+        matchingSubType,
+        ignoreFriendly
+    )
     return __TS__ArrayFilter(
         npcs,
         function(____, npc) return not npc:IsDead() and not ____exports.isAliveExceptionNPC(nil, npc) end
@@ -99,15 +108,33 @@ function ____exports.fireProjectiles(self, npc, position, velocity, projectilesM
     local newProjectiles = getProjectiles(nil, projectileParams.Variant)
     return getFilteredNewEntities(nil, oldProjectiles, newProjectiles)
 end
-function ____exports.getAliveBosses(self)
-    local aliveNPCs = ____exports.getAliveNPCs(nil)
+function ____exports.getAliveBosses(self, matchingEntityType, matchingVariant, matchingSubType, ignoreFriendly)
+    if ignoreFriendly == nil then
+        ignoreFriendly = false
+    end
+    local aliveNPCs = ____exports.getAliveNPCs(
+        nil,
+        matchingEntityType,
+        matchingVariant,
+        matchingSubType,
+        ignoreFriendly
+    )
     return __TS__ArrayFilter(
         aliveNPCs,
         function(____, aliveNPC) return aliveNPC:IsBoss() end
     )
 end
-function ____exports.getBosses(self)
-    local npcs = ____exports.getNPCs(nil)
+function ____exports.getBosses(self, matchingEntityType, matchingVariant, matchingSubType, ignoreFriendly)
+    if ignoreFriendly == nil then
+        ignoreFriendly = false
+    end
+    local npcs = ____exports.getNPCs(
+        nil,
+        matchingEntityType,
+        matchingVariant,
+        matchingSubType,
+        ignoreFriendly
+    )
     return __TS__ArrayFilter(
         npcs,
         function(____, npc) return npc:IsBoss() end

package/dist/functions/rooms.d.ts

@@ -147,8 +147,8 @@ export declare function inBeastRoom(): boolean;
 export declare function inBossRoomOf(bossID: BossID): boolean;
 /**
  * Helper function for determining whether the current room is a crawlspace. Use this function over
- * comparing to `GridRooms.ROOM_DUNGEON_IDX` directly since there is a special case of the player
- * being in The Beast room.
+ * comparing to `RoomType.ROOM_DUNGEON` or `GridRooms.ROOM_DUNGEON_IDX` since there is a special
+ * case of the player being in a boss fight that take place in a dungeon.
  */
 export declare function inCrawlspace(): boolean;
 /**
@@ -171,6 +171,14 @@ export declare function inGenesisRoom(): boolean;
  * will only work for minibosses that have dedicated boss rooms in the "00.special rooms.stb" file.
  */
 export declare function inMinibossRoomOf(minibossID: MinibossID): boolean;
+/**
+ * Helper function for checking if the room room is a secret shop from the Member Card collectible.
+ *
+ * Secret shops are simply copies of normal shops but with the backdrop of a secret room. In other
+ * words, they will have the same room type, room variant, and room sub-type of a normal shop. Thus,
+ * the only way to detect them is by using the grid index.
+ */
+export declare function inSecretShop(): boolean;
 /**
  * Helper function to determine whether or not the current room is the starting room of a floor.
  * Only returns true for the starting room of the primary dimension (meaning that being in the

package/dist/functions/rooms.lua

@@ -92,7 +92,7 @@ end
 function ____exports.inDeathCertificateArea(self)
     local roomStageID = ____exports.getRoomStageID(nil)
     local roomSubType = ____exports.getRoomSubType(nil)
-    return roomStageID == 35 and (roomSubType == 33 or roomSubType == 33)
+    return roomStageID == 35 and (roomSubType == 33 or roomSubType == 34)
 end
 function ____exports.changeRoom(self, roomGridIndex)
     local game = Game()
@@ -195,9 +195,11 @@ function ____exports.inAngelShop(self)
     return roomType == RoomType.ROOM_ANGEL and roomSubType == 1
 end
 function ____exports.inBeastRoom(self)
-    local roomSafeGridIndex = ____exports.getRoomSafeGridIndex(nil)
+    local game = Game()
+    local room = game:GetRoom()
+    local roomType = room:GetType()
     local roomSubType = ____exports.getRoomSubType(nil)
-    return roomSafeGridIndex == GridRooms.ROOM_DUNGEON_IDX and roomSubType == 4
+    return roomType == RoomType.ROOM_DUNGEON and roomSubType == 4
 end
 function ____exports.inBossRoomOf(self, bossID)
     local game = Game()
@@ -208,9 +210,11 @@ function ____exports.inBossRoomOf(self, bossID)
     return roomType == RoomType.ROOM_BOSS and roomStageID == 0 and roomSubType == bossID
 end
 function ____exports.inCrawlspace(self)
-    local roomSafeGridIndex = ____exports.getRoomSafeGridIndex(nil)
+    local game = Game()
+    local room = game:GetRoom()
+    local roomType = room:GetType()
     local roomSubType = ____exports.getRoomSubType(nil)
-    return roomSafeGridIndex == GridRooms.ROOM_DUNGEON_IDX and roomSubType ~= 4
+    return roomType == RoomType.ROOM_DUNGEON and roomSubType ~= 4
 end
 function ____exports.inDevilsCrownTreasureRoom(self)
     local roomDescriptor = ____exports.getCurrentRoomDescriptorReadOnly(nil)
@@ -241,6 +245,9 @@ function ____exports.inMinibossRoomOf(self, minibossID)
     local roomSubType = ____exports.getRoomSubType(nil)
     return roomType == RoomType.ROOM_MINIBOSS and roomStageID == 0 and roomSubType == minibossID
 end
+function ____exports.inSecretShop(self)
+    return ____exports.getRoomSafeGridIndex(nil) == GridRooms.ROOM_SECRET_SHOP_IDX
+end
 function ____exports.inStartingRoom(self)
     local game = Game()
     local level = game:GetLevel()
@@ -298,12 +305,12 @@ function ____exports.setRoomCleared(self)
     for ____, door in ipairs(getDoors(nil)) do
         do
             if isHiddenSecretRoomDoor(nil, door) then
-                goto __continue56
+                goto __continue57
             end
             openDoorFast(nil, door)
             door.ExtraVisible = false
         end
-        ::__continue56::
+        ::__continue57::
     end
     sfx:Stop(SoundEffect.SOUND_DOOR_HEAVY_OPEN)
     game:ShakeScreen(0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.87",
+  "version": "1.2.90",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "@zamiell/typescript-to-lua": "^1.4.0",
-    "isaac-typescript-definitions": "^1.0.354",
+    "isaac-typescript-definitions": "^1.0.355",
     "isaacscript-lint": "^1.0.81",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.12",