isaacscript-common 1.2.86 → 1.2.89

package/dist/callbacks/postPurchase.lua

@@ -45,7 +45,7 @@ function checkPickupsPurchased(self, pickups, players)
                     nil,
                     player,
                     pickupDescription.variant,
-                    pickupDescription.subtype,
+                    pickupDescription.subType,
                     pickupDescription.price
                 )
             end
@@ -70,7 +70,7 @@ function storePickupsInMap(self, pickups)
         function(____, pickup) return pickup.Price ~= 0 end
     )
     for ____, pickup in ipairs(pickupsWithPrice) do
-        v.room.pickupMap:set(pickup.Index, {variant = pickup.Variant, subtype = pickup.SubType, price = pickup.Price})
+        v.room.pickupMap:set(pickup.Index, {variant = pickup.Variant, subType = pickup.SubType, price = pickup.Price})
     end
 end
 function storePlayersInMap(self, players)

package/dist/features/sirenHelpers.d.ts

@@ -4,8 +4,8 @@
  * beginning of every run.
  *
  * @param familiarVariant The familiar variant to blacklist.
- * @param familiarSubType The subtype to blacklist. Optional. The default is to blacklist all
- * subtypes of the given variant.
+ * @param familiarSubType The sub-type to blacklist. Optional. The default is to blacklist all
+ * sub-types of the given variant.
  */
 export declare function setFamiliarNoSirenSteal(familiarVariant: FamiliarVariant | int, familiarSubType?: int): void;
 /**

package/dist/features/test.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="isaac-typescript-definitions" />
+export declare function testInit(mod: Mod): void;
+export declare function test(): void;

package/dist/features/test.lua

@@ -0,0 +1,24 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____lualib = require("lualib_bundle")
+local Set = ____lualib.Set
+local __TS__New = ____lualib.__TS__New
+local ____exports = {}
+local postPEffectUpdate
+local ____errors = require("errors")
+local getUpgradeErrorMsg = ____errors.getUpgradeErrorMsg
+function postPEffectUpdate(self, _player)
+end
+local FEATURE_NAME = "test"
+local initialized = false
+local v = {run = {playersIsPonyActive = __TS__New(Set)}}
+function ____exports.testInit(self, mod)
+    initialized = true
+    mod:AddCallback(ModCallbacks.MC_POST_PEFFECT_UPDATE, postPEffectUpdate)
+end
+function ____exports.test(self)
+    if not initialized then
+        local msg = getUpgradeErrorMsg(nil, FEATURE_NAME)
+        error(msg)
+    end
+end
+return ____exports

package/dist/functions/log.lua

@@ -43,13 +43,11 @@ function ____exports.logAllFlags(flags, flagEnum, description)
     end
     ____exports.log(("Logging all " .. description) .. "flags:")
     local hasNoFlags = true
-    local i = 1
     for key, value in pairs(flagEnum) do
         if hasFlag(nil, flags, value) then
-            ____exports.log(((((("  " .. tostring(i)) .. ") Has flag: ") .. tostring(key)) .. " (") .. tostring(value)) .. ")")
+            ____exports.log(((("  Has flag: " .. tostring(key)) .. " (") .. tostring(value)) .. ")")
             hasNoFlags = false
         end
-        i = i + 1
     end
     if hasNoFlags then
         ____exports.log("  n/a (no flags)")
@@ -65,15 +63,13 @@ function ____exports.logAllGameStateFlags()
     local game = Game()
     ____exports.log("Logging all game state flags:")
     local hasNoFlags = true
-    local i = 1
     for key, value in pairs(GameStateFlag) do
         local gameStateFlag = value
         local flagValue = game:GetStateFlag(gameStateFlag)
         if flagValue then
-            ____exports.log(((((("  " .. tostring(i)) .. ") Has flag: ") .. key) .. " (") .. tostring(value)) .. ")")
+            ____exports.log(((("  Has flag: " .. key) .. " (") .. tostring(value)) .. ")")
             hasNoFlags = false
         end
-        i = i + 1
     end
     if hasNoFlags then
         ____exports.log("  n/a (no flags)")
@@ -87,14 +83,12 @@ function ____exports.logAllSeedEffects()
     local seeds = game:GetSeeds()
     ____exports.log("Logging all seed effects:")
     local hasNoSeedEffects = true
-    local i = 1
     for key, value in pairs(SeedEffect) do
         local seedEffect = value
         if seeds:HasSeedEffect(seedEffect) then
-            ____exports.log(((((("  " .. tostring(i)) .. ") ") .. key) .. " (") .. tostring(value)) .. ")")
+            ____exports.log(((("  " .. key) .. " (") .. tostring(value)) .. ")")
             hasNoSeedEffects = false
         end
-        i = i + 1
     end
     if hasNoSeedEffects then
         ____exports.log("  n/a (no seed effects)")

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

@@ -1,18 +1,6 @@
 /// <reference types="isaac-typescript-definitions" />
 import { HealthType } from "../types/HealthType";
-/**
- * PlayerIndex is a specific type of string; see the documentation for the [[`getPlayerIndex`]]
- * function. Mods can signify that data structures handle EntityPlayers by using this type:
- *
- * ```
- * const myPlayerMap = new Map<PlayerIndex, string>();
- * ```
- *
- * This type is branded for extra type safety.
- */
-export declare type PlayerIndex = int & {
-    __playerIndexBrand: unknown;
-};
+import { PlayerIndex } from "../types/PlayerIndex";
 export declare function addCollectibleCostume(player: EntityPlayer, collectibleType: CollectibleType | int): void;
 export declare function addTrinketCostume(player: EntityPlayer, trinketType: TrinketType | int): void;
 /** Iterates over all players and checks if any player is close enough to the specified position. */

