isaacscript-common 8.4.3 → 8.4.6

package/dist/callbacks/postCursedTeleport.lua

@@ -28,17 +28,17 @@ local postCursedTeleportHasSubscriptions = ____postCursedTeleport.postCursedTele
 function hasSubscriptions(self)
     return postCursedTeleportHasSubscriptions(nil)
 end
-function entityTakeDmgPlayer(self, tookDamage, _damageAmount, damageFlags, _damageSource, _damageCountdownFrames)
+function entityTakeDmgPlayer(self, entity, _amount, damageFlags, _source, _countdownFrames)
     if not hasSubscriptions(nil) then
         return nil
     end
     incrementNumSacrifices(nil, damageFlags)
-    setDamageFrame(nil, tookDamage, damageFlags)
+    setDamageFrame(nil, entity, damageFlags)
     return nil
 end
-function setDamageFrame(self, tookDamage, damageFlags)
+function setDamageFrame(self, entity, damageFlags)
     local gameFrameCount = game:GetFrameCount()
-    local player = tookDamage:ToPlayer()
+    local player = entity:ToPlayer()
     if player == nil then
         return
     end

package/dist/callbacks/postPlayerFatalDamage.lua

@@ -29,11 +29,11 @@ local postPlayerFatalDamageHasSubscriptions = ____postPlayerFatalDamage.postPlay
 function hasSubscriptions(self)
     return postPlayerFatalDamageHasSubscriptions(nil)
 end
-function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damageSource, damageCountdownFrames)
+function entityTakeDmgPlayer(self, entity, amount, damageFlags, source, countdownFrames)
     if not hasSubscriptions(nil) then
         return nil
     end
-    local player = tookDamage:ToPlayer()
+    local player = entity:ToPlayer()
     if player == nil then
         return nil
     end
@@ -49,8 +49,8 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damage
     if not isDamageToPlayerFatal(
         nil,
         player,
-        damageAmount,
-        damageSource,
+        amount,
+        source,
         lastDamageGameFrame
     ) then
         return nil
@@ -58,10 +58,10 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damage
     local shouldSustainDeath = postPlayerFatalDamageFire(
         nil,
         player,
-        damageAmount,
+        amount,
         damageFlags,
-        damageSource,
-        damageCountdownFrames
+        source,
+        countdownFrames
     )
     if shouldSustainDeath ~= nil then
         return shouldSustainDeath

package/dist/callbacks/postSacrifice.lua

@@ -17,11 +17,11 @@ local postSacrificeHasSubscriptions = ____postSacrifice.postSacrificeHasSubscrip
 function hasSubscriptions(self)
     return postSacrificeHasSubscriptions(nil)
 end
-function entityTakeDmgPlayer(self, tookDamage, _damageAmount, damageFlags, _damageSource, _damageCountdownFrames)
+function entityTakeDmgPlayer(self, entity, _amount, damageFlags, _source, _countdownFrames)
     if not hasSubscriptions(nil) then
         return nil
     end
-    local player = tookDamage:ToPlayer()
+    local player = entity:ToPlayer()
     if player == nil then
         return nil
     end

package/dist/callbacks/postTrinketBreak.lua

@@ -22,11 +22,11 @@ local postTrinketBreakHasSubscriptions = ____postTrinketBreak.postTrinketBreakHa
 function hasSubscriptions(self)
     return postTrinketBreakHasSubscriptions(nil)
 end
-function entityTakeDmgPlayer(self, tookDamage, _damageAmount, _damageFlags, _damageSource, _damageCountdownFrames)
+function entityTakeDmgPlayer(self, entity, _amount, _damageFlags, _source, _countdownFrames)
     if not hasSubscriptions(nil) then
         return nil
     end
-    local player = tookDamage:ToPlayer()
+    local player = entity:ToPlayer()
     if player == nil then
         return nil
     end

package/dist/callbacks/subscriptions/postPlayerFatalDamage.d.ts

