isaacscript-common 8.4.1 → 8.4.4

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

@@ -0,0 +1,16 @@
+/// <reference types="isaac-typescript-definitions" />
+/// <reference types="isaac-typescript-definitions" />
+/// <reference types="isaac-typescript-definitions" />
+/**
+ * Converts a hex string like "#33aa33" to a KColor object.
+ *
+ * @param hexString A hex string like "#ffffff" or "ffffff". (The "#" character is optional.)
+ */
+export declare function hexToColor(hexString: string, alpha: float): Color;
+/**
+ * Converts a hex string like "#33aa33" to a Color object.
+ *
+ * @param hexString A hex string like "#ffffff" or "ffffff". (The "#" character is optional.)
+ */
+export declare function hexToKColor(hexString: string, alpha: float): KColor;
+//# sourceMappingURL=hex.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"hex.d.ts","sourceRoot":"","sources":["../../src/functions/hex.ts"],"names":[],"mappings":";;;AAIA;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,CAMjE;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,CAMnE"}

package/dist/functions/hex.lua

@@ -0,0 +1,51 @@
+local ____lualib = require("lualib_bundle")
+local __TS__StringReplace = ____lualib.__TS__StringReplace
+local __TS__StringSubstring = ____lualib.__TS__StringSubstring
+local ____exports = {}
+local hexToRGB, HEX_STRING_LENGTH
+local ____log = require("functions.log")
+local logError = ____log.logError
+function hexToRGB(self, hexString)
+    hexString = __TS__StringReplace(hexString, "#", "")
+    if #hexString ~= HEX_STRING_LENGTH then
+        logError("Hex strings must be of length: " .. tostring(HEX_STRING_LENGTH))
+        return {0, 0, 0}
+    end
+    local rString = __TS__StringSubstring(hexString, 0, 2)
+    local r = tonumber("0x" .. rString)
+    if r == nil then
+        logError(("Failed to convert `0x" .. rString) .. "` to a number.")
+        return {0, 0, 0}
+    end
+    local gString = __TS__StringSubstring(hexString, 2, 4)
+    local g = tonumber("0x" .. gString)
+    if g == nil then
+        logError(("Failed to convert `0x" .. gString) .. "` to a number.")
+        return {0, 0, 0}
+    end
+    local bString = __TS__StringSubstring(hexString, 4, 6)
+    local b = tonumber("0x" .. bString)
+    if b == nil then
+        logError(("Failed to convert `0x" .. bString) .. "` to a number.")
+        return {0, 0, 0}
+    end
+    return {r, g, b}
+end
+HEX_STRING_LENGTH = 6
+--- Converts a hex string like "#33aa33" to a KColor object.
+-- 
+-- @param hexString A hex string like "#ffffff" or "ffffff". (The "#" character is optional.)
+function ____exports.hexToColor(self, hexString, alpha)
+    local r, g, b = table.unpack(hexToRGB(nil, hexString))
+    local base = 255
+    return Color(r / base, g / base, b / base, alpha)
+end
+--- Converts a hex string like "#33aa33" to a Color object.
+-- 
+-- @param hexString A hex string like "#ffffff" or "ffffff". (The "#" character is optional.)
+function ____exports.hexToKColor(self, hexString, alpha)
+    local r, g, b = table.unpack(hexToRGB(nil, hexString))
+    local base = 255
+    return KColor(r / base, g / base, b / base, alpha)
+end
+return ____exports

package/dist/functions/playerHealth.d.ts

@@ -12,7 +12,7 @@ export declare function addPlayerHealthType(player: EntityPlayer, healthType: He
  */
 export declare function getPlayerHealth(player: EntityPlayer): PlayerHealth;
 export declare function getPlayerHealthType(player: EntityPlayer, healthType: HealthType): int;
-/** Returns a `PlayerHealth` object with all 0s. */
+/** Returns a `PlayerHealth` object with all zeros. */
 export declare function newPlayerHealth(): PlayerHealth;
 export declare function playerConvertBlackHeartsToSoulHearts(player: EntityPlayer): void;
 export declare function playerConvertSoulHeartsToBlackHearts(player: EntityPlayer): void;

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

@@ -1 +1 @@
-{"version":3,"file":"playerHealth.d.ts","sourceRoot":"","sources":["../../src/functions/playerHealth.ts"],"names":[],"mappings":";;AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAiB,MAAM,4BAA4B,CAAC;AAWzE,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,GAAG,GACb,IAAI,CA+CN;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CA2ElE;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,GACrB,GAAG,CAmDL;AAED,mDAAmD;AACnD,wBAAgB,eAAe,IAAI,YAAY,CAc9C;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,YAAY,GACnB,IAAI,CAQN;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,YAAY,GACnB,IAAI,CAQN;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAMjE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAwBhE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,YAAY,GACzB,IAAI,CAyGN"}
+{"version":3,"file":"playerHealth.d.ts","sourceRoot":"","sources":["../../src/functions/playerHealth.ts"],"names":[],"mappings":";;AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAiB,MAAM,4BAA4B,CAAC;AAYzE,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,GAAG,GACb,IAAI,CA+CN;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CA2ElE;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,GACrB,GAAG,CAmDL;AAED,sDAAsD;AACtD,wBAAgB,eAAe,IAAI,YAAY,CAc9C;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,YAAY,GACnB,IAAI,CAQN;AAED,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,YAAY,GACnB,IAAI,CAQN;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAMjE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAwBhE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,YAAY,GACzB,IAAI,CAsHN"}

package/dist/functions/playerHealth.lua

@@ -21,6 +21,8 @@ local getPlayerHearts = ____players.getPlayerHearts
 local getPlayerSoulHearts = ____players.getPlayerSoulHearts
 local isCharacter = ____players.isCharacter
 local setActiveItem = ____players.setActiveItem
+local ____utils = require("functions.utils")
+local ____repeat = ____utils["repeat"]
 function ____exports.removeAllPlayerHealth(self, player)
     local goldenHearts = player:GetGoldenHearts()
     local eternalHearts = player:GetEternalHearts()
@@ -105,8 +107,23 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
     )
     player:AddRottenHearts(playerHealth.rottenHearts)
     if character == PlayerType.MAGDALENE_B then
