isaacscript-common 15.4.5 → 15.5.0

package/dist/index.d.ts

@@ -6817,7 +6817,7 @@ export declare function includes<T>(array: T[], element: T): boolean;
 export declare function inCrawlSpace(): boolean;
 
 /**
- * Helper function to detect if the current room is one of the room in the Death Certificate area.
+ * Helper function to detect if the current room is one of the rooms in the Death Certificate area.
  */
 export declare function inDeathCertificateArea(): boolean;
 
@@ -11407,6 +11407,7 @@ declare class PlayerCollectibleDetection extends Feature {
      */
     private checkActiveItemsChanged;
     private entityTakeDmgPlayer;
+    private postItemPickup;
 }
 
 export declare function playerConvertBlackHeartsToSoulHearts(player: EntityPlayer): void;
@@ -12885,9 +12886,9 @@ declare class SaveDataManager extends Feature {
      * saved to disk on game exit. (For example, if they contain functions or other non-serializable
      * data.) For these cases, set the second argument to `false`.
      *
-     * Note that when the player uses Glowing Hour Glass, the save data manager will automatically
+     * Note that when the player uses Glowing Hourglass, the save data manager will automatically
      * restore any variables on a "run" or "level" object with a backup that was created when the room
-     * was entered. Thus, you should not have to explicitly program support for Glowing Hour Glass
+     * was entered. Thus, you should not have to explicitly program support for Glowing Hourglass
      * into your mod features that use the save data manager. If this is undesired for your specific
      * use-case, then add a key of `__ignoreGlowingHourGlass: true` to your "run" or "level" object.
      *

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 15.4.5
+isaacscript-common 15.5.0
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -11199,7 +11199,19 @@ local TearFlagInternal = {
     CARD_DROP_DEATH = getTearFlag(nil, 79),
     RUNE_DROP_DEATH = getTearFlag(nil, 80),
     TELEPORT = getTearFlag(nil, 81),
-    SHORT_RANGE = getTearFlag(nil, 82),
+    TEAR_DECELERATE = getTearFlag(nil, 82),
+    TEAR_ACCELERATE = getTearFlag(nil, 83),
+    BOUNCE_WALLS_ONLY = getTearFlag(nil, 104),
+    NO_GRID_DAMAGE = getTearFlag(nil, 105),
+    BACKSTAB = getTearFlag(nil, 106),
+    FETUS_SWORD = getTearFlag(nil, 107),
+    FETUS_BONE = getTearFlag(nil, 108),
+    FETUS_KNIFE = getTearFlag(nil, 109),
+    FETUS_TECH_X = getTearFlag(nil, 110),
+    FETUS_TECH = getTearFlag(nil, 111),
+    FETUS_BRIMSTONE = getTearFlag(nil, 112),
+    FETUS_BOMBER = getTearFlag(nil, 113),
+    FETUS = getTearFlag(nil, 114),
     REROLL_ROCK_WISP = getTearFlag(nil, 115),
     MOM_STOMP_WISP = getTearFlag(nil, 116),
     ENEMY_TO_WISP = getTearFlag(nil, 117),
@@ -12263,6 +12275,8 @@ ____exports.ModCallback.PRE_SPAWN_CLEAN_AWARD = 70
 ____exports.ModCallback[____exports.ModCallback.PRE_SPAWN_CLEAN_AWARD] = "PRE_SPAWN_CLEAN_AWARD"
 ____exports.ModCallback.PRE_ROOM_ENTITY_SPAWN = 71
 ____exports.ModCallback[____exports.ModCallback.PRE_ROOM_ENTITY_SPAWN] = "PRE_ROOM_ENTITY_SPAWN"
+____exports.ModCallback.PRE_ENTITY_DEVOLVE = 72
+____exports.ModCallback[____exports.ModCallback.PRE_ENTITY_DEVOLVE] = "PRE_ENTITY_DEVOLVE"
 return ____exports
  end,
 ["lua_modules.isaac-typescript-definitions.dist.src.enums.Mouse"] = function(...) 
@@ -14865,8 +14879,8 @@ ____exports.SoundEffect.BEAST_GROWL = 815
 ____exports.SoundEffect[____exports.SoundEffect.BEAST_GROWL] = "BEAST_GROWL"
 ____exports.SoundEffect.BEAST_GRUMBLE = 816
 ____exports.SoundEffect[____exports.SoundEffect.BEAST_GRUMBLE] = "BEAST_GRUMBLE"
-____exports.SoundEffect.ULTRA_FAMINE_SHOOT = 817
-____exports.SoundEffect[____exports.SoundEffect.ULTRA_FAMINE_SHOOT] = "ULTRA_FAMINE_SHOOT"
+____exports.SoundEffect.FAMINE_GRUNT = 817
+____exports.SoundEffect[____exports.SoundEffect.FAMINE_GRUNT] = "FAMINE_GRUNT"
 ____exports.SoundEffect.G_FUEL_1 = 818
 ____exports.SoundEffect[____exports.SoundEffect.G_FUEL_1] = "G_FUEL_1"
 ____exports.SoundEffect.G_FUEL_2 = 819
@@ -14875,28 +14889,28 @@ ____exports.SoundEffect.G_FUEL_3 = 820
 ____exports.SoundEffect[____exports.SoundEffect.G_FUEL_3] = "G_FUEL_3"
 ____exports.SoundEffect.G_FUEL_4 = 821
 ____exports.SoundEffect[____exports.SoundEffect.G_FUEL_4] = "G_FUEL_4"
-____exports.SoundEffect.EXPLOSION_SMALL = 822
-____exports.SoundEffect[____exports.SoundEffect.EXPLOSION_SMALL] = "EXPLOSION_SMALL"
-____exports.SoundEffect.EXPLOSION_BIG = 823
-____exports.SoundEffect[____exports.SoundEffect.EXPLOSION_BIG] = "EXPLOSION_BIG"
-____exports.SoundEffect.GUN_SHOT_MEDIUM = 824
-____exports.SoundEffect[____exports.SoundEffect.GUN_SHOT_MEDIUM] = "GUN_SHOT_MEDIUM"
-____exports.SoundEffect.GUN_SHOT_SMALL = 825
-____exports.SoundEffect[____exports.SoundEffect.GUN_SHOT_SMALL] = "GUN_SHOT_SMALL"
-____exports.SoundEffect.GUN_SHOT_LARGE = 826
-____exports.SoundEffect[____exports.SoundEffect.GUN_SHOT_LARGE] = "GUN_SHOT_LARGE"
-____exports.SoundEffect.GUN_SHOT_SPREAD = 827
-____exports.SoundEffect[____exports.SoundEffect.GUN_SHOT_SPREAD] = "GUN_SHOT_SPREAD"
-____exports.SoundEffect.AIR_HORN = 828
-____exports.SoundEffect[____exports.SoundEffect.AIR_HORN] = "AIR_HORN"
-____exports.SoundEffect.ITEM_EXPLOSION = 829
-____exports.SoundEffect[____exports.SoundEffect.ITEM_EXPLOSION] = "ITEM_EXPLOSION"
-____exports.SoundEffect.GUN_SHOT_MINI = 830
-____exports.SoundEffect[____exports.SoundEffect.GUN_SHOT_MINI] = "GUN_SHOT_MINI"
-____exports.SoundEffect.BULLET_RICOCHET = 831
-____exports.SoundEffect[____exports.SoundEffect.BULLET_RICOCHET] = "BULLET_RICOCHET"
-____exports.SoundEffect.ROCKET_LAUNCHER = 832
-____exports.SoundEffect[____exports.SoundEffect.ROCKET_LAUNCHER] = "ROCKET_LAUNCHER"
+____exports.SoundEffect.G_FUEL_EXPLOSION_SMALL = 822
+____exports.SoundEffect[____exports.SoundEffect.G_FUEL_EXPLOSION_SMALL] = "G_FUEL_EXPLOSION_SMALL"
+____exports.SoundEffect.G_FUEL_EXPLOSION_BIG = 823
+____exports.SoundEffect[____exports.SoundEffect.G_FUEL_EXPLOSION_BIG] = "G_FUEL_EXPLOSION_BIG"
+____exports.SoundEffect.G_FUEL_GUNSHOT_MEDIUM = 824
+____exports.SoundEffect[____exports.SoundEffect.G_FUEL_GUNSHOT_MEDIUM] = "G_FUEL_GUNSHOT_MEDIUM"
+____exports.SoundEffect.G_FUEL_GUNSHOT_SMALL = 825
+____exports.SoundEffect[____exports.SoundEffect.G_FUEL_GUNSHOT_SMALL] = "G_FUEL_GUNSHOT_SMALL"
+____exports.SoundEffect.G_FUEL_GUNSHOT_LARGE = 826
+____exports.SoundEffect[____exports.SoundEffect.G_FUEL_GUNSHOT_LARGE] = "G_FUEL_GUNSHOT_LARGE"
+____exports.SoundEffect.G_FUEL_GUNSHOT_SPREAD = 827
+____exports.SoundEffect[____exports.SoundEffect.G_FUEL_GUNSHOT_SPREAD] = "G_FUEL_GUNSHOT_SPREAD"
+____exports.SoundEffect.G_FUEL_AIR_HORN = 828
+____exports.SoundEffect[____exports.SoundEffect.G_FUEL_AIR_HORN] = "G_FUEL_AIR_HORN"
+____exports.SoundEffect.G_FUEL_ITEM_APPEAR = 829
+____exports.SoundEffect[____exports.SoundEffect.G_FUEL_ITEM_APPEAR] = "G_FUEL_ITEM_APPEAR"
+____exports.SoundEffect.G_FUEL_GUNSHOT_MINI = 830
+____exports.SoundEffect[____exports.SoundEffect.G_FUEL_GUNSHOT_MINI] = "G_FUEL_GUNSHOT_MINI"
+____exports.SoundEffect.G_FUEL_BULLET_RICOCHET = 831
+____exports.SoundEffect[____exports.SoundEffect.G_FUEL_BULLET_RICOCHET] = "G_FUEL_BULLET_RICOCHET"
+____exports.SoundEffect.G_FUEL_ROCKET_LAUNCHER = 832
+____exports.SoundEffect[____exports.SoundEffect.G_FUEL_ROCKET_LAUNCHER] = "G_FUEL_ROCKET_LAUNCHER"
 return ____exports
  end,
 ["lua_modules.isaac-typescript-definitions.dist.src.enums.StageID"] = function(...) 
@@ -18737,7 +18751,7 @@ ____exports.COLLECTIBLE_TYPE_TO_NAME_MAP = __TS__New(Map, {
     {419, "Teleport 2.0"},
     {420, "Black Powder"},
     {421, "Kidney Bean"},
-    {422, "Glowing Hour Glass"},
+    {422, "Glowing Hourglass"},
     {423, "Circle of Protection"},
     {424, "Sack Head"},
     {425, "Night Light"},
@@ -32111,6 +32125,8 @@ local PlayerForm = ____isaac_2Dtypescript_2Ddefinitions.PlayerForm
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____cachedClasses = require("src.core.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
+local ____constants = require("src.core.constants")
+local FIRST_GLITCHED_COLLECTIBLE_TYPE = ____constants.FIRST_GLITCHED_COLLECTIBLE_TYPE
 local ____decorators = require("src.decorators")
 local Exported = ____decorators.Exported
 local ____ISCFeature = require("src.enums.ISCFeature")
@@ -32435,6 +32451,22 @@ function ModdedElementSets.prototype.getPlayerCollectibleMap(self, player)
             collectibleMap:set(collectibleType, numCollectibles)
         end
     end
+    if player:HasCollectible(CollectibleType.TMTRAINER) then
+        local collectibleType = FIRST_GLITCHED_COLLECTIBLE_TYPE
+        local itemConfigItem
+        repeat
+            do
+                itemConfigItem = itemConfig:GetCollectible(collectibleType)
+                if itemConfigItem ~= nil then
+                    local hasCollectibles = player:HasCollectible(collectibleType, true)
+                    if hasCollectibles then
+                        collectibleMap:set(collectibleType, 1)
+                    end
+                end
+                collectibleType = collectibleType - 1
+            end
+        until not (itemConfigItem ~= nil)
+    end
     return collectibleMap
 end
 function ModdedElementSets.prototype.getPlayerCollectiblesWithCacheFlag(self, player, cacheFlag)
@@ -32593,10 +32625,13 @@ local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
+local ItemType = ____isaac_2Dtypescript_2Ddefinitions.ItemType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
 local ____ISCFeature = require("src.enums.ISCFeature")
 local ISCFeature = ____ISCFeature.ISCFeature
+local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____array = require("src.functions.array")
 local arrayEquals = ____array.arrayEquals
 local ____enums = require("src.functions.enums")
@@ -32669,8 +32704,17 @@ function PlayerCollectibleDetection.prototype.____constructor(self, postPlayerCo
         end)
         return nil
     end
+    self.postItemPickup = function(____, player, pickingUpItem)
+        if pickingUpItem.itemType == ItemType.TRINKET or pickingUpItem.itemType == ItemType.NULL then
+            return
+        end
+        local newCollectibleCount = player:GetCollectibleCount()
+        mapSetPlayer(nil, self.v.run.playersCollectibleCount, player, newCollectibleCount)
+        self:updateCollectibleMapAndFire(player, 1)
+    end
     self.featuresUsed = {ISCFeature.MODDED_ELEMENT_SETS, ISCFeature.RUN_IN_N_FRAMES}
     self.callbacksUsed = {{ModCallback.POST_USE_ITEM, {self.useItemD4, CollectibleType.D4}}, {ModCallback.POST_PEFFECT_UPDATE, {self.postPEffectUpdate}}, {ModCallback.ENTITY_TAKE_DMG, {self.entityTakeDmgPlayer, EntityType.PLAYER}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_ITEM_PICKUP, {self.postItemPickup}}}
     self.postPlayerCollectibleAdded = postPlayerCollectibleAdded
     self.postPlayerCollectibleRemoved = postPlayerCollectibleRemoved
     self.moddedElementSets = moddedElementSets

package/dist/src/classes/features/callbackLogic/PlayerCollectibleDetection.d.ts

@@ -45,5 +45,6 @@ export declare class PlayerCollectibleDetection extends Feature {
      */
     private checkActiveItemsChanged;
     private entityTakeDmgPlayer;
+    private postItemPickup;
 }
 //# sourceMappingURL=PlayerCollectibleDetection.d.ts.map

package/dist/src/classes/features/callbackLogic/PlayerCollectibleDetection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PlayerCollectibleDetection.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/PlayerCollectibleDetection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EAKhB,MAAM,8BAA8B,CAAC;AAWtC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,0BAA2B,SAAQ,OAAO;IACrC,CAAC;;;;;;MAYf;IAEF,OAAO,CAAC,0BAA0B,CAA6B;IAC/D,OAAO,CAAC,4BAA4B,CAA+B;IACnE,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,YAAY,CAAe;gBAGjC,0BAA0B,EAAE,0BAA0B,EACtD,4BAA4B,EAAE,4BAA4B,EAC1D,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,YAAY;IAwB5B;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,2BAA2B;IA0CnC,OAAO,CAAC,SAAS,CAqBf;IAGF,OAAO,CAAC,iBAAiB,CAqBvB;IAEF;;;;;;;;OAQG;IACH,OAAO,CAAC,uBAAuB;IAmC/B,OAAO,CAAC,mBAAmB,CAgCzB;CACH"}
+{"version":3,"file":"PlayerCollectibleDetection.d.ts","sourceRoot":"","sources":["../../../../../src/classes/features/callbackLogic/PlayerCollectibleDetection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EAMhB,MAAM,8BAA8B,CAAC;AAatC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,0BAA2B,SAAQ,OAAO;IACrC,CAAC;;;;;;MAYf;IAEF,OAAO,CAAC,0BAA0B,CAA6B;IAC/D,OAAO,CAAC,4BAA4B,CAA+B;IACnE,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,YAAY,CAAe;gBAGjC,0BAA0B,EAAE,0BAA0B,EACtD,4BAA4B,EAAE,4BAA4B,EAC1D,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,YAAY;IA4B5B;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,2BAA2B;IA0CnC,OAAO,CAAC,SAAS,CAqBf;IAGF,OAAO,CAAC,iBAAiB,CAqBvB;IAEF;;;;;;;;OAQG;IACH,OAAO,CAAC,uBAAuB;IAmC/B,OAAO,CAAC,mBAAmB,CAgCzB;IAKF,OAAO,CAAC,cAAc,CAmBpB;CACH"}

package/dist/src/classes/features/callbackLogic/PlayerCollectibleDetection.lua

@@ -16,10 +16,13 @@ local ActiveSlot = ____isaac_2Dtypescript_2Ddefinitions.ActiveSlot
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
+local ItemType = ____isaac_2Dtypescript_2Ddefinitions.ItemType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
 local ____ISCFeature = require("src.enums.ISCFeature")
 local ISCFeature = ____ISCFeature.ISCFeature
+local ____ModCallbackCustom = require("src.enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____array = require("src.functions.array")
 local arrayEquals = ____array.arrayEquals
 local ____enums = require("src.functions.enums")
@@ -92,8 +95,17 @@ function PlayerCollectibleDetection.prototype.____constructor(self, postPlayerCo
         end)
         return nil
     end
+    self.postItemPickup = function(____, player, pickingUpItem)
+        if pickingUpItem.itemType == ItemType.TRINKET or pickingUpItem.itemType == ItemType.NULL then
+            return
+        end
+        local newCollectibleCount = player:GetCollectibleCount()
+        mapSetPlayer(nil, self.v.run.playersCollectibleCount, player, newCollectibleCount)
+        self:updateCollectibleMapAndFire(player, 1)
+    end
     self.featuresUsed = {ISCFeature.MODDED_ELEMENT_SETS, ISCFeature.RUN_IN_N_FRAMES}
     self.callbacksUsed = {{ModCallback.POST_USE_ITEM, {self.useItemD4, CollectibleType.D4}}, {ModCallback.POST_PEFFECT_UPDATE, {self.postPEffectUpdate}}, {ModCallback.ENTITY_TAKE_DMG, {self.entityTakeDmgPlayer, EntityType.PLAYER}}}
+    self.customCallbacksUsed = {{ModCallbackCustom.POST_ITEM_PICKUP, {self.postItemPickup}}}
     self.postPlayerCollectibleAdded = postPlayerCollectibleAdded
     self.postPlayerCollectibleRemoved = postPlayerCollectibleRemoved
     self.moddedElementSets = moddedElementSets

package/dist/src/classes/features/other/ModdedElementSets.d.ts.map

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

package/dist/src/classes/features/other/ModdedElementSets.lua

@@ -15,6 +15,8 @@ local PlayerForm = ____isaac_2Dtypescript_2Ddefinitions.PlayerForm
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
 local ____cachedClasses = require("src.core.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
+local ____constants = require("src.core.constants")
+local FIRST_GLITCHED_COLLECTIBLE_TYPE = ____constants.FIRST_GLITCHED_COLLECTIBLE_TYPE
 local ____decorators = require("src.decorators")
 local Exported = ____decorators.Exported
 local ____ISCFeature = require("src.enums.ISCFeature")
@@ -339,6 +341,22 @@ function ModdedElementSets.prototype.getPlayerCollectibleMap(self, player)
             collectibleMap:set(collectibleType, numCollectibles)
         end
     end
+    if player:HasCollectible(CollectibleType.TMTRAINER) then
+        local collectibleType = FIRST_GLITCHED_COLLECTIBLE_TYPE
+        local itemConfigItem
+        repeat
+            do
+                itemConfigItem = itemConfig:GetCollectible(collectibleType)
+                if itemConfigItem ~= nil then
+                    local hasCollectibles = player:HasCollectible(collectibleType, true)
+                    if hasCollectibles then
+                        collectibleMap:set(collectibleType, 1)
+                    end
+                end
+                collectibleType = collectibleType - 1
+            end
+        until not (itemConfigItem ~= nil)
+    end
     return collectibleMap
 end
 function ModdedElementSets.prototype.getPlayerCollectiblesWithCacheFlag(self, player, cacheFlag)

package/dist/src/classes/features/other/SaveDataManager.d.ts

@@ -121,9 +121,9 @@ export declare class SaveDataManager extends Feature {
      * saved to disk on game exit. (For example, if they contain functions or other non-serializable
      * data.) For these cases, set the second argument to `false`.
      *
-     * Note that when the player uses Glowing Hour Glass, the save data manager will automatically
+     * Note that when the player uses Glowing Hourglass, the save data manager will automatically
      * restore any variables on a "run" or "level" object with a backup that was created when the room
-     * was entered. Thus, you should not have to explicitly program support for Glowing Hour Glass
+     * was entered. Thus, you should not have to explicitly program support for Glowing Hourglass
      * into your mod features that use the save data manager. If this is undesired for your specific
      * use-case, then add a key of `__ignoreGlowingHourGlass: true` to your "run" or "level" object.
      *

package/dist/src/classes/features/other/saveDataManager/glowingHourGlass.lua

@@ -11,7 +11,7 @@ local ____table = require("src.functions.table")
 local iterateTableInOrder = ____table.iterateTableInOrder
 local ____constants = require("src.classes.features.other.saveDataManager.constants")
 local SAVE_DATA_MANAGER_DEBUG = ____constants.SAVE_DATA_MANAGER_DEBUG
---- When the Glowing Hour Glass is used, certain save data keys will automatically be restored to a
+--- When the Glowing Hourglass is used, certain save data keys will automatically be restored to a
 -- backup.
 local GLOWING_HOUR_GLASS_BACKUP_KEYS = {SaveDataKey.RUN, SaveDataKey.LEVEL}
 local IGNORE_GLOWING_HOUR_GLASS_KEY = "__ignoreGlowingHourGlass"

package/dist/src/functions/rooms.d.ts

@@ -113,7 +113,7 @@ export declare function inBossRoomOf(bossID: BossID): boolean;
  */
 export declare function inCrawlSpace(): boolean;
 /**
- * Helper function to detect if the current room is one of the room in the Death Certificate area.
+ * Helper function to detect if the current room is one of the rooms in the Death Certificate area.
  */
 export declare function inDeathCertificateArea(): boolean;
 /**

package/dist/src/functions/rooms.lua

@@ -277,7 +277,7 @@ function ____exports.inCrawlSpace(self)
     local roomSubType = getRoomSubType(nil)
     return roomType == RoomType.DUNGEON and roomSubType == asNumber(nil, DungeonSubType.NORMAL)
 end
---- Helper function to detect if the current room is one of the room in the Death Certificate area.
+--- Helper function to detect if the current room is one of the rooms in the Death Certificate area.
 function ____exports.inDeathCertificateArea(self)
     local roomStageID = getRoomStageID(nil)
     local roomSubType = getRoomSubType(nil)

package/dist/src/maps/collectibleTypeToNameMap.lua

@@ -427,7 +427,7 @@ ____exports.COLLECTIBLE_TYPE_TO_NAME_MAP = __TS__New(Map, {
     {419, "Teleport 2.0"},
     {420, "Black Powder"},
     {421, "Kidney Bean"},
-    {422, "Glowing Hour Glass"},
+    {422, "Glowing Hourglass"},
     {423, "Circle of Protection"},
     {424, "Sack Head"},
     {425, "Night Light"},

package/package.json

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

package/src/classes/features/callbackLogic/GameReorderedCallbacks.ts

@@ -67,7 +67,7 @@ export class GameReorderedCallbacks extends Feature {
   // ModCallback.POST_USE_ITEM (3)
   // CollectibleType.GLOWING_HOUR_GLASS (422)
   private useItemGlowingHourGlass = (): boolean | undefined => {
-    // If Glowing Hour Glass is used on the first room of a floor, it will send the player to the
+    // If Glowing Hourglass is used on the first room of a floor, it will send the player to the
     // previous floor without triggering the `POST_NEW_LEVEL` callback. Manually check for this.
     this.usedGlowingHourGlass = true;
 
@@ -109,7 +109,7 @@ export class GameReorderedCallbacks extends Feature {
       this.usedGlowingHourGlass = false;
 
       if (this.currentStage !== stage || this.currentStageType !== stageType) {
-        // The player has used the Glowing Hour Glass to take them to the previous floor (which does
+        // The player has used the Glowing Hourglass to take them to the previous floor (which does
         // not trigger the `POST_NEW_LEVEL` callback). Emulate what happens in the `POST_NEW_LEVEL`
         // callback.
         this.recordCurrentStage();

package/src/classes/features/callbackLogic/PlayerCollectibleDetection.ts

@@ -3,10 +3,12 @@ import {
   CollectibleType,
   DamageFlag,
   EntityType,
+  ItemType,
   ModCallback,
   PlayerType,
 } from "isaac-typescript-definitions";
 import { ISCFeature } from "../../../enums/ISCFeature";
+import { ModCallbackCustom } from "../../../enums/ModCallbackCustom";
 import { arrayEquals } from "../../../functions/array";
 import { getEnumValues } from "../../../functions/enums";
 import { hasFlag } from "../../../functions/flag";
@@ -16,6 +18,7 @@ import {
 } from "../../../functions/playerDataStructures";
 import { getPlayerFromPtr } from "../../../functions/players";
 import { repeat } from "../../../functions/utils";
+import { PickingUpItem } from "../../../types/PickingUpItem";
 import { PlayerIndex } from "../../../types/PlayerIndex";
 import { PostPlayerCollectibleAdded } from "../../callbacks/PostPlayerCollectibleAdded";
 import { PostPlayerCollectibleRemoved } from "../../callbacks/PostPlayerCollectibleRemoved";
@@ -66,6 +69,10 @@ export class PlayerCollectibleDetection extends Feature {
       ], // 11
     ];
 
+    this.customCallbacksUsed = [
+      [ModCallbackCustom.POST_ITEM_PICKUP, [this.postItemPickup]],
+    ];
+
     this.postPlayerCollectibleAdded = postPlayerCollectibleAdded;
     this.postPlayerCollectibleRemoved = postPlayerCollectibleRemoved;
     this.moddedElementSets = moddedElementSets;
@@ -250,4 +257,28 @@ export class PlayerCollectibleDetection extends Feature {
 
     return undefined;
   };
+
+  // ModCallbackCustom.POST_ITEM_PICKUP
+  // We need to handle TMTRAINER collectibles, since they do not cause the player's collectible
+  // count to change.
+  private postItemPickup = (
+    player: EntityPlayer,
+    pickingUpItem: PickingUpItem,
+  ) => {
+    if (
+      pickingUpItem.itemType === ItemType.TRINKET ||
+      pickingUpItem.itemType === ItemType.NULL
+    ) {
+      return;
+    }
+
+    const newCollectibleCount = player.GetCollectibleCount();
+    mapSetPlayer(
+      this.v.run.playersCollectibleCount,
+      player,
+      newCollectibleCount,
+    );
+
+    this.updateCollectibleMapAndFire(player, 1);
+  };
 }

package/src/classes/features/other/ModdedElementSets.ts

@@ -6,6 +6,7 @@ import {
   TrinketType,
 } from "isaac-typescript-definitions";
 import { itemConfig } from "../../../core/cachedClasses";
+import { FIRST_GLITCHED_COLLECTIBLE_TYPE } from "../../../core/constants";
 import { Exported } from "../../../decorators";
 import { ISCFeature } from "../../../enums/ISCFeature";
 import {
@@ -603,6 +604,27 @@ export class ModdedElementSets extends Feature {
       }
     }
 
+    // If the player has TMTRAINER, they might also have glitched items.
+    if (player.HasCollectible(CollectibleType.TMTRAINER)) {
+      let collectibleType = FIRST_GLITCHED_COLLECTIBLE_TYPE;
+      let itemConfigItem: Readonly<ItemConfigItem> | undefined;
+      do {
+        itemConfigItem = itemConfig.GetCollectible(collectibleType);
+
+        if (itemConfigItem !== undefined) {
+          // The `EntityPlayer.GetCollectibleNum` method is bugged with TMTrainer items and will
+          // always return 0. To work around this, we simply assume that if the player has the
+          // collectible, then they have one copy of the item.
+          const hasCollectibles = player.HasCollectible(collectibleType, true);
+          if (hasCollectibles) {
+            collectibleMap.set(collectibleType, 1);
+          }
+        }
+
+        collectibleType--; // eslint-disable-line isaacscript/strict-enums
+      } while (itemConfigItem !== undefined);
+    }
+
     return collectibleMap;
   }
 

package/src/classes/features/other/SaveDataManager.ts

@@ -126,7 +126,7 @@ export class SaveDataManager extends Feature {
     }
     this.loadedDataOnThisRun = true;
 
-    // Handle the race-condition of using the Glowing Hour Glass and then resetting the run.
+    // Handle the race-condition of using the Glowing Hourglass and then resetting the run.
     this.restoreGlowingHourGlassDataOnNextRoom = false;
 
     // We want to unconditionally load save data on every new run since there might be persistent
@@ -182,7 +182,7 @@ export class SaveDataManager extends Feature {
       SaveDataKey.ROOM,
     );
 
-    // Handle the Glowing Hour Glass.
+    // Handle the Glowing Hourglass.
     if (this.restoreGlowingHourGlassDataOnNextRoom) {
       this.restoreGlowingHourGlassDataOnNextRoom = false;
       restoreGlowingHourGlassBackup(
@@ -277,9 +277,9 @@ export class SaveDataManager extends Feature {
    * saved to disk on game exit. (For example, if they contain functions or other non-serializable
    * data.) For these cases, set the second argument to `false`.
    *
-   * Note that when the player uses Glowing Hour Glass, the save data manager will automatically
+   * Note that when the player uses Glowing Hourglass, the save data manager will automatically
    * restore any variables on a "run" or "level" object with a backup that was created when the room
-   * was entered. Thus, you should not have to explicitly program support for Glowing Hour Glass
+   * was entered. Thus, you should not have to explicitly program support for Glowing Hourglass
    * into your mod features that use the save data manager. If this is undesired for your specific
    * use-case, then add a key of `__ignoreGlowingHourGlass: true` to your "run" or "level" object.
    *

package/src/classes/features/other/saveDataManager/glowingHourGlass.ts

@@ -1,5 +1,5 @@
 // The save data manager has a feature where certain variables will automatically be rolled back
-// when the Glowing Hour Glass is used.
+// when the Glowing Hourglass is used.
 
 import { SaveDataKey } from "../../../../enums/SaveDataKey";
 import { SerializationType } from "../../../../enums/SerializationType";
@@ -11,7 +11,7 @@ import { AnyClass } from "../../../../types/AnyClass";
 import { SAVE_DATA_MANAGER_DEBUG } from "./constants";
 
 /**
- * When the Glowing Hour Glass is used, certain save data keys will automatically be restored to a
+ * When the Glowing Hourglass is used, certain save data keys will automatically be restored to a
  * backup.
  */
 const GLOWING_HOUR_GLASS_BACKUP_KEYS: readonly SaveDataKey[] = [
@@ -29,7 +29,7 @@ export function makeGlowingHourGlassBackup(
   iterateTableInOrder(
     saveDataMap,
     (subscriberName, saveData) => {
-      // We make the Glowing Hour Glass backup using `SerializationType.SERIALIZE`, which means that
+      // We make the Glowing Hourglass backup using `SerializationType.SERIALIZE`, which means that
       // we cannot operate on unserializable data, such as functions. Save data that utilizes
       // unserializable data will typically be marked using a conditional function that evaluates to
       // false, so we skip all save data that matches this criteria.
@@ -86,7 +86,7 @@ export function restoreGlowingHourGlassBackup(
   iterateTableInOrder(
     saveDataMap,
     (subscriberName, saveData) => {
-      // We make the Glowing Hour Glass backup using `SerializationType.SERIALIZE`, which means that
+      // We make the Glowing Hourglass backup using `SerializationType.SERIALIZE`, which means that
       // we cannot operate on unserializable data, such as functions. Save data that utilizes
       // unserializable data will typically be marked using a conditional function that evaluates to
       // false, so we skip all save data that matches this criteria.

package/src/functions/rooms.ts

@@ -338,7 +338,7 @@ export function inCrawlSpace(): boolean {
 }
 
 /**
- * Helper function to detect if the current room is one of the room in the Death Certificate area.
+ * Helper function to detect if the current room is one of the rooms in the Death Certificate area.
  */
 export function inDeathCertificateArea(): boolean {
   const roomStageID = getRoomStageID();

package/src/maps/collectibleTypeToNameMap.ts

@@ -433,7 +433,7 @@ export const COLLECTIBLE_TYPE_TO_NAME_MAP: ReadonlyMap<
   [419, "Teleport 2.0"],
   [420, "Black Powder"],
   [421, "Kidney Bean"],
-  [422, "Glowing Hour Glass"],
+  [422, "Glowing Hourglass"],
   [423, "Circle of Protection"],
   [424, "Sack Head"],
   [425, "Night Light"],