package/dist/functions/rooms.d.ts

@@ -23,15 +23,11 @@ export declare function getCurrentRoomDescriptorReadOnly(): RoomDescriptorReadOn
  */
 export declare function getRoomData(roomGridIndex?: int): RoomConfig | undefined;
 /**
- * Helper function to get the type of a room from the XML/STB data. The room data type will
- * correspond to different things depending on what XML/STB file it draws from. For example, in the
- * "00.special rooms.stb" file, a room type of 2 corresponds to a shop, a room type of 3 corresponds
- * to an I AM ERROR room, and so on.
+ * Helper function for getting the type of the room with the given grid index.
  *
- * @param roomGridIndex Optional. Equal to the current room index by default.
  * @returns The room data type. Returns -1 if the type was not found.
  */
-export declare function getRoomDataType(roomGridIndex?: int): int;
+export declare function getRoomType(roomGridIndex: int): RoomType;
 /**
  * Helper function to get the descriptor for a room.
  *
@@ -97,13 +93,13 @@ export declare function getRoomSafeGridIndex(roomGridIndex?: int): int;
  */
 export declare function getRoomStageID(roomGridIndex?: int): StageID;
 /**
- * Helper function to get the subtype for a room from the XML/STB data. The room subtype will
+ * Helper function to get the sub-type for a room from the XML/STB data. The room sub-type will
  * correspond to different things depending on what XML/STB file it draws from. For example, in the
- * "00.special rooms.stb" file, an Angel Room with a subtype of 0 will correspond to a normal Angel
- * Room and a subtype of 1 will correspond to an Angel Room shop for The Stairway.
+ * "00.special rooms.stb" file, an Angel Room with a sub-type of 0 will correspond to a normal Angel
+ * Room and a sub-type of 1 will correspond to an Angel Room shop for The Stairway.
  *
  * @param roomGridIndex Optional. Equal to the current room index by default.
- * @returns The room subtype. Returns -1 if the subtype was not found.
+ * @returns The room sub-type. Returns -1 if the sub-type was not found.
  */
 export declare function getRoomSubType(roomGridIndex?: int): int;
 /**
@@ -151,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;
 /**

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()
@@ -129,7 +129,7 @@ function ____exports.getCurrentDimension(self)
     end
     return error("Failed to get the current dimension using the starting room index of: " .. tostring(startingRoomGridIndex))
 end
-function ____exports.getRoomDataType(self, roomGridIndex)
+function ____exports.getRoomType(self, roomGridIndex)
     local roomData = ____exports.getRoomData(nil, roomGridIndex)
     return roomData == nil and -1 or roomData.Type
 end
@@ -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)

package/dist/index.d.ts

@@ -92,6 +92,7 @@ export * from "./types/PickingUpItem";
 export * from "./types/PillEffectClass";
 export * from "./types/PillEffectType";
 export * from "./types/PlayerHealth";
+export * from "./types/PlayerIndex";
 export * from "./types/PocketItemDescription";
 export * from "./types/PocketItemType";
 export * from "./types/TrinketSituation";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.86",
+  "version": "1.2.89",
   "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",