isaacscript-common 31.0.0 → 31.0.1

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 31.0.0
+isaacscript-common 31.0.1
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -9043,7 +9043,7 @@ ____exports.TrinketType[____exports.TrinketType.SIGIL_OF_BAPHOMET] = "SIGIL_OF_B
 ____exports.BedSubType = {}
 ____exports.BedSubType.ISAAC = 0
 ____exports.BedSubType[____exports.BedSubType.ISAAC] = "ISAAC"
-____exports.BedSubType.MOM = 1
+____exports.BedSubType.MOM = 10
 ____exports.BedSubType[____exports.BedSubType.MOM] = "MOM"
 --- For `EntityType.LASER` (7).
 ____exports.LaserSubType = {}
@@ -50711,7 +50711,7 @@ function removeItemsAndTrinketsThatAffectItemPools(self)
         end
         mapSetPlayer(nil, removedTrinketsMap, player, removedTrinkets)
     end
-    return {removedItemsMap, removedTrinketsMap}
+    return {removedItemsMap = removedItemsMap, removedTrinketsMap = removedTrinketsMap}
 end
 function restoreItemsAndTrinketsThatAffectItemPools(self, removedItemsMap, removedTrinketsMap)
     for ____, player in ipairs(getAllPlayers(nil)) do
@@ -50762,7 +50762,9 @@ function ItemPoolDetection.prototype.isCollectibleInItemPool(self, collectibleTy
             player:ChangePlayerType(PlayerType.ISAAC)
         end
     end
-    local removedItemsMap, removedTrinketsMap = table.unpack(removeItemsAndTrinketsThatAffectItemPools(nil))
+    local ____removeItemsAndTrinketsThatAffectItemPools_result_0 = removeItemsAndTrinketsThatAffectItemPools(nil)
+    local removedItemsMap = ____removeItemsAndTrinketsThatAffectItemPools_result_0.removedItemsMap
+    local removedTrinketsMap = ____removeItemsAndTrinketsThatAffectItemPools_result_0.removedTrinketsMap
     local itemPool = game:GetItemPool()
     itemPool:ResetRoomBlacklist()
     for ____, collectibleTypeInSet in ipairs(self.moddedElementSets:getCollectibleArray()) do
@@ -53190,34 +53192,37 @@ 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}
+        return {r = 0, g = 0, b = 0}
     end
     local rString = string.sub(hexString, 1, 2)
     local r = tonumber("0x" .. rString)
     if r == nil then
         logError(("Failed to convert `0x" .. rString) .. "` to a number.")
-        return {0, 0, 0}
+        return {r = 0, g = 0, b = 0}
     end
     local gString = string.sub(hexString, 3, 4)
     local g = tonumber("0x" .. gString)
     if g == nil then
         logError(("Failed to convert `0x" .. gString) .. "` to a number.")
-        return {0, 0, 0}
+        return {r = 0, g = 0, b = 0}
     end
     local bString = string.sub(hexString, 5, 6)
     local b = tonumber("0x" .. bString)
     if b == nil then
         logError(("Failed to convert `0x" .. bString) .. "` to a number.")
-        return {0, 0, 0}
+        return {r = 0, g = 0, b = 0}
     end
-    return {r, g, b}
+    return {r = r, g = g, b = b}
 end
 HEX_STRING_LENGTH = 6
 function ____exports.hexToColor(self, hexString, alpha)
     if alpha == nil then
         alpha = 1
     end
-    local r, g, b = table.unpack(hexToRGB(nil, hexString))
+    local ____hexToRGB_result_0 = hexToRGB(nil, hexString)
+    local r = ____hexToRGB_result_0.r
+    local g = ____hexToRGB_result_0.g
+    local b = ____hexToRGB_result_0.b
     local base = 255
     return Color(r / base, g / base, b / base, alpha)
 end