@@ -1,10 +1,10 @@
 import { DamageFlag, PlayerType, PlayerVariant } from "isaac-typescript-definitions";
 export declare type PostPlayerFatalDamageRegisterParameters = [
-    callback: (player: EntityPlayer, damageAmount: float, damageFlags: BitFlags<DamageFlag>, damageSource: EntityRef, damageCountdownFrames: int) => boolean | undefined,
+    callback: (player: EntityPlayer, amount: float, damageFlags: BitFlags<DamageFlag>, source: EntityRef, countdownFrames: int) => boolean | undefined,
     playerVariant?: PlayerVariant,
     character?: PlayerType
 ];
 export declare function postPlayerFatalDamageHasSubscriptions(): boolean;
 export declare function postPlayerFatalDamageRegister(...args: PostPlayerFatalDamageRegisterParameters): void;
-export declare function postPlayerFatalDamageFire(player: EntityPlayer, damageAmount: float, damageFlags: BitFlags<DamageFlag>, damageSource: EntityRef, damageCountdownFrames: int): boolean | undefined;
+export declare function postPlayerFatalDamageFire(player: EntityPlayer, amount: float, damageFlags: BitFlags<DamageFlag>, source: EntityRef, countdownFrames: int): boolean | undefined;
 //# sourceMappingURL=postPlayerFatalDamage.d.ts.map