-        local effectiveHearts = playerHealth.hearts / 2
-        player:AddHearts(effectiveHearts)
+        ____repeat(
+            nil,
+            playerHealth.hearts,
+            function()
+                if player:HasFullHearts() then
+                    return
+                end
+                local hearts = player:GetHearts()
+                local maxHearts = player:GetMaxHearts()
+                if hearts == maxHearts - 1 then
+                    player:AddHearts(1)
+                    return
+                end
+                player:AddHearts(1)
+                player:AddHearts(-1)
+            end
+        )
     else
         player:AddHearts(playerHealth.hearts)
     end
@@ -323,7 +340,7 @@ function ____exports.getPlayerHealthType(self, player, healthType)
         end
     until true
 end
---- Returns a `PlayerHealth` object with all 0s.
+--- Returns a `PlayerHealth` object with all zeros.
 function ____exports.newPlayerHealth(self)
     return {
         maxHearts = 0,

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"}

package/dist/functions/trinketSet.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_TRINKET_TYPE = ____constantsFirstLast.FIRST_TRINKET_TYPE
-local LAST_VANILLA_TRINKET_TYPE = ____constantsFirstLast.LAST_VANILLA_TRINKET_TYPE
 local ____firstLast = require("features.firstLast")
-local getLastTrinketType = ____firstLast.getLastTrinketType
-local ____utils = require("functions.utils")
-local irange = ____utils.irange
+local getModdedTrinketTypes = ____firstLast.getModdedTrinketTypes
+local ____trinkets = require("functions.trinkets")
+local getVanillaTrinketTypes = ____trinkets.getVanillaTrinketTypes
 local ALL_TRINKETS_ARRAY = {}
-local VANILLA_TRINKETS_ARRAY = {}
-local MODDED_TRINKETS_ARRAY = {}
 local ALL_TRINKETS_SET = __TS__New(Set)
+local VANILLA_TRINKETS_ARRAY = {}
 local VANILLA_TRINKETS_SET = __TS__New(Set)
+local MODDED_TRINKETS_ARRAY = {}
 local MODDED_TRINKETS_SET = __TS__New(Set)
-local function lazyInitTrinketArraysAndSets(self)
-    if #ALL_TRINKETS_ARRAY ~= 0 then
+local function lazyInitVanillaTrinkets(self)
+    if #VANILLA_TRINKETS_ARRAY > 0 then
         return
     end
-    local lastTrinketType = getLastTrinketType(nil)
-    local trinketTypeRange = irange(nil, FIRST_TRINKET_TYPE, lastTrinketType)
-    for ____, trinketType in ipairs(trinketTypeRange) do
-        do
-            local itemConfigItem = itemConfig:GetTrinket(trinketType)
-            if itemConfigItem == nil then
-                goto __continue4
-            end
-            ALL_TRINKETS_ARRAY[#ALL_TRINKETS_ARRAY + 1] = trinketType
-            if trinketType <= LAST_VANILLA_TRINKET_TYPE then
-                VANILLA_TRINKETS_ARRAY[#VANILLA_TRINKETS_ARRAY + 1] = trinketType
-            else
-                MODDED_TRINKETS_ARRAY[#MODDED_TRINKETS_ARRAY + 1] = trinketType
-            end
+    local vanillaTrinketTypes = getVanillaTrinketTypes(nil)
+    for ____, trinketType in ipairs(vanillaTrinketTypes) do
+        local itemConfigItem = itemConfig:GetTrinket(trinketType)
+        if itemConfigItem ~= nil then
+            VANILLA_TRINKETS_ARRAY[#VANILLA_TRINKETS_ARRAY + 1] = trinketType
+            VANILLA_TRINKETS_SET:add(trinketType)
         end
-        ::__continue4::
     end
-    __TS__ArraySort(ALL_TRINKETS_ARRAY)
-    for ____, trinketType in ipairs(ALL_TRINKETS_ARRAY) do
-        ALL_TRINKETS_SET:add(trinketType)
+end
+local function lazyInitModdedTrinkets(self)
+    if #MODDED_TRINKETS_ARRAY > 0 then
+        return
     end
-    __TS__ArraySort(VANILLA_TRINKETS_ARRAY)
+    lazyInitVanillaTrinkets(nil)
     for ____, trinketType in ipairs(VANILLA_TRINKETS_ARRAY) do
-        VANILLA_TRINKETS_SET:add(trinketType)
+        ALL_TRINKETS_ARRAY[#ALL_TRINKETS_ARRAY + 1] = trinketType
+        ALL_TRINKETS_SET:add(trinketType)
     end
-    __TS__ArraySort(MODDED_TRINKETS_ARRAY)
-    for ____, trinketType in ipairs(MODDED_TRINKETS_ARRAY) do
-        MODDED_TRINKETS_SET:add(trinketType)
+    local moddedTrinketTypes = getModdedTrinketTypes(nil)
+    for ____, trinketType in ipairs(moddedTrinketTypes) do
+        local itemConfigItem = itemConfig:GetTrinket(trinketType)
+        if itemConfigItem ~= nil then
+            MODDED_TRINKETS_ARRAY[#MODDED_TRINKETS_ARRAY + 1] = trinketType
+            MODDED_TRINKETS_SET:add(trinketType)
+            ALL_TRINKETS_ARRAY[#ALL_TRINKETS_ARRAY + 1] = trinketType
+            ALL_TRINKETS_SET:add(trinketType)
+        end
     end
 end
 --- Returns an array containing every valid trinket type in the game, including modded trinkets.
@@ -60,7 +55,7 @@ end
 -- 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).
 function ____exports.getModdedTrinketArray(self)
-    lazyInitTrinketArraysAndSets(nil)
+    lazyInitModdedTrinkets(nil)
     return MODDED_TRINKETS_ARRAY
 end
 --- Returns a set containing every valid trinket type in the game, including modded trinkets.
@@ -71,7 +66,7 @@ end
 -- 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).
 function ____exports.getModdedTrinketSet(self)
-    lazyInitTrinketArraysAndSets(nil)
+    lazyInitModdedTrinkets(nil)
     return MODDED_TRINKETS_SET
 end
 --- Returns an array containing every modded trinket type in the game.
@@ -82,7 +77,7 @@ end
 -- 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).
 function ____exports.getTrinketArray(self)
-    lazyInitTrinketArraysAndSets(nil)
+    lazyInitModdedTrinkets(nil)
     return ALL_TRINKETS_ARRAY
 end
 --- Returns a set containing every modded trinket type in the game.
@@ -93,29 +88,23 @@ end
 -- 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).
 function ____exports.getTrinketSet(self)
-    lazyInitTrinketArraysAndSets(nil)
+    lazyInitModdedTrinkets(nil)
     return ALL_TRINKETS_SET
 end
 --- Returns an array containing every valid vanilla trinket type in the game.
 -- 
 -- 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).
 function ____exports.getVanillaTrinketArray(self)
-    lazyInitTrinketArraysAndSets(nil)
+    lazyInitVanillaTrinkets(nil)
     return VANILLA_TRINKETS_ARRAY
 end
 --- Returns a set containing every valid vanilla trinket type in the game.
 -- 
 -- 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).
 function ____exports.getVanillaTrinketSet(self)
-    lazyInitTrinketArraysAndSets(nil)
+    lazyInitVanillaTrinkets(nil)
     return VANILLA_TRINKETS_SET
 end
 return ____exports

package/dist/functions/utils.d.ts

@@ -1,6 +1,4 @@
 /// <reference types="isaac-typescript-definitions" />
-/// <reference types="isaac-typescript-definitions" />
-/// <reference types="isaac-typescript-definitions" />
 /**
  * Helper function to return an array with the elements from start to end. It is inclusive at the
  * start and exclusive at the end. (The "e" stands for exclusive.)
@@ -16,18 +14,6 @@ export declare function erange(start: int, end?: int): int[];
  * structures.
  */
 export declare function getTraversalDescription(key: unknown, traversalDescription: string): string;
-/**
- * Converts a hex string like "#33aa33" to a KColor object.
- *
- * @param hexString A hex string like "#ffffff" or "ffffff". (The "#" character is optional.)
- */
-export declare function hexToColor(hexString: string, alpha: float): Color;
-/**
- * Converts a hex string like "#33aa33" to a Color object.
- *
- * @param hexString A hex string like "#ffffff" or "ffffff". (The "#" character is optional.)
- */
-export declare function hexToKColor(hexString: string, alpha: float): KColor;
 /**
  * Helper function to return an array with the elements from start to end, inclusive. (The "i"
  * stands for inclusive.)

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/functions/utils.ts"],"names":[],"mappings":";;;AAMA;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,CAYnD;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,oBAAoB,EAAE,MAAM,GAC3B,MAAM,CAQR;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,CAMjE;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,CAMnE;AA6BD;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,CAYnD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAI5C;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAE9C;AAED,iGAAiG;AACjG,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAGxE;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAI3D;AAED;;;;;;;;;;;;GAYG;AAEH,wBAAgB,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAG;AAEjD;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAYhE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/functions/utils.ts"],"names":[],"mappings":";AAIA;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,CAYnD;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,OAAO,EACZ,oBAAoB,EAAE,MAAM,GAC3B,MAAM,CAQR;AAED;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,CAYnD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAI5C;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAE9C;AAED,iGAAiG;AACjG,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAGxE;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAI3D;AAED;;;;;;;;;;;;GAYG;AAEH,wBAAgB,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAG;AAEjD;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAYhE"}

package/dist/functions/utils.lua

@@ -1,37 +1,10 @@
-local ____lualib = require("lualib_bundle")
-local __TS__StringReplace = ____lualib.__TS__StringReplace
-local __TS__StringSubstring = ____lualib.__TS__StringSubstring
 local ____exports = {}
-local hexToRGB, HEX_STRING_LENGTH
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local RenderMode = ____isaac_2Dtypescript_2Ddefinitions.RenderMode
 local ____cachedClasses = require("core.cachedClasses")
 local game = ____cachedClasses.game
 local ____consoleCommandsSet = require("sets.consoleCommandsSet")
 local CONSOLE_COMMANDS_SET = ____consoleCommandsSet.CONSOLE_COMMANDS_SET
-function hexToRGB(self, hexString)
-    hexString = __TS__StringReplace(hexString, "#", "")
-    if #hexString ~= HEX_STRING_LENGTH then
-        error("Hex strings must be of length: " .. tostring(HEX_STRING_LENGTH))
-    end
-    local rString = __TS__StringSubstring(hexString, 0, 2)
-    local r = tonumber("0x" .. rString)
-    if r == nil then
-        error(("Failed to convert `0x" .. rString) .. "` to a number.")
-    end
-    local gString = __TS__StringSubstring(hexString, 2, 4)
-    local g = tonumber("0x" .. gString)
-    if g == nil then
-        error(("Failed to convert `0x" .. gString) .. "` to a number.")
-    end
-    local bString = __TS__StringSubstring(hexString, 4, 6)
-    local b = tonumber("0x" .. bString)
-    if b == nil then
-        error(("Failed to convert `0x" .. bString) .. "` to a number.")
-    end
-    return {r, g, b}
-end
-HEX_STRING_LENGTH = 6
 --- Helper function to return an array with the elements from start to end. It is inclusive at the
 -- start and exclusive at the end. (The "e" stands for exclusive.)
 -- 
@@ -63,22 +36,6 @@ function ____exports.getTraversalDescription(self, key, traversalDescription)
     traversalDescription = traversalDescription .. tostring(key)
     return traversalDescription
 end
---- Converts a hex string like "#33aa33" to a KColor object.
--- 
--- @param hexString A hex string like "#ffffff" or "ffffff". (The "#" character is optional.)
-function ____exports.hexToColor(self, hexString, alpha)
-    local r, g, b = table.unpack(hexToRGB(nil, hexString))
-    local base = 255
-    return Color(r / base, g / base, b / base, alpha)
-end
---- Converts a hex string like "#33aa33" to a Color object.
--- 
--- @param hexString A hex string like "#ffffff" or "ffffff". (The "#" character is optional.)
-function ____exports.hexToKColor(self, hexString, alpha)
-    local r, g, b = table.unpack(hexToRGB(nil, hexString))
-    local base = 255
-    return KColor(r / base, g / base, b / base, alpha)
-end
 --- Helper function to return an array with the elements from start to end, inclusive. (The "i"
 -- stands for inclusive.)
 -- 

package/dist/index.d.ts

@@ -5098,9 +5098,6 @@ export declare function getVanillaCards(): Card[];
  *
  * 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[];
 
@@ -5109,9 +5106,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>;
 
@@ -5121,7 +5115,8 @@ export declare function getVanillaCollectibleSet(): ReadonlySet<CollectibleType>
  * 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[];
 
@@ -5133,9 +5128,6 @@ export declare function getVanillaPillEffects(): PillEffect[];
  *
  * 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[];
 
@@ -5144,9 +5136,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>;
 
@@ -8143,7 +8132,7 @@ export declare function newChargeBarSprites(maxCharges: int): ChargeBarSprites;
 
 export declare function newPickingUpItem(): PickingUpItem;
 
-/** Returns a `PlayerHealth` object with all 0s. */
+/** Returns a `PlayerHealth` object with all zeros. */
 export declare function newPlayerHealth(): PlayerHealth;
 
 /**

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,sCAAsC,CAAC;AACrD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC;AACnD,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mCAAmC,CAAC;AAClD,cAAc,iCAAiC,CAAC;AAChD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,yCAAyC,CAAC;AACxD,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,uCAAuC,CAAC;AACtD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oCAAoC,CAAC;AACnD,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kCAAkC,CAAC;AACjD,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.lua

@@ -687,6 +687,14 @@ do
         end
     end
 end
+do
+    local ____export = require("functions.hex")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("functions.input")
     for ____exportKey, ____exportValue in pairs(____export) do

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "8.4.1",
+  "version": "8.4.4",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/functions/collectibleSet.ts

@@ -1,57 +1,56 @@
 import { CollectibleType } from "isaac-typescript-definitions";
 import { itemConfig } from "../core/cachedClasses";
-import {
-  FIRST_COLLECTIBLE_TYPE,
-  LAST_VANILLA_COLLECTIBLE_TYPE,
-} from "../core/constantsFirstLast";
-import { getLastCollectibleType } from "../features/firstLast";
-import { irange } from "./utils";
+import { getModdedCollectibleTypes } from "../features/firstLast";
+import { getVanillaCollectibleTypeRange } from "./collectibles";
 
 const ALL_COLLECTIBLES_ARRAY: CollectibleType[] = [];
-const VANILLA_COLLECTIBLES_ARRAY: CollectibleType[] = [];
-const MODDED_COLLECTIBLES_ARRAY: CollectibleType[] = [];
-
 const ALL_COLLECTIBLES_SET = new Set<CollectibleType>();
+
+const VANILLA_COLLECTIBLES_ARRAY: CollectibleType[] = [];
 const VANILLA_COLLECTIBLES_SET = new Set<CollectibleType>();
+
+const MODDED_COLLECTIBLES_ARRAY: CollectibleType[] = [];
 const MODDED_COLLECTIBLES_SET = new Set<CollectibleType>();
 
-function lazyInitCollectibleArraysAndSets() {
-  if (ALL_COLLECTIBLES_ARRAY.length !== 0) {
+function lazyInitVanillaCollectibles() {
+  if (VANILLA_COLLECTIBLES_ARRAY.length > 0) {
     return;
   }
 
-  const lastCollectibleType = getLastCollectibleType();
-  const collectibleTypeRange = irange(
-    FIRST_COLLECTIBLE_TYPE,
-    lastCollectibleType,
-  ) as CollectibleType[];
-  for (const collectibleType of collectibleTypeRange) {
+  const vanillaCollectibleTypeRange = getVanillaCollectibleTypeRange();
+  for (const collectibleType of vanillaCollectibleTypeRange) {
+    // Vanilla collectible types are not contiguous, so we must check every value.
     const itemConfigItem = itemConfig.GetCollectible(collectibleType);
-    if (itemConfigItem === undefined) {
-      continue;
-    }
-
-    ALL_COLLECTIBLES_ARRAY.push(collectibleType);
-    if (collectibleType <= LAST_VANILLA_COLLECTIBLE_TYPE) {
+    if (itemConfigItem !== undefined) {
       VANILLA_COLLECTIBLES_ARRAY.push(collectibleType);
-    } else {
-      MODDED_COLLECTIBLES_ARRAY.push(collectibleType);
+      VANILLA_COLLECTIBLES_SET.add(collectibleType);
     }
   }
+}
 
-  ALL_COLLECTIBLES_ARRAY.sort();
-  for (const collectibleType of ALL_COLLECTIBLES_ARRAY) {
-    ALL_COLLECTIBLES_SET.add(collectibleType);
+function lazyInitModdedCollectibles() {
+  if (MODDED_COLLECTIBLES_ARRAY.length > 0) {
+    return;
   }
 
-  VANILLA_COLLECTIBLES_ARRAY.sort();
+  lazyInitVanillaCollectibles();
+
   for (const collectibleType of VANILLA_COLLECTIBLES_ARRAY) {
-    VANILLA_COLLECTIBLES_SET.add(collectibleType);
+    ALL_COLLECTIBLES_ARRAY.push(collectibleType);
+    ALL_COLLECTIBLES_SET.add(collectibleType);
   }
 
-  MODDED_COLLECTIBLES_ARRAY.sort();
-  for (const collectibleType of MODDED_COLLECTIBLES_ARRAY) {
-    MODDED_COLLECTIBLES_SET.add(collectibleType);
+  const moddedCollectibleTypes = getModdedCollectibleTypes();
+  for (const collectibleType of moddedCollectibleTypes) {
+    // Modded collectible types are contiguous, but we check every value just in case.
+    const itemConfigItem = itemConfig.GetCollectible(collectibleType);
+    if (itemConfigItem !== undefined) {
+      MODDED_COLLECTIBLES_ARRAY.push(collectibleType);
+      MODDED_COLLECTIBLES_SET.add(collectibleType);
+
+      ALL_COLLECTIBLES_ARRAY.push(collectibleType);
+      ALL_COLLECTIBLES_SET.add(collectibleType);
+    }
   }
 }
 
@@ -66,7 +65,7 @@ function lazyInitCollectibleArraysAndSets() {
  * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getCollectibleArray(): readonly CollectibleType[] {
-  lazyInitCollectibleArraysAndSets();
+  lazyInitModdedCollectibles();
   return ALL_COLLECTIBLES_ARRAY;
 }
 
@@ -80,7 +79,7 @@ export function getCollectibleArray(): readonly CollectibleType[] {
  * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getCollectibleSet(): ReadonlySet<CollectibleType> {
-  lazyInitCollectibleArraysAndSets();
+  lazyInitModdedCollectibles();
   return ALL_COLLECTIBLES_SET;
 }
 
@@ -94,7 +93,7 @@ export function getCollectibleSet(): ReadonlySet<CollectibleType> {
  * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getModdedCollectibleArray(): readonly CollectibleType[] {
-  lazyInitCollectibleArraysAndSets();
+  lazyInitModdedCollectibles();
   return MODDED_COLLECTIBLES_ARRAY;
 }
 
@@ -108,7 +107,7 @@ export function getModdedCollectibleArray(): readonly CollectibleType[] {
  * all collectibles will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getModdedCollectibleSet(): ReadonlySet<CollectibleType> {
-  lazyInitCollectibleArraysAndSets();
+  lazyInitModdedCollectibles();
   return MODDED_COLLECTIBLES_SET;
 }
 
@@ -117,12 +116,9 @@ export 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 function getVanillaCollectibleArray(): readonly CollectibleType[] {
-  lazyInitCollectibleArraysAndSets();
+  lazyInitVanillaCollectibles();
   return VANILLA_COLLECTIBLES_ARRAY;
 }
 
@@ -131,11 +127,8 @@ export 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 function getVanillaCollectibleSet(): ReadonlySet<CollectibleType> {
-  lazyInitCollectibleArraysAndSets();
+  lazyInitVanillaCollectibles();
   return VANILLA_COLLECTIBLES_SET;
 }

package/src/functions/collectibles.ts

@@ -376,7 +376,8 @@ export function getCollectibleTags(
  * 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 function getVanillaCollectibleTypeRange(): CollectibleType[] {
   return irange(FIRST_COLLECTIBLE_TYPE, LAST_VANILLA_COLLECTIBLE_TYPE);

package/src/functions/hex.ts

@@ -0,0 +1,60 @@
+import { logError } from "./log";
+
+const HEX_STRING_LENGTH = 6;
+
+/**
+ * Converts a hex string like "#33aa33" to a KColor object.
+ *
+ * @param hexString A hex string like "#ffffff" or "ffffff". (The "#" character is optional.)
+ */
+export function hexToColor(hexString: string, alpha: float): Color {
+  const [r, g, b] = hexToRGB(hexString);
+
+  // Color values should be between 0 and 1.
+  const base = 255;
+  return Color(r / base, g / base, b / base, alpha);
+}
+
+/**
+ * Converts a hex string like "#33aa33" to a Color object.
+ *
+ * @param hexString A hex string like "#ffffff" or "ffffff". (The "#" character is optional.)
+ */
+export function hexToKColor(hexString: string, alpha: float): KColor {
+  const [r, g, b] = hexToRGB(hexString);
+
+  // KColor values should be between 0 and 1.
+  const base = 255;
+  return KColor(r / base, g / base, b / base, alpha);
+}
+
+function hexToRGB(hexString: string): [r: float, g: float, b: float] {
+  hexString = hexString.replace("#", "");
+  if (hexString.length !== HEX_STRING_LENGTH) {
+    logError(`Hex strings must be of length: ${HEX_STRING_LENGTH}`);
+    return [0, 0, 0];
+  }
+
+  const rString = hexString.substring(0, 2);
+  const r = tonumber(`0x${rString}`);
+  if (r === undefined) {
+    logError(`Failed to convert \`0x${rString}\` to a number.`);
+    return [0, 0, 0];
+  }
+
+  const gString = hexString.substring(2, 4);
+  const g = tonumber(`0x${gString}`);
+  if (g === undefined) {
+    logError(`Failed to convert \`0x${gString}\` to a number.`);
+    return [0, 0, 0];
+  }
+
+  const bString = hexString.substring(4, 6);
+  const b = tonumber(`0x${bString}`);
+  if (b === undefined) {
+    logError(`Failed to convert \`0x${bString}\` to a number.`);
+    return [0, 0, 0];
+  }
+
+  return [r, g, b];
+}

package/src/functions/playerHealth.ts

@@ -16,6 +16,7 @@ import {
   isCharacter,
   setActiveItem,
 } from "./players";
+import { repeat } from "./utils";
 
 export function addPlayerHealthType(
   player: EntityPlayer,
@@ -210,7 +211,7 @@ export function getPlayerHealthType(
   }
 }
 
-/** Returns a `PlayerHealth` object with all 0s. */
+/** Returns a `PlayerHealth` object with all zeros. */
 export function newPlayerHealth(): PlayerHealth {
   return {
     maxHearts: 0,
@@ -381,8 +382,21 @@ export function setPlayerHealth(
 
   if (character === PlayerType.MAGDALENE_B) {
     // Adding 1 heart to Tainted Magdalene will actually add two hearts.
-    const effectiveHearts = playerHealth.hearts / 2;
-    player.AddHearts(effectiveHearts);
+    repeat(playerHealth.hearts, () => {
+      if (player.HasFullHearts()) {
+        return;
+      }
+
+      const hearts = player.GetHearts();
+      const maxHearts = player.GetMaxHearts();
+      if (hearts === maxHearts - 1) {
+        player.AddHearts(1);
+        return;
+      }
+
+      player.AddHearts(1);
+      player.AddHearts(-1);
+    });
   } else {
     player.AddHearts(playerHealth.hearts);
   }

package/src/functions/trinketSet.ts

@@ -1,57 +1,56 @@
 import { TrinketType } from "isaac-typescript-definitions";
 import { itemConfig } from "../core/cachedClasses";
-import {
-  FIRST_TRINKET_TYPE,
-  LAST_VANILLA_TRINKET_TYPE,
-} from "../core/constantsFirstLast";
-import { getLastTrinketType } from "../features/firstLast";
-import { irange } from "./utils";
+import { getModdedTrinketTypes } from "../features/firstLast";
+import { getVanillaTrinketTypes } from "./trinkets";
 
 const ALL_TRINKETS_ARRAY: TrinketType[] = [];
-const VANILLA_TRINKETS_ARRAY: TrinketType[] = [];
-const MODDED_TRINKETS_ARRAY: TrinketType[] = [];
-
 const ALL_TRINKETS_SET = new Set<TrinketType>();
+
+const VANILLA_TRINKETS_ARRAY: TrinketType[] = [];
 const VANILLA_TRINKETS_SET = new Set<TrinketType>();
+
+const MODDED_TRINKETS_ARRAY: TrinketType[] = [];
 const MODDED_TRINKETS_SET = new Set<TrinketType>();
 
-function lazyInitTrinketArraysAndSets() {
-  if (ALL_TRINKETS_ARRAY.length !== 0) {
+function lazyInitVanillaTrinkets() {
+  if (VANILLA_TRINKETS_ARRAY.length > 0) {
     return;
   }
 
-  const lastTrinketType = getLastTrinketType();
-  const trinketTypeRange = irange(
-    FIRST_TRINKET_TYPE,
-    lastTrinketType,
-  ) as TrinketType[];
-  for (const trinketType of trinketTypeRange) {
+  const vanillaTrinketTypes = getVanillaTrinketTypes();
+  for (const trinketType of vanillaTrinketTypes) {
+    // Vanilla trinket types are contiguous, but we check every value just in case.
     const itemConfigItem = itemConfig.GetTrinket(trinketType);
-    if (itemConfigItem === undefined) {
-      continue;
-    }
-
-    ALL_TRINKETS_ARRAY.push(trinketType);
-    if (trinketType <= LAST_VANILLA_TRINKET_TYPE) {
+    if (itemConfigItem !== undefined) {
       VANILLA_TRINKETS_ARRAY.push(trinketType);
-    } else {
-      MODDED_TRINKETS_ARRAY.push(trinketType);
+      VANILLA_TRINKETS_SET.add(trinketType);
     }
   }
+}
 
-  ALL_TRINKETS_ARRAY.sort();
-  for (const trinketType of ALL_TRINKETS_ARRAY) {
-    ALL_TRINKETS_SET.add(trinketType);
+function lazyInitModdedTrinkets() {
+  if (MODDED_TRINKETS_ARRAY.length > 0) {
+    return;
   }
 
-  VANILLA_TRINKETS_ARRAY.sort();
+  lazyInitVanillaTrinkets();
+
   for (const trinketType of VANILLA_TRINKETS_ARRAY) {
-    VANILLA_TRINKETS_SET.add(trinketType);
+    ALL_TRINKETS_ARRAY.push(trinketType);
+    ALL_TRINKETS_SET.add(trinketType);
   }
 
-  MODDED_TRINKETS_ARRAY.sort();
-  for (const trinketType of MODDED_TRINKETS_ARRAY) {
-    MODDED_TRINKETS_SET.add(trinketType);
+  const moddedTrinketTypes = getModdedTrinketTypes();
+  for (const trinketType of moddedTrinketTypes) {
+    // Modded trinket types are contiguous, but we check every value just in case.
+    const itemConfigItem = itemConfig.GetTrinket(trinketType);
+    if (itemConfigItem !== undefined) {
+      MODDED_TRINKETS_ARRAY.push(trinketType);
+      MODDED_TRINKETS_SET.add(trinketType);
+
+      ALL_TRINKETS_ARRAY.push(trinketType);
+      ALL_TRINKETS_SET.add(trinketType);
+    }
   }
 }
 
@@ -65,7 +64,7 @@ function lazyInitTrinketArraysAndSets() {
  * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getModdedTrinketArray(): readonly TrinketType[] {
-  lazyInitTrinketArraysAndSets();
+  lazyInitModdedTrinkets();
   return MODDED_TRINKETS_ARRAY;
 }
 
@@ -79,7 +78,7 @@ export function getModdedTrinketArray(): readonly TrinketType[] {
  * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getModdedTrinketSet(): ReadonlySet<TrinketType> {
-  lazyInitTrinketArraysAndSets();
+  lazyInitModdedTrinkets();
   return MODDED_TRINKETS_SET;
 }
 
@@ -93,7 +92,7 @@ export function getModdedTrinketSet(): ReadonlySet<TrinketType> {
  * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getTrinketArray(): readonly TrinketType[] {
-  lazyInitTrinketArraysAndSets();
+  lazyInitModdedTrinkets();
   return ALL_TRINKETS_ARRAY;
 }
 
@@ -107,7 +106,7 @@ export function getTrinketArray(): readonly TrinketType[] {
  * all trinkets will necessarily be present when a mod first loads (due to mod load order).
  */
 export function getTrinketSet(): ReadonlySet<TrinketType> {
-  lazyInitTrinketArraysAndSets();
+  lazyInitModdedTrinkets();
   return ALL_TRINKETS_SET;
 }
 
@@ -116,12 +115,9 @@ export 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 function getVanillaTrinketArray(): readonly TrinketType[] {
-  lazyInitTrinketArraysAndSets();
+  lazyInitVanillaTrinkets();
   return VANILLA_TRINKETS_ARRAY;
 }
 
@@ -130,11 +126,8 @@ export 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 function getVanillaTrinketSet(): ReadonlySet<TrinketType> {
-  lazyInitTrinketArraysAndSets();
+  lazyInitVanillaTrinkets();
   return VANILLA_TRINKETS_SET;
 }

package/src/functions/utils.ts

@@ -2,8 +2,6 @@ import { RenderMode } from "isaac-typescript-definitions";
 import { game } from "../core/cachedClasses";
 import { CONSOLE_COMMANDS_SET } from "../sets/consoleCommandsSet";
 
-const HEX_STRING_LENGTH = 6;
-
 /**
  * Helper function to return an array with the elements from start to end. It is inclusive at the
  * start and exclusive at the end. (The "e" stands for exclusive.)
@@ -44,59 +42,6 @@ export function getTraversalDescription(
   return traversalDescription;
 }
 
-/**
- * Converts a hex string like "#33aa33" to a KColor object.
- *
- * @param hexString A hex string like "#ffffff" or "ffffff". (The "#" character is optional.)
- */
-export function hexToColor(hexString: string, alpha: float): Color {
-  const [r, g, b] = hexToRGB(hexString);
-
-  // Color values should be between 0 and 1.
-  const base = 255;
-  return Color(r / base, g / base, b / base, alpha);
-}
-
-/**
- * Converts a hex string like "#33aa33" to a Color object.
- *
- * @param hexString A hex string like "#ffffff" or "ffffff". (The "#" character is optional.)
- */
-export function hexToKColor(hexString: string, alpha: float): KColor {
-  const [r, g, b] = hexToRGB(hexString);
-
-  // KColor values should be between 0 and 1.
-  const base = 255;
-  return KColor(r / base, g / base, b / base, alpha);
-}
-
-function hexToRGB(hexString: string): [r: float, g: float, b: float] {
-  hexString = hexString.replace("#", "");
-  if (hexString.length !== HEX_STRING_LENGTH) {
-    error(`Hex strings must be of length: ${HEX_STRING_LENGTH}`);
-  }
-
-  const rString = hexString.substring(0, 2);
-  const r = tonumber(`0x${rString}`);
-  if (r === undefined) {
-    error(`Failed to convert \`0x${rString}\` to a number.`);
-  }
-
-  const gString = hexString.substring(2, 4);
-  const g = tonumber(`0x${gString}`);
-  if (g === undefined) {
-    error(`Failed to convert \`0x${gString}\` to a number.`);
-  }
-
-  const bString = hexString.substring(4, 6);
-  const b = tonumber(`0x${bString}`);
-  if (b === undefined) {
-    error(`Failed to convert \`0x${bString}\` to a number.`);
-  }
-
-  return [r, g, b];
-}
-
 /**
  * Helper function to return an array with the elements from start to end, inclusive. (The "i"
  * stands for inclusive.)

package/src/index.ts

@@ -84,6 +84,7 @@ export * from "./functions/flying";
 export * from "./functions/globals";
 export * from "./functions/gridEntities";
 export * from "./functions/gridEntitiesSpecific";
+export * from "./functions/hex";
 export * from "./functions/input";
 export * from "./functions/isaacAPIClass";
 export * from "./functions/itemPool";