@@ -53225,7 +53230,10 @@ function ____exports.hexToKColor(self, hexString, alpha)
     if alpha == nil then
         alpha = 1
     end
-    local r, g, b = table.unpack(hexToRGB(nil, hexString))
+    local ____hexToRGB_result_1 = hexToRGB(nil, hexString)
+    local r = ____hexToRGB_result_1.r
+    local g = ____hexToRGB_result_1.g
+    local b = ____hexToRGB_result_1.b
     local base = 255
     return KColor(r / base, g / base, b / base, alpha)
 end

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

@@ -65,7 +65,7 @@ function removeItemsAndTrinketsThatAffectItemPools(self)
         end
         mapSetPlayer(nil, removedTrinketsMap, player, removedTrinkets)
     end
-    return {removedItemsMap, removedTrinketsMap}
+    return {removedItemsMap = removedItemsMap, removedTrinketsMap = removedTrinketsMap}
 end
 function restoreItemsAndTrinketsThatAffectItemPools(self, removedItemsMap, removedTrinketsMap)
     for ____, player in ipairs(getAllPlayers(nil)) do
@@ -116,7 +116,9 @@ function ItemPoolDetection.prototype.isCollectibleInItemPool(self, collectibleTy
             player:ChangePlayerType(PlayerType.ISAAC)
         end
     end
-    local removedItemsMap, removedTrinketsMap = table.unpack(removeItemsAndTrinketsThatAffectItemPools(nil))
+    local ____removeItemsAndTrinketsThatAffectItemPools_result_0 = removeItemsAndTrinketsThatAffectItemPools(nil)
+    local removedItemsMap = ____removeItemsAndTrinketsThatAffectItemPools_result_0.removedItemsMap
+    local removedTrinketsMap = ____removeItemsAndTrinketsThatAffectItemPools_result_0.removedTrinketsMap
     local itemPool = game:GetItemPool()
     itemPool:ResetRoomBlacklist()
     for ____, collectibleTypeInSet in ipairs(self.moddedElementSets:getCollectibleArray()) do

package/dist/src/functions/hex.lua

@@ -8,27 +8,27 @@ 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}
+        return {r = 0, g = 0, b = 0}
     end
     local rString = string.sub(hexString, 1, 2)
     local r = tonumber("0x" .. rString)
     if r == nil then
         logError(("Failed to convert `0x" .. rString) .. "` to a number.")
-        return {0, 0, 0}
+        return {r = 0, g = 0, b = 0}
     end
     local gString = string.sub(hexString, 3, 4)
     local g = tonumber("0x" .. gString)
     if g == nil then
         logError(("Failed to convert `0x" .. gString) .. "` to a number.")
-        return {0, 0, 0}
+        return {r = 0, g = 0, b = 0}
     end
     local bString = string.sub(hexString, 5, 6)
     local b = tonumber("0x" .. bString)
     if b == nil then
         logError(("Failed to convert `0x" .. bString) .. "` to a number.")
-        return {0, 0, 0}
+        return {r = 0, g = 0, b = 0}
     end
-    return {r, g, b}
+    return {r = r, g = g, b = b}
 end
 HEX_STRING_LENGTH = 6
 --- Converts a hex string like "#33aa33" to a KColor object.
@@ -39,7 +39,10 @@ function ____exports.hexToColor(self, hexString, alpha)
     if alpha == nil then
         alpha = 1
     end
-    local r, g, b = table.unpack(hexToRGB(nil, hexString))
+    local ____hexToRGB_result_0 = hexToRGB(nil, hexString)
+    local r = ____hexToRGB_result_0.r
+    local g = ____hexToRGB_result_0.g
+    local b = ____hexToRGB_result_0.b
     local base = 255
     return Color(r / base, g / base, b / base, alpha)
 end
@@ -51,7 +54,10 @@ function ____exports.hexToKColor(self, hexString, alpha)
     if alpha == nil then
         alpha = 1
     end