package/dist/callbacks/subscriptions/postPlayerFatalDamage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postPlayerFatalDamage.d.ts","sourceRoot":"","sources":["../../../src/callbacks/subscriptions/postPlayerFatalDamage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,UAAU,EACV,aAAa,EACd,MAAM,8BAA8B,CAAC;AAEtC,oBAAY,uCAAuC,GAAG;IACpD,QAAQ,EAAE,CACR,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,KAAK,EACnB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,EACjC,YAAY,EAAE,SAAS,EACvB,qBAAqB,EAAE,GAAG,KACvB,OAAO,GAAG,SAAS;IACxB,aAAa,CAAC,EAAE,aAAa;IAC7B,SAAS,CAAC,EAAE,UAAU;CACvB,CAAC;AAIF,wBAAgB,qCAAqC,IAAI,OAAO,CAE/D;AAED,wBAAgB,6BAA6B,CAC3C,GAAG,IAAI,EAAE,uCAAuC,GAC/C,IAAI,CAEN;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,KAAK,EACnB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,EACjC,YAAY,EAAE,SAAS,EACvB,qBAAqB,EAAE,GAAG,GACzB,OAAO,GAAG,SAAS,CA4BrB"}
+{"version":3,"file":"postPlayerFatalDamage.d.ts","sourceRoot":"","sources":["../../../src/callbacks/subscriptions/postPlayerFatalDamage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,UAAU,EACV,aAAa,EACd,MAAM,8BAA8B,CAAC;AAEtC,oBAAY,uCAAuC,GAAG;IACpD,QAAQ,EAAE,CACR,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,KAAK,EACb,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,EACjC,MAAM,EAAE,SAAS,EACjB,eAAe,EAAE,GAAG,KACjB,OAAO,GAAG,SAAS;IACxB,aAAa,CAAC,EAAE,aAAa;IAC7B,SAAS,CAAC,EAAE,UAAU;CACvB,CAAC;AAIF,wBAAgB,qCAAqC,IAAI,OAAO,CAE/D;AAED,wBAAgB,6BAA6B,CAC3C,GAAG,IAAI,EAAE,uCAAuC,GAC/C,IAAI,CAEN;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,KAAK,EACb,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,EACjC,MAAM,EAAE,SAAS,EACjB,eAAe,EAAE,GAAG,GACnB,OAAO,GAAG,SAAS,CA4BrB"}

package/dist/callbacks/subscriptions/postPlayerFatalDamage.lua

@@ -7,7 +7,7 @@ function ____exports.postPlayerFatalDamageRegister(self, ...)
     local args = {...}
     subscriptions[#subscriptions + 1] = args
 end
-function ____exports.postPlayerFatalDamageFire(self, player, damageAmount, damageFlags, damageSource, damageCountdownFrames)
+function ____exports.postPlayerFatalDamageFire(self, player, amount, damageFlags, source, countdownFrames)
     local character = player:GetPlayerType()
     for ____, ____value in ipairs(subscriptions) do
         local callback = ____value[1]
@@ -23,10 +23,10 @@ function ____exports.postPlayerFatalDamageFire(self, player, damageAmount, damag
             local shouldSustainDeath = callback(
                 nil,
                 player,
-                damageAmount,
+                amount,
                 damageFlags,
-                damageSource,
-                damageCountdownFrames
+                source,
+                countdownFrames
             )
             if shouldSustainDeath ~= nil then
                 return shouldSustainDeath

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

@@ -1 +1 @@
-{"version":3,"file":"customGridEntity.d.ts","sourceRoot":"","sources":["../../src/features/customGridEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,kBAAkB,EAClB,cAAc,EAGf,MAAM,8BAA8B,CAAC;AAkBtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AA4K1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,wBAAgB,qBAAqB,CACnC,oBAAoB,EAAE,cAAc,EACpC,mBAAmB,EAAE,GAAG,GAAG,MAAM,EACjC,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,QAAQ,CAAC,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,EACzB,kBAAkB,iBAA4B,EAC9C,qBAAqB,SAAI,GACxB,UAAU,CA8CZ;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,+BAA+B,EAAE,GAAG,GAAG,MAAM,GAAG,UAAU,EAC1D,UAAU,UAAO,GAChB,UAAU,GAAG,SAAS,CAuCxB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,KAAK,CAC5C;IAAC,UAAU,EAAE,UAAU;IAAE,IAAI,EAAE,oBAAoB;CAAC,CACrD,CAqBA;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,qBAAqB,EAAE,UAAU,GAAG,GAAG,GACtC,cAAc,GAAG,SAAS,CAsB5B;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,qBAAqB,EAAE,UAAU,GAAG,GAAG,GACtC,OAAO,CAOT"}
+{"version":3,"file":"customGridEntity.d.ts","sourceRoot":"","sources":["../../src/features/customGridEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAClB,cAAc,EAGf,MAAM,8BAA8B,CAAC;AAgBtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAyH1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,wBAAgB,qBAAqB,CACnC,oBAAoB,EAAE,cAAc,EACpC,mBAAmB,EAAE,GAAG,GAAG,MAAM,EACjC,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,QAAQ,CAAC,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,EACzB,kBAAkB,iBAA4B,EAC9C,qBAAqB,SAAI,GACxB,UAAU,CA8CZ;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,+BAA+B,EAAE,GAAG,GAAG,MAAM,GAAG,UAAU,EAC1D,UAAU,UAAO,GAChB,UAAU,GAAG,SAAS,CAuCxB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,KAAK,CAC5C;IAAC,UAAU,EAAE,UAAU;IAAE,IAAI,EAAE,oBAAoB;CAAC,CACrD,CAqBA;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,qBAAqB,EAAE,UAAU,GAAG,GAAG,GACtC,cAAc,GAAG,SAAS,CAsB5B;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,qBAAqB,EAAE,UAAU,GAAG,GAAG,GACtC,OAAO,CAOT"}

package/dist/features/customGridEntity.lua

@@ -4,16 +4,12 @@ local __TS__New = ____lualib.__TS__New
 local Set = ____lualib.Set
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
-local entityTakeDmgGenericProp, preUseItemWeNeedToGoDeeper, postNewRoomReordered, v
+local preUseItemWeNeedToGoDeeper, postNewRoomReordered, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
-local DamageFlag = ____isaac_2Dtypescript_2Ddefinitions.DamageFlag
-local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local GridCollisionClass = ____isaac_2Dtypescript_2Ddefinitions.GridCollisionClass
 local GridEntityType = ____isaac_2Dtypescript_2Ddefinitions.GridEntityType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
-local ____postGridEntityCustomBroken = require("callbacks.subscriptions.postGridEntityCustomBroken")
-local postGridEntityCustomBrokenFire = ____postGridEntityCustomBroken.postGridEntityCustomBrokenFire
 local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____cachedClasses = require("core.cachedClasses")
@@ -23,8 +19,6 @@ local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____featuresInitialized = require("featuresInitialized")
 local areFeaturesInitialized = ____featuresInitialized.areFeaturesInitialized
 local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
-local ____flag = require("functions.flag")
-local hasFlag = ____flag.hasFlag
 local ____gridEntities = require("functions.gridEntities")
 local removeGridEntity = ____gridEntities.removeGridEntity
 local spawnGridEntityWithVariant = ____gridEntities.spawnGridEntityWithVariant
@@ -38,32 +32,6 @@ local ____runInNFrames = require("features.runInNFrames")
 local runNextGameFrame = ____runInNFrames.runNextGameFrame
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-function entityTakeDmgGenericProp(self, tookDamage, _damageAmount, damageFlags, _damageSource, _damageCountdownFrames)
-    local ptrHash = GetPtrHash(tookDamage)
-    if not v.room.genericPropPtrHashes:has(ptrHash) then
-        return nil
-    end
-    if not hasFlag(nil, damageFlags, DamageFlag.EXPLOSION) then
-        return false
-    end
-    local room = game:GetRoom()
-    local roomListIndex = getRoomListIndex(nil)
-    local roomCustomGridEntities = v.level.customGridEntities:get(roomListIndex)
-    if roomCustomGridEntities == nil then
-        return false
-    end
-    local gridIndex = room:GetGridIndex(tookDamage.Position)
-    local data = roomCustomGridEntities:get(gridIndex)
-    if data == nil then
-        return false
-    end
-    local gridEntity = room:GetGridEntity(gridIndex)
-    if gridEntity == nil then
-        error("Failed to get the grid entity for a custom grid entity that broke at grid index: " .. tostring(gridIndex))
-    end
-    postGridEntityCustomBrokenFire(nil, gridEntity, data.gridEntityTypeCustom)
-    return false
-end
 function preUseItemWeNeedToGoDeeper(self, _collectibleType, _rng, player, _useFlags, _activeSlot, _customVarData)
     local room = game:GetRoom()
     local roomListIndex = getRoomListIndex(nil)
@@ -113,7 +81,7 @@ function postNewRoomReordered(self)
             local decoration = room:GetGridEntity(gridIndex)
             if decoration == nil then
                 roomCustomGridEntities:delete(gridIndex)
-                goto __continue19
+                goto __continue13
             end
             if data.anm2Path ~= nil then
                 local sprite = decoration:GetSprite()
@@ -122,7 +90,7 @@ function postNewRoomReordered(self)
                 sprite:Play(animationToPlay, true)
             end
         end
-        ::__continue19::
+        ::__continue13::
     end
 end
 local FEATURE_NAME = "customGridEntity"
@@ -140,7 +108,6 @@ v = {
 -- @internal
 function ____exports.customGridEntityInit(self, mod)
     saveDataManager(nil, FEATURE_NAME, v)
-    mod:AddCallback(ModCallback.ENTITY_TAKE_DMG, entityTakeDmgGenericProp, EntityType.GENERIC_PROP)
     mod:AddCallback(ModCallback.PRE_USE_ITEM, preUseItemWeNeedToGoDeeper, CollectibleType.WE_NEED_TO_GO_DEEPER)
     mod:AddCallbackCustom(ModCallbackCustom.POST_NEW_ROOM_REORDERED, postNewRoomReordered)
 end

package/dist/features/extraConsoleCommands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/features/extraConsoleCommands/init.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAWxD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAK/D"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/features/extraConsoleCommands/init.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAWxD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,CAK/D"}

package/dist/features/extraConsoleCommands/init.lua

@@ -208,7 +208,7 @@ function evaluateCacheFlying(self, player)
         player.CanFly = true
     end
 end
-function entityTakeDmgPlayer(self)
+function entityTakeDmgPlayer(self, _entity, _damageAmount, _damageFlags, _damageSource, _damageCountdownFrames)
     if v.run.spamBloodRights then
         return false
     end

package/dist/functions/collectibleSet.d.ts

@@ -45,9 +45,6 @@ export declare function getModdedCollectibleSet(): ReadonlySet<CollectibleType>;
  *
  * Use this if you need to iterate over the collectibles in order. If you need to do O(1) lookups,
  * then use the `getVanillaCollectibleSet` helper function instead.
- *
- * This function can only be called if at least one callback has been executed. This is because not
- * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export declare function getVanillaCollectibleArray(): readonly CollectibleType[];
 /**
@@ -55,9 +52,6 @@ export declare function getVanillaCollectibleArray(): readonly CollectibleType[]
  *
  * Use this if you need to do O(1) lookups. If you need to iterate over the collectibles in order,
  * then use the `getVanillaCollectibleArray` helper function instead.
- *
- * This function can only be called if at least one callback has been executed. This is because not
- * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export declare function getVanillaCollectibleSet(): ReadonlySet<CollectibleType>;
 //# sourceMappingURL=collectibleSet.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"collectibleSet.d.ts","sourceRoot":"","sources":["../../src/functions/collectibleSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAyD/D;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,IAAI,SAAS,eAAe,EAAE,CAGhE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,IAAI,WAAW,CAAC,eAAe,CAAC,CAGhE;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,IAAI,SAAS,eAAe,EAAE,CAGtE;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,IAAI,WAAW,CAAC,eAAe,CAAC,CAGtE;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,IAAI,SAAS,eAAe,EAAE,CAGvE;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,IAAI,WAAW,CAAC,eAAe,CAAC,CAGvE"}
+{"version":3,"file":"collectibleSet.d.ts","sourceRoot":"","sources":["../../src/functions/collectibleSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAwD/D;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,IAAI,SAAS,eAAe,EAAE,CAGhE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,IAAI,WAAW,CAAC,eAAe,CAAC,CAGhE;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,IAAI,SAAS,eAAe,EAAE,CAGtE;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,IAAI,WAAW,CAAC,eAAe,CAAC,CAGtE;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,IAAI,SAAS,eAAe,EAAE,CAGvE;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,IAAI,WAAW,CAAC,eAAe,CAAC,CAGvE"}

package/dist/functions/collectibleSet.lua

@@ -1,55 +1,50 @@
 local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
-local __TS__ArraySort = ____lualib.__TS__ArraySort
 local ____exports = {}
 local ____cachedClasses = require("core.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-local ____constantsFirstLast = require("core.constantsFirstLast")
-local FIRST_COLLECTIBLE_TYPE = ____constantsFirstLast.FIRST_COLLECTIBLE_TYPE
-local LAST_VANILLA_COLLECTIBLE_TYPE = ____constantsFirstLast.LAST_VANILLA_COLLECTIBLE_TYPE
 local ____firstLast = require("features.firstLast")
-local getLastCollectibleType = ____firstLast.getLastCollectibleType
-local ____utils = require("functions.utils")
-local irange = ____utils.irange
+local getModdedCollectibleTypes = ____firstLast.getModdedCollectibleTypes
+local ____collectibles = require("functions.collectibles")
+local getVanillaCollectibleTypeRange = ____collectibles.getVanillaCollectibleTypeRange
 local ALL_COLLECTIBLES_ARRAY = {}
-local VANILLA_COLLECTIBLES_ARRAY = {}
-local MODDED_COLLECTIBLES_ARRAY = {}
 local ALL_COLLECTIBLES_SET = __TS__New(Set)
+local VANILLA_COLLECTIBLES_ARRAY = {}
 local VANILLA_COLLECTIBLES_SET = __TS__New(Set)
+local MODDED_COLLECTIBLES_ARRAY = {}
 local MODDED_COLLECTIBLES_SET = __TS__New(Set)
-local function lazyInitCollectibleArraysAndSets(self)
-    if #ALL_COLLECTIBLES_ARRAY ~= 0 then
+local function lazyInitVanillaCollectibles(self)
+    if #VANILLA_COLLECTIBLES_ARRAY > 0 then
         return
     end
-    local lastCollectibleType = getLastCollectibleType(nil)
-    local collectibleTypeRange = irange(nil, FIRST_COLLECTIBLE_TYPE, lastCollectibleType)
-    for ____, collectibleType in ipairs(collectibleTypeRange) do
-        do
-            local itemConfigItem = itemConfig:GetCollectible(collectibleType)
-            if itemConfigItem == nil then
-                goto __continue4
-            end
-            ALL_COLLECTIBLES_ARRAY[#ALL_COLLECTIBLES_ARRAY + 1] = collectibleType
-            if collectibleType <= LAST_VANILLA_COLLECTIBLE_TYPE then
-                VANILLA_COLLECTIBLES_ARRAY[#VANILLA_COLLECTIBLES_ARRAY + 1] = collectibleType
-            else
-                MODDED_COLLECTIBLES_ARRAY[#MODDED_COLLECTIBLES_ARRAY + 1] = collectibleType
-            end
+    local vanillaCollectibleTypeRange = getVanillaCollectibleTypeRange(nil)
+    for ____, collectibleType in ipairs(vanillaCollectibleTypeRange) do
+        local itemConfigItem = itemConfig:GetCollectible(collectibleType)
+        if itemConfigItem ~= nil then
+            VANILLA_COLLECTIBLES_ARRAY[#VANILLA_COLLECTIBLES_ARRAY + 1] = collectibleType
+            VANILLA_COLLECTIBLES_SET:add(collectibleType)
         end
-        ::__continue4::
     end
-    __TS__ArraySort(ALL_COLLECTIBLES_ARRAY)
-    for ____, collectibleType in ipairs(ALL_COLLECTIBLES_ARRAY) do
-        ALL_COLLECTIBLES_SET:add(collectibleType)
+end
+local function lazyInitModdedCollectibles(self)
+    if #MODDED_COLLECTIBLES_ARRAY > 0 then
+        return
     end
-    __TS__ArraySort(VANILLA_COLLECTIBLES_ARRAY)
+    lazyInitVanillaCollectibles(nil)
     for ____, collectibleType in ipairs(VANILLA_COLLECTIBLES_ARRAY) do
-        VANILLA_COLLECTIBLES_SET:add(collectibleType)
+        ALL_COLLECTIBLES_ARRAY[#ALL_COLLECTIBLES_ARRAY + 1] = collectibleType
+        ALL_COLLECTIBLES_SET:add(collectibleType)
     end
-    __TS__ArraySort(MODDED_COLLECTIBLES_ARRAY)
-    for ____, collectibleType in ipairs(MODDED_COLLECTIBLES_ARRAY) do
-        MODDED_COLLECTIBLES_SET:add(collectibleType)
+    local moddedCollectibleTypes = getModdedCollectibleTypes(nil)
+    for ____, collectibleType in ipairs(moddedCollectibleTypes) do
+        local itemConfigItem = itemConfig:GetCollectible(collectibleType)
+        if itemConfigItem ~= nil then
+            MODDED_COLLECTIBLES_ARRAY[#MODDED_COLLECTIBLES_ARRAY + 1] = collectibleType
+            MODDED_COLLECTIBLES_SET:add(collectibleType)
+            ALL_COLLECTIBLES_ARRAY[#ALL_COLLECTIBLES_ARRAY + 1] = collectibleType
+            ALL_COLLECTIBLES_SET:add(collectibleType)
+        end
     end
 end
 --- Returns an array containing every valid collectible type in the game, including modded
@@ -61,7 +56,7 @@ end
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all collectibles will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getCollectibleArray(self)
-    lazyInitCollectibleArraysAndSets(nil)
+    lazyInitModdedCollectibles(nil)
     return ALL_COLLECTIBLES_ARRAY
 end
 --- Returns a set containing every valid collectible type in the game, including modded collectibles.
@@ -72,7 +67,7 @@ end
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all collectibles will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getCollectibleSet(self)
-    lazyInitCollectibleArraysAndSets(nil)
+    lazyInitModdedCollectibles(nil)
     return ALL_COLLECTIBLES_SET
 end
 --- Returns an array containing every modded collectible type in the game.
@@ -83,7 +78,7 @@ end
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all collectibles will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getModdedCollectibleArray(self)
-    lazyInitCollectibleArraysAndSets(nil)
+    lazyInitModdedCollectibles(nil)
     return MODDED_COLLECTIBLES_ARRAY
 end
 --- Returns a set containing every modded collectible type in the game.
@@ -94,29 +89,23 @@ end
 -- This function can only be called if at least one callback has been executed. This is because not
 -- all collectibles will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getModdedCollectibleSet(self)
-    lazyInitCollectibleArraysAndSets(nil)
+    lazyInitModdedCollectibles(nil)
     return MODDED_COLLECTIBLES_SET
 end
 --- Returns an array containing every valid vanilla collectible type in the game.
 -- 
 -- Use this if you need to iterate over the collectibles in order. If you need to do O(1) lookups,
 -- then use the `getVanillaCollectibleSet` helper function instead.
--- 
--- This function can only be called if at least one callback has been executed. This is because not
--- all collectibles will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getVanillaCollectibleArray(self)
-    lazyInitCollectibleArraysAndSets(nil)
+    lazyInitVanillaCollectibles(nil)
     return VANILLA_COLLECTIBLES_ARRAY
 end
 --- Returns a set containing every valid vanilla collectible type in the game.
 -- 
 -- Use this if you need to do O(1) lookups. If you need to iterate over the collectibles in order,
 -- then use the `getVanillaCollectibleArray` helper function instead.
--- 
--- This function can only be called if at least one callback has been executed. This is because not
--- all collectibles will necessarily be present when a mod first loads (due to mod load order).
 function ____exports.getVanillaCollectibleSet(self)
-    lazyInitCollectibleArraysAndSets(nil)
+    lazyInitVanillaCollectibles(nil)
     return VANILLA_COLLECTIBLES_SET
 end
 return ____exports

package/dist/functions/collectibles.d.ts

@@ -129,7 +129,8 @@ export declare function getCollectibleTags(collectibleType: CollectibleType): Bi
  * collectible types.
  *
  * This function is only useful when building collectible type objects. For most purposes, you
- * should use the `getVanillaCollectibleSet` helper function instead.
+ * should use the `getVanillaCollectibleArray` or `getVanillaCollectibleSet` helper functions
+ * instead.
  */
 export declare function getVanillaCollectibleTypeRange(): CollectibleType[];
 /** Returns true if the item type in the item config is equal to `ItemType.ITEM_ACTIVE`. */

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

@@ -332,7 +332,8 @@ end
 -- collectible types.
 -- 
 -- This function is only useful when building collectible type objects. For most purposes, you
--- should use the `getVanillaCollectibleSet` helper function instead.
+-- should use the `getVanillaCollectibleArray` or `getVanillaCollectibleSet` helper functions
+-- instead.
 function ____exports.getVanillaCollectibleTypeRange(self)
     return irange(nil, FIRST_COLLECTIBLE_TYPE, LAST_VANILLA_COLLECTIBLE_TYPE)
 end

package/dist/functions/flag.d.ts

@@ -74,7 +74,7 @@ export declare function hasFlag<T extends BitFlag | BitFlag128>(flags: T | BitFl
  */
 export declare function isEmptyFlag<T extends BitFlag | BitFlag128>(flag: T): boolean;
 /**
- * Helper function to determine whether damage to a player in the EntityTakeDmg callback was
+ * Helper function to determine whether damage to a player in the `ENTITY_TAKE_DMG` callback was
  * self-inflicted. For example, damage from a Curse Room door, a Razor, or a Blood Donation Machine
  * would count as self-inflicted damage.
  */

package/dist/functions/flag.lua

@@ -92,7 +92,7 @@ end
 function ____exports.isEmptyFlag(self, flag)
     return flag == 0
 end
---- Helper function to determine whether damage to a player in the EntityTakeDmg callback was
+--- Helper function to determine whether damage to a player in the `ENTITY_TAKE_DMG` callback was
 -- self-inflicted. For example, damage from a Curse Room door, a Razor, or a Blood Donation Machine
 -- would count as self-inflicted damage.
 function ____exports.isSelfDamage(self, damageFlags)

package/dist/functions/revive.d.ts

@@ -5,7 +5,7 @@
  * Uses the player's current health and other miscellaneous things to determine if incoming damage
  * will be fatal.
  */
-export declare function isDamageToPlayerFatal(player: EntityPlayer, damageAmount: int, damageSource: EntityRef, lastDamageGameFrame: int | undefined): boolean;
+export declare function isDamageToPlayerFatal(player: EntityPlayer, amount: int, source: EntityRef, lastDamageGameFrame: int | undefined): boolean;
 /**
  * Assuming that we are on the frame of fatal damage, this function returns whether or not
  * Mysterious Paper would rotate to Missing Poster on the frame that the "Game Over" screen would

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

@@ -1 +1 @@
-{"version":3,"file":"revive.d.ts","sourceRoot":"","sources":["../../src/functions/revive.ts"],"names":[],"mappings":";;;AAsBA;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,GAAG,EACjB,YAAY,EAAE,SAAS,EACvB,mBAAmB,EAAE,GAAG,GAAG,SAAS,GACnC,OAAO,CAuFT;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAavE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAa9D;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAYtE;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAe1E"}
+{"version":3,"file":"revive.d.ts","sourceRoot":"","sources":["../../src/functions/revive.ts"],"names":[],"mappings":";;;AAsBA;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,SAAS,EACjB,mBAAmB,EAAE,GAAG,GAAG,SAAS,GACnC,OAAO,CAuFT;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAavE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAa9D;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAYtE;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAe1E"}

package/dist/functions/revive.lua

@@ -48,12 +48,12 @@ function ____exports.willReviveFromSpiritShackles(self, player)
 end
 --- Uses the player's current health and other miscellaneous things to determine if incoming damage
 -- will be fatal.
-function ____exports.isDamageToPlayerFatal(self, player, damageAmount, damageSource, lastDamageGameFrame)
+function ____exports.isDamageToPlayerFatal(self, player, amount, source, lastDamageGameFrame)
     local gameFrameCount = game:GetFrameCount()
     local character = player:GetPlayerType()
     local effects = player:GetEffects()
     local isBerserk = effects:HasCollectibleEffect(CollectibleType.BERSERK)
-    if character == PlayerType.JACOB_B and damageSource.Type == EntityType.DARK_ESAU then
+    if character == PlayerType.JACOB_B and source.Type == EntityType.DARK_ESAU then
         return false
     end
     if isBerserk then
@@ -73,7 +73,7 @@ function ____exports.isDamageToPlayerFatal(self, player, damageAmount, damageSou
         return true
     end
     local playerNumAllHearts = getPlayerNumHitsRemaining(nil, player)
-    if damageAmount < playerNumAllHearts then
+    if amount < playerNumAllHearts then
         return false
     end
     if ____exports.willReviveFromHeartbreak(nil, player) then

package/dist/functions/trinketSet.d.ts

@@ -44,9 +44,6 @@ export declare function getTrinketSet(): ReadonlySet<TrinketType>;
  *
  * Use this if you need to iterate over the trinkets in order. If you need to do O(1) lookups, then
  * use the `getVanillaTrinketSet` helper function instead.
- *
- * This function can only be called if at least one callback has been executed. This is because not
- * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export declare function getVanillaTrinketArray(): readonly TrinketType[];
 /**
@@ -54,9 +51,6 @@ export declare function getVanillaTrinketArray(): readonly TrinketType[];
  *
  * Use this if you need to do O(1) lookups. If you need to iterate over the trinkets in order, then
  * use the `getVanillaTrinketArray` helper function instead.
- *
- * This function can only be called if at least one callback has been executed. This is because not
- * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export declare function getVanillaTrinketSet(): ReadonlySet<TrinketType>;
 //# sourceMappingURL=trinketSet.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"trinketSet.d.ts","sourceRoot":"","sources":["../../src/functions/trinketSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAyD3D;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,IAAI,SAAS,WAAW,EAAE,CAG9D;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,IAAI,WAAW,CAAC,WAAW,CAAC,CAG9D;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,IAAI,SAAS,WAAW,EAAE,CAGxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,IAAI,WAAW,CAAC,WAAW,CAAC,CAGxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,IAAI,SAAS,WAAW,EAAE,CAG/D;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,CAAC,WAAW,CAAC,CAG/D"}
+{"version":3,"file":"trinketSet.d.ts","sourceRoot":"","sources":["../../src/functions/trinketSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAwD3D;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,IAAI,SAAS,WAAW,EAAE,CAG9D;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,IAAI,WAAW,CAAC,WAAW,CAAC,CAG9D;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,IAAI,SAAS,WAAW,EAAE,CAGxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,IAAI,WAAW,CAAC,WAAW,CAAC,CAGxD;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,SAAS,WAAW,EAAE,CAG/D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,CAAC,WAAW,CAAC,CAG/D"}