isaacscript-common 8.6.0 → 8.8.1

package/dist/enums/ModCallbackCustom.d.ts

@@ -892,7 +892,7 @@ export declare enum ModCallbackCustom {
     POST_PLAYER_CHANGE_TYPE = 57,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when a player's collectible count is higher than
-     * what it was on the previous frame.
+     * what it was on the previous frame or when a new active collectible is acquired.
      *
      * When registering the callback, takes an optional second argument that will make the callback
      * only fire if the collectible matches the `CollectibleType` provided.
@@ -907,7 +907,7 @@ export declare enum ModCallbackCustom {
     POST_PLAYER_COLLECTIBLE_ADDED = 58,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when a player's collectible count is lower than
-     * what it was on the previous frame.
+     * what it was on the previous frame or when an active collectible is no longer present.
      *
      * When registering the callback, takes an optional second argument that will make the callback
      * only fire if the collectible matches the `CollectibleType` provided.

package/dist/features/playerInventory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"playerInventory.d.ts","sourceRoot":"","sources":["../../src/features/playerInventory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAe,MAAM,8BAA8B,CAAC;AA6G5E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,yBAAyB,UAAO,GAC/B,eAAe,EAAE,CAanB;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,YAAY,GACnB,eAAe,GAAG,SAAS,CAK7B"}
+{"version":3,"file":"playerInventory.d.ts","sourceRoot":"","sources":["../../src/features/playerInventory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAe,MAAM,8BAA8B,CAAC;AAsH5E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EACpB,yBAAyB,UAAO,GAC/B,eAAe,EAAE,CAanB;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,YAAY,GACnB,eAAe,GAAG,SAAS,CAK7B"}

package/dist/features/playerInventory.lua

@@ -33,14 +33,16 @@ local saveDataManager = ____exports.saveDataManager
 function newPlayerInventory(self, player)
     local inventory = {}
     for ____, collectibleType in ipairs(getCollectibleArray(nil)) do
-        local numCollectibles = player:GetCollectibleNum(collectibleType, true)
-        ____repeat(
-            nil,
-            numCollectibles,
-            function()
-                inventory[#inventory + 1] = collectibleType
-            end
-        )
+        if player:HasCollectible(collectibleType) then
+            local numCollectibles = player:GetCollectibleNum(collectibleType, true)
+            ____repeat(
+                nil,
+                numCollectibles,
+                function()
+                    inventory[#inventory + 1] = collectibleType
+                end
+            )
+        end
     end
     return inventory
 end

package/dist/functions/collectibles.d.ts

@@ -19,8 +19,12 @@ export declare function getCollectibleDevilCoinPrice(collectibleType: Collectibl
  */
 export declare function getCollectibleDevilHeartPrice(collectibleType: CollectibleType, player: EntityPlayer): PickupPrice;
 /**
- * Helper function to get the path to a collectible's sprite. Returns the path to the question mark
+ * Helper function to get the path to a collectible PNG file. Returns the path to the question mark
  * sprite (i.e. from Curse of the Blind) if the provided collectible type was not valid.
+ *
+ * Note that this does not return the file name, but the full path to the collectible's PNG file.
+ * The function is named "GfxFilename" to correspond to the associated `ItemConfigItem.GfxFileName`
+ * field.
  */
 export declare function getCollectibleGfxFilename(collectibleType: CollectibleType): string;
 /**
@@ -163,6 +167,11 @@ export declare function isPassiveCollectible(collectibleType: CollectibleType):
 export declare function isSingleUseCollectible(collectibleType: CollectibleType): boolean;
 export declare function isValidCollectibleType(collectibleType: CollectibleType): boolean;
 export declare function isVanillaCollectibleType(collectibleType: CollectibleType): boolean;
+/**
+ * Helper function to generate a new sprite based on a collectible. If the provided collectible type
+ * is invalid, a sprite with a Curse of the Blind question mark will be returned.
+ */
+export declare function newCollectibleSprite(collectibleType: CollectibleType): Sprite;
 /**
  * Helper function to put a message in the log.txt file to let the Rebirth Item Tracker know that it
  * should remove an item.

package/dist/functions/collectibles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collectibles.d.ts","sourceRoot":"","sources":["../../src/functions/collectibles.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collectibles.d.ts","sourceRoot":"","sources":["../../src/functions/collectibles.ts"],"names":[],"mappings":"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"}

package/dist/functions/collectibles.lua

@@ -105,6 +105,7 @@ function ____exports.setCollectibleSubType(self, collectible, newCollectibleType
         true
     )
 end
+local COLLECTIBLE_ANM2_PATH = "gfx/005.100_collectible.anm2"
 COLLECTIBLE_SPRITE_LAYER = 1
 COLLECTIBLE_SHADOW_LAYER = 4
 local GLITCHED_ITEM_THRESHOLD = 4000000000
@@ -174,8 +175,12 @@ function ____exports.getCollectibleDevilHeartPrice(self, collectibleType, player
     local twoHeartPrice = maxHearts == 2 and PickupPrice.ONE_HEART_AND_TWO_SOUL_HEARTS or PickupPrice.TWO_HEARTS
     return itemConfigItem.DevilPrice == 2 and twoHeartPrice or PickupPrice.ONE_HEART
 end
---- Helper function to get the path to a collectible's sprite. Returns the path to the question mark
+--- Helper function to get the path to a collectible PNG file. Returns the path to the question mark
 -- sprite (i.e. from Curse of the Blind) if the provided collectible type was not valid.
+-- 
+-- Note that this does not return the file name, but the full path to the collectible's PNG file.
+-- The function is named "GfxFilename" to correspond to the associated `ItemConfigItem.GfxFileName`
+-- field.
 function ____exports.getCollectibleGfxFilename(self, collectibleType)
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     if itemConfigItem == nil then
@@ -386,6 +391,17 @@ function ____exports.isValidCollectibleType(self, collectibleType)
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)
     return itemConfigItem ~= nil
 end
+--- Helper function to generate a new sprite based on a collectible. If the provided collectible type
+-- is invalid, a sprite with a Curse of the Blind question mark will be returned.
+function ____exports.newCollectibleSprite(self, collectibleType)
+    local sprite = Sprite()
+    sprite:Load(COLLECTIBLE_ANM2_PATH, false)
+    clearSprite(nil, sprite)
+    local gfxFileName = ____exports.getCollectibleGfxFilename(nil, collectibleType)
+    sprite:ReplaceSpritesheet(COLLECTIBLE_SPRITE_LAYER, gfxFileName)
+    sprite:LoadGraphics()
+    return sprite
+end
 --- Helper function to put a message in the log.txt file to let the Rebirth Item Tracker know that it
 -- should remove an item.
 -- 

package/dist/functions/curses.d.ts

@@ -1,3 +1,12 @@
 import { LevelCurse } from "isaac-typescript-definitions";
+/**
+ * Helper function to get the actual bit flag for modded curses.
+ *
+ * Will throw a runtime error if the provided curse does not exist.
+ *
+ * Use this over the `Isaac.GetCurseIdByName` method because that will return an integer instead of
+ * a bit flag.
+ */
+export declare function getCurseIDByName(name: string): LevelCurse;
 export declare function hasCurse(curse: LevelCurse): boolean;
 //# sourceMappingURL=curses.d.ts.map

package/dist/functions/curses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"curses.d.ts","sourceRoot":"","sources":["../../src/functions/curses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAI1D,wBAAgB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAInD"}
+{"version":3,"file":"curses.d.ts","sourceRoot":"","sources":["../../src/functions/curses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAI1D;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAWzD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAInD"}

package/dist/functions/curses.lua

@@ -3,6 +3,19 @@ local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
 local ____flag = require("functions.flag")
 local hasFlag = ____flag.hasFlag
+--- Helper function to get the actual bit flag for modded curses.
+-- 
+-- Will throw a runtime error if the provided curse does not exist.
+-- 
+-- Use this over the `Isaac.GetCurseIdByName` method because that will return an integer instead of
+-- a bit flag.
+function ____exports.getCurseIDByName(self, name)
+    local curseID = Isaac.GetCurseIdByName(name)
+    if curseID == -1 then
+        error(("Failed to get the curse ID corresponding to the curse name of \"" .. tostring(curseID)) .. "\". Does this name match what you put in the \"content/curses.xml\" file?")
+    end
+    return 1 << curseID - 1
+end
 function ____exports.hasCurse(self, curse)
     local level = game:GetLevel()
     local curses = level:GetCurses()

package/dist/functions/trinkets.d.ts

@@ -26,6 +26,15 @@ export declare function getOpenTrinketSlot(player: EntityPlayer): int | undefine
  * trinket type was not valid.
  */
 export declare function getTrinketDescription(trinketType: TrinketType): string;
+/**
+ * Helper function to get the path to a trinket PNG file. Returns the path to the question mark
+ * sprite (i.e. from Curse of the Blind) if the provided trinket type was not valid.
+ *
+ * Note that this does not return the file name, but the full path to the trinket's PNG file. The
+ * function is named "GfxFilename" to correspond to the associated `ItemConfigItem.GfxFileName`
+ * field.
+ */
+export declare function getTrinketGfxFilename(trinketType: TrinketType): string;
 /**
  * Helper function to get the name of a trinket. Returns "Unknown" if the provided trinket type is
  * not valid.
@@ -51,6 +60,11 @@ export declare function hasOpenTrinketSlot(player: EntityPlayer): boolean;
 export declare function isGoldenTrinketType(trinketType: TrinketType): boolean;
 export declare function isModdedTrinketType(trinketType: TrinketType): boolean;
 export declare function isVanillaTrinketType(trinketType: TrinketType): boolean;
+/**
+ * Helper function to generate a new sprite based on a collectible. If the provided collectible type
+ * is invalid, a sprite with a Curse of the Blind question mark will be returned.
+ */
+export declare function newTrinketSprite(trinketType: TrinketType): Sprite;
 /**
  * Helper function to change the sprite of a trinket entity.
  *

package/dist/functions/trinkets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trinkets.d.ts","sourceRoot":"","sources":["../../src/functions/trinkets.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,WAAW,EACZ,MAAM,8BAA8B,CAAC;AA6BtC;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,WAAW,CAE1E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,GAAG,SAAS,CAkBxE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CActE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAc/D;AAED,kFAAkF;AAClF,wBAAgB,sBAAsB,IAAI,WAAW,EAAE,CAEtD;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAOhE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAErE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAErE;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAEtE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,IAAI,CAeN"}
+{"version":3,"file":"trinkets.d.ts","sourceRoot":"","sources":["../../src/functions/trinkets.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,WAAW,EACZ,MAAM,8BAA8B,CAAC;AA+BtC;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,WAAW,CAE1E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,GAAG,SAAS,CAkBxE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CActE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAOtE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAc/D;AAED,kFAAkF;AAClF,wBAAgB,sBAAsB,IAAI,WAAW,EAAE,CAEtD;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAOhE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAErE;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAErE;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAEtE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CASjE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,IAAI,CAeN"}

package/dist/functions/trinkets.lua

@@ -5,6 +5,8 @@ local TrinketSlot = ____isaac_2Dtypescript_2Ddefinitions.TrinketSlot
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____cachedClasses = require("core.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
+local ____constants = require("core.constants")
+local BLIND_ITEM_PNG_PATH = ____constants.BLIND_ITEM_PNG_PATH
 local ____constantsFirstLast = require("core.constantsFirstLast")
 local FIRST_TRINKET_TYPE = ____constantsFirstLast.FIRST_TRINKET_TYPE
 local LAST_VANILLA_TRINKET_TYPE = ____constantsFirstLast.LAST_VANILLA_TRINKET_TYPE
@@ -35,6 +37,7 @@ end
 -- 
 -- 1 << 15
 local GOLDEN_TRINKET_ADJUSTMENT = 32768
+local TRINKET_ANM2_PATH = "gfx/005.350_trinket.anm2"
 local TRINKET_SPRITE_LAYER = 0
 --- Helper function to get the corresponding golden trinket type from a normal trinket type.
 -- 
@@ -83,6 +86,19 @@ function ____exports.getTrinketDescription(self, trinketType)
     end
     return DEFAULT_TRINKET_DESCRIPTION
 end
+--- Helper function to get the path to a trinket PNG file. Returns the path to the question mark
+-- sprite (i.e. from Curse of the Blind) if the provided trinket type was not valid.
+-- 
+-- Note that this does not return the file name, but the full path to the trinket's PNG file. The
+-- function is named "GfxFilename" to correspond to the associated `ItemConfigItem.GfxFileName`
+-- field.
+function ____exports.getTrinketGfxFilename(self, trinketType)
+    local itemConfigItem = itemConfig:GetTrinket(trinketType)
+    if itemConfigItem == nil then
+        return BLIND_ITEM_PNG_PATH
+    end
+    return itemConfigItem.GfxFileName
+end
 --- Helper function to get the name of a trinket. Returns "Unknown" if the provided trinket type is
 -- not valid.
 -- 
@@ -125,6 +141,16 @@ end
 function ____exports.isModdedTrinketType(self, trinketType)
     return not ____exports.isVanillaTrinketType(nil, trinketType)
 end
+--- Helper function to generate a new sprite based on a collectible. If the provided collectible type
+-- is invalid, a sprite with a Curse of the Blind question mark will be returned.
+function ____exports.newTrinketSprite(self, trinketType)
+    local sprite = Sprite()
+    sprite:Load(TRINKET_ANM2_PATH, false)
+    local gfxFileName = ____exports.getTrinketGfxFilename(nil, trinketType)
+    sprite:ReplaceSpritesheet(TRINKET_SPRITE_LAYER, gfxFileName)
+    sprite:LoadGraphics()
+    return sprite
+end
 --- Helper function to change the sprite of a trinket entity.
 -- 
 -- For more information about removing the trinket sprite, see the documentation for the

package/dist/index.d.ts

@@ -2595,8 +2595,12 @@ export declare function getCollectibleDevilCoinPrice(collectibleType: Collectibl
 export declare function getCollectibleDevilHeartPrice(collectibleType: CollectibleType, player: EntityPlayer): PickupPrice;
 
 /**
- * Helper function to get the path to a collectible's sprite. Returns the path to the question mark
+ * Helper function to get the path to a collectible PNG file. Returns the path to the question mark
  * sprite (i.e. from Curse of the Blind) if the provided collectible type was not valid.
+ *
+ * Note that this does not return the file name, but the full path to the collectible's PNG file.
+ * The function is named "GfxFilename" to correspond to the associated `ItemConfigItem.GfxFileName`
+ * field.
  */
 export declare function getCollectibleGfxFilename(collectibleType: CollectibleType): string;
 
@@ -2801,6 +2805,16 @@ export declare function getCombinedBossSet(stage: int): ReadonlySet<string> | un
  */
 export declare function getCrawlSpaces(crawlSpaceVariant?: CrawlSpaceVariant): GridEntity[];
 
+/**
+ * Helper function to get the actual bit flag for modded curses.
+ *
+ * Will throw a runtime error if the provided curse does not exist.
+ *
+ * Use this over the `Isaac.GetCurseIdByName` method because that will return an integer instead of
+ * a bit flag.
+ */
+export declare function getCurseIDByName(name: string): LevelCurse;
+
 /**
  * Helper function to get the custom grid entities in the current room. Returns an array of tuples
  * containing the raw decoration grid entity and the associated entity data.
@@ -5028,6 +5042,16 @@ export declare function getTrinketArray(): readonly TrinketType[];
  */
 export declare function getTrinketDescription(trinketType: TrinketType): string;
 
+/**
+ * Helper function to get the path to a trinket PNG file. Returns the path to the question mark
+ * sprite (i.e. from Curse of the Blind) if the provided trinket type was not valid.
+ *
+ * Note that this does not return the file name, but the full path to the trinket's PNG file. The
+ * function is named "GfxFilename" to correspond to the associated `ItemConfigItem.GfxFileName`
+ * field.
+ */
+export declare function getTrinketGfxFilename(trinketType: TrinketType): string;
+
 /**
  * Helper function to get the name of a trinket. Returns "Unknown" if the provided trinket type is
  * not valid.
@@ -7560,7 +7584,7 @@ export declare enum ModCallbackCustom {
     POST_PLAYER_CHANGE_TYPE = 57,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when a player's collectible count is higher than
-     * what it was on the previous frame.
+     * what it was on the previous frame or when a new active collectible is acquired.
      *
      * When registering the callback, takes an optional second argument that will make the callback
      * only fire if the collectible matches the `CollectibleType` provided.
@@ -7575,7 +7599,7 @@ export declare enum ModCallbackCustom {
     POST_PLAYER_COLLECTIBLE_ADDED = 58,
     /**
      * Fires from the `POST_PEFFECT_UPDATE` callback when a player's collectible count is lower than
-     * what it was on the previous frame.
+     * what it was on the previous frame or when an active collectible is no longer present.
      *
      * When registering the callback, takes an optional second argument that will make the callback
      * only fire if the collectible matches the `CollectibleType` provided.
@@ -8131,6 +8155,12 @@ export declare const NEW_RUN_PLAYER_STARTING_POSITION: Vector;
  */
 export declare function newChargeBarSprites(maxCharges: int): ChargeBarSprites;
 
+/**
+ * Helper function to generate a new sprite based on a collectible. If the provided collectible type
+ * is invalid, a sprite with a Curse of the Blind question mark will be returned.
+ */
+export declare function newCollectibleSprite(collectibleType: CollectibleType): Sprite;
+
 export declare function newPickingUpItem(): PickingUpItem;
 
 /** Returns a `PlayerHealth` object with all zeros. */
@@ -8157,6 +8187,12 @@ export declare function newRNG(seed?: Seed): RNG;
  */
 export declare function newRoom(): int | undefined;
 
+/**
+ * Helper function to generate a new sprite based on a collectible. If the provided collectible type
+ * is invalid, a sprite with a Curse of the Blind question mark will be returned.
+ */
+export declare function newTrinketSprite(trinketType: TrinketType): Sprite;
+
 /**
  * Initializes a new TypeScriptToLua class in the situation where you do not know what kind of class
  * it is. This function requires that you provide an instantiated class of the same type, as it will

package/dist/sets/bossSets.lua

@@ -241,7 +241,7 @@ local MINES_BOSSES_SET = __TS__New(
         (tostring(EntityType.LARRY_JR) .. ".") .. tostring(LarryJrVariant.TUFF_TWIN),
         tostring(EntityType.REAP_CREEP) .. ".0",
         tostring(EntityType.HORNFEL) .. ".0",
-        tostring(EntityType.GIDEON) .. ".0"
+        tostring(EntityType.GREAT_GIDEON) .. ".0"
     }
 )
 --- Contains just the bosses in Ashpit (not e.g. Flooded Caves).
@@ -250,7 +250,7 @@ local ASHPIT_BOSSES_SET = __TS__New(
     {
         (tostring(EntityType.LARRY_JR) .. ".") .. tostring(LarryJrVariant.THE_SHELL),
         (tostring(EntityType.POLYCEPHALUS) .. ".") .. tostring(PolycephalusVariant.THE_PILE),
-        tostring(EntityType.GIDEON) .. ".0",
+        tostring(EntityType.GREAT_GIDEON) .. ".0",
         tostring(EntityType.SINGE) .. ".0",
         tostring(EntityType.CLUTCH) .. ".0"
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "8.6.0",
+  "version": "8.8.1",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -22,6 +22,6 @@
   "main": "dist/index",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^3.5.2"
+    "isaac-typescript-definitions": "^3.6.1"
   }
 }

package/src/enums/ModCallbackCustom.ts

@@ -959,7 +959,7 @@ export enum ModCallbackCustom {
 
   /**
    * Fires from the `POST_PEFFECT_UPDATE` callback when a player's collectible count is higher than
-   * what it was on the previous frame.
+   * what it was on the previous frame or when a new active collectible is acquired.
    *
    * When registering the callback, takes an optional second argument that will make the callback
    * only fire if the collectible matches the `CollectibleType` provided.
@@ -975,7 +975,7 @@ export enum ModCallbackCustom {
 
   /**
    * Fires from the `POST_PEFFECT_UPDATE` callback when a player's collectible count is lower than
-   * what it was on the previous frame.
+   * what it was on the previous frame or when an active collectible is no longer present.
    *
    * When registering the callback, takes an optional second argument that will make the callback
    * only fire if the collectible matches the `CollectibleType` provided.

package/src/features/playerInventory.ts

@@ -35,10 +35,16 @@ function newPlayerInventory(player: EntityPlayer) {
   const inventory: CollectibleType[] = [];
 
   for (const collectibleType of getCollectibleArray()) {
-    const numCollectibles = player.GetCollectibleNum(collectibleType, true);
-    repeat(numCollectibles, () => {
-      inventory.push(collectibleType);
-    });
+    // We have to use the `EntityPlayer.HasCollectible` method in addition to the
+    // `EntityPlayer.GetCollectibleNum` method in order to mitigate situations like Lilith's Incubus
+    // counting as a collectible. (The former method will return false for her innate Incubus, but
+    // the latter method will return 1.)
+    if (player.HasCollectible(collectibleType)) {
+      const numCollectibles = player.GetCollectibleNum(collectibleType, true);
+      repeat(numCollectibles, () => {
+        inventory.push(collectibleType);
+      });
+    }
   }
 
   return inventory;
@@ -72,6 +78,9 @@ function useItemD4(
   _rng: RNG,
   player: EntityPlayer,
 ): boolean | undefined {
+  // This function is also triggered when the player uses D100, D Infinity, a 1-pip dice room, or a
+  // 6-pip dice room. (Genesis should be automatically handled by the
+  // `POST_PLAYER_COLLECTIBLE_REMOVED` callback.)
   resetInventory(player);
 
   return undefined;

package/src/functions/collectibles.ts

@@ -31,6 +31,7 @@ import { getRoomListIndex } from "./roomData";
 import { clearSprite, spriteEquals } from "./sprites";
 import { irange } from "./utils";
 
+const COLLECTIBLE_ANM2_PATH = "gfx/005.100_collectible.anm2";
 const COLLECTIBLE_SPRITE_LAYER = 1;
 const COLLECTIBLE_SHADOW_LAYER = 4;
 
@@ -159,8 +160,12 @@ export function getCollectibleDevilHeartPrice(
 }
 
 /**
- * Helper function to get the path to a collectible's sprite. Returns the path to the question mark
+ * Helper function to get the path to a collectible PNG file. Returns the path to the question mark
  * sprite (i.e. from Curse of the Blind) if the provided collectible type was not valid.
+ *
+ * Note that this does not return the file name, but the full path to the collectible's PNG file.
+ * The function is named "GfxFilename" to correspond to the associated `ItemConfigItem.GfxFileName`
+ * field.
  */
 export function getCollectibleGfxFilename(
   collectibleType: CollectibleType,
@@ -469,6 +474,25 @@ export function isVanillaCollectibleType(
   return collectibleType <= LAST_VANILLA_COLLECTIBLE_TYPE;
 }
 
+/**
+ * Helper function to generate a new sprite based on a collectible. If the provided collectible type
+ * is invalid, a sprite with a Curse of the Blind question mark will be returned.
+ */
+export function newCollectibleSprite(collectibleType: CollectibleType): Sprite {
+  const sprite = Sprite();
+  sprite.Load(COLLECTIBLE_ANM2_PATH, false);
+
+  // We want to clear the pedestal layers so that the returned sprite only has the collectible
+  // image.
+  clearSprite(sprite);
+
+  const gfxFileName = getCollectibleGfxFilename(collectibleType);
+  sprite.ReplaceSpritesheet(COLLECTIBLE_SPRITE_LAYER, gfxFileName);
+  sprite.LoadGraphics();
+
+  return sprite;
+}
+
 /**
  * Helper function to put a message in the log.txt file to let the Rebirth Item Tracker know that it
  * should remove an item.

package/src/functions/curses.ts

@@ -2,6 +2,27 @@ import { LevelCurse } from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
 import { hasFlag } from "./flag";
 
+/**
+ * Helper function to get the actual bit flag for modded curses.
+ *
+ * Will throw a runtime error if the provided curse does not exist.
+ *
+ * Use this over the `Isaac.GetCurseIdByName` method because that will return an integer instead of
+ * a bit flag.
+ */
+export function getCurseIDByName(name: string): LevelCurse {
+  const curseID = Isaac.GetCurseIdByName(name);
+  if (curseID === -1) {
+    error(
+      `Failed to get the curse ID corresponding to the curse name of "${curseID}". Does this name match what you put in the "content/curses.xml" file?`,
+    );
+  }
+
+  // For example, the final vanilla curse is "Curse of the Giant", which has an ID of 8. This
+  // corresponds to `LevelCurse.GIANT`, which has a value of `1 << 7`.
+  return (1 << (curseID - 1)) as LevelCurse;
+}
+
 export function hasCurse(curse: LevelCurse): boolean {
   const level = game.GetLevel();
   const curses = level.GetCurses();

package/src/functions/trinkets.ts

@@ -4,6 +4,7 @@ import {
   TrinketType,
 } from "isaac-typescript-definitions";
 import { itemConfig } from "../core/cachedClasses";
+import { BLIND_ITEM_PNG_PATH } from "../core/constants";
 import {
   FIRST_TRINKET_TYPE,
   LAST_VANILLA_TRINKET_TYPE,
@@ -29,6 +30,7 @@ import { irange } from "./utils";
  */
 const GOLDEN_TRINKET_ADJUSTMENT = 32768;
 
+const TRINKET_ANM2_PATH = "gfx/005.350_trinket.anm2";
 const TRINKET_SPRITE_LAYER = 0;
 
 /**
@@ -95,6 +97,23 @@ export function getTrinketDescription(trinketType: TrinketType): string {
   return DEFAULT_TRINKET_DESCRIPTION;
 }
 
+/**
+ * Helper function to get the path to a trinket PNG file. Returns the path to the question mark
+ * sprite (i.e. from Curse of the Blind) if the provided trinket type was not valid.
+ *
+ * Note that this does not return the file name, but the full path to the trinket's PNG file. The
+ * function is named "GfxFilename" to correspond to the associated `ItemConfigItem.GfxFileName`
+ * field.
+ */
+export function getTrinketGfxFilename(trinketType: TrinketType): string {
+  const itemConfigItem = itemConfig.GetTrinket(trinketType);
+  if (itemConfigItem === undefined) {
+    return BLIND_ITEM_PNG_PATH;
+  }
+
+  return itemConfigItem.GfxFileName;
+}
+
 /**
  * Helper function to get the name of a trinket. Returns "Unknown" if the provided trinket type is
  * not valid.
@@ -155,6 +174,21 @@ export function isVanillaTrinketType(trinketType: TrinketType): boolean {
   return trinketType <= LAST_VANILLA_TRINKET_TYPE;
 }
 
+/**
+ * Helper function to generate a new sprite based on a collectible. If the provided collectible type
+ * is invalid, a sprite with a Curse of the Blind question mark will be returned.
+ */
+export function newTrinketSprite(trinketType: TrinketType): Sprite {
+  const sprite = Sprite();
+  sprite.Load(TRINKET_ANM2_PATH, false);
+
+  const gfxFileName = getTrinketGfxFilename(trinketType);
+  sprite.ReplaceSpritesheet(TRINKET_SPRITE_LAYER, gfxFileName);
+  sprite.LoadGraphics();
+
+  return sprite;
+}
+
 /**
  * Helper function to change the sprite of a trinket entity.
  *

package/src/sets/bossSets.ts

@@ -193,14 +193,14 @@ const MINES_BOSSES_SET: ReadonlySet<string> = new Set([
   `${EntityType.LARRY_JR}.${LarryJrVariant.TUFF_TWIN}`, // 19.2
   `${EntityType.REAP_CREEP}.0`, // 900.0
   `${EntityType.HORNFEL}.0`, // 906.0
-  `${EntityType.GIDEON}.0`, // 907.0
+  `${EntityType.GREAT_GIDEON}.0`, // 907.0
 ]);
 
 /** Contains just the bosses in Ashpit (not e.g. Flooded Caves). */
 const ASHPIT_BOSSES_SET: ReadonlySet<string> = new Set([
   `${EntityType.LARRY_JR}.${LarryJrVariant.THE_SHELL}`, // 19.3
   `${EntityType.POLYCEPHALUS}.${PolycephalusVariant.THE_PILE}`, // 269.1
-  `${EntityType.GIDEON}.0`, // 907.0
+  `${EntityType.GREAT_GIDEON}.0`, // 907.0
   `${EntityType.SINGE}.0`, // 915.0
   `${EntityType.CLUTCH}.0`, // 921.0
 ]);