-    local r, g, b = table.unpack(hexToRGB(nil, hexString))
+    local ____hexToRGB_result_1 = hexToRGB(nil, hexString)
+    local r = ____hexToRGB_result_1.r
+    local g = ____hexToRGB_result_1.g
+    local b = ____hexToRGB_result_1.b
     local base = 255
     return KColor(r / base, g / base, b / base, alpha)
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "31.0.0",
+  "version": "31.0.1",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -25,6 +25,6 @@
   "main": "dist/src/index",
   "types": "dist/index.rollup.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^13.0.23"
+    "isaac-typescript-definitions": "^13.0.24"
   }
 }

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

@@ -99,7 +99,7 @@ export class ItemPoolDetection extends Feature {
       }
     }
 
-    const [removedItemsMap, removedTrinketsMap] =
+    const { removedItemsMap, removedTrinketsMap } =
       removeItemsAndTrinketsThatAffectItemPools();
 
     // Blacklist every collectible in the game except for the provided collectible.
@@ -173,10 +173,10 @@ export class ItemPoolDetection extends Feature {
  * Before checking the item pools, remove any collectibles or trinkets that would affect the
  * retrieved collectible types.
  */
-function removeItemsAndTrinketsThatAffectItemPools(): [
-  removedItemsMap: Map<PlayerIndex, CollectibleType[]>,
-  removedTrinketsMap: Map<PlayerIndex, TrinketType[]>,
-] {
+function removeItemsAndTrinketsThatAffectItemPools(): {
+  removedItemsMap: Map<PlayerIndex, CollectibleType[]>;
+  removedTrinketsMap: Map<PlayerIndex, TrinketType[]>;
+} {
   const removedItemsMap = new Map<PlayerIndex, CollectibleType[]>();
   const removedTrinketsMap = new Map<PlayerIndex, TrinketType[]>();
   for (const player of getAllPlayers()) {
@@ -207,7 +207,7 @@ function removeItemsAndTrinketsThatAffectItemPools(): [
     mapSetPlayer(removedTrinketsMap, player, removedTrinkets);
   }
 
-  return [removedItemsMap, removedTrinketsMap];
+  return { removedItemsMap, removedTrinketsMap };
 }
 
 function restoreItemsAndTrinketsThatAffectItemPools(

package/src/functions/hex.ts

@@ -9,7 +9,7 @@ const HEX_STRING_LENGTH = 6;
  * @param alpha Optional. Range is from 0 to 1. Default is 1. (The same as the `Color` constructor.)
  */
 export function hexToColor(hexString: string, alpha = 1): Readonly<Color> {
-  const [r, g, b] = hexToRGB(hexString);
+  const { r, g, b } = hexToRGB(hexString);
 
   // Color values should be between 0 and 1.
   const base = 255;
@@ -23,40 +23,40 @@ export function hexToColor(hexString: string, alpha = 1): Readonly<Color> {
  * @param alpha Range is from 0 to 1. Default is 1.
  */
 export function hexToKColor(hexString: string, alpha = 1): Readonly<KColor> {
-  const [r, g, b] = hexToRGB(hexString);
+  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] {
+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];
+    return { r: 0, g: 0, b: 0 };
   }
 
   const rString = hexString.slice(0, 2);
   const r = tonumber(`0x${rString}`);
   if (r === undefined) {
     logError(`Failed to convert \`0x${rString}\` to a number.`);
-    return [0, 0, 0];
+    return { r: 0, g: 0, b: 0 };
   }
 
   const gString = hexString.slice(2, 4);
   const g = tonumber(`0x${gString}`);
   if (g === undefined) {
     logError(`Failed to convert \`0x${gString}\` to a number.`);
-    return [0, 0, 0];
+    return { r: 0, g: 0, b: 0 };
   }
 
   const bString = hexString.slice(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: 0, g: 0, b: 0 };
   }
 
-  return [r, g, b];
+  return { r, g, b };
 }