isaacscript-common 2.0.30 → 2.0.33

package/{dist/features → features}/saveDataManager/exports.d.ts

@@ -105,3 +105,24 @@ export declare function saveDataManagerSave(): void;
  * e.g. `l print(g.feature1.foo)`
  */
 export declare function saveDataManagerSetGlobal(): void;
+/**
+ * The save data manager will automatically reset variables at the appropriate times (i.e. when a
+ * player enters a new room). Use this function to explicitly force the save data manager to reset a
+ * specific variable group.
+ *
+ * For example:
+ *
+ * ```
+ * const v = {
+ *   room: {
+ *     foo: 123,
+ *   },
+ * };
+ *
+ * saveDataManager("file1", v);
+ *
+ * // Then, later on, to explicit reset all of the "room" variables:
+ * saveDataManagerReset("file1", "room");
+ * ```
+ */
+export declare function saveDataManagerReset(key: string, childObjectKey: string): void;

package/{dist/features → features}/saveDataManager/exports.lua

@@ -2,18 +2,19 @@ local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local __TS__ObjectKeys = ____lualib.__TS__ObjectKeys
 local ____exports = {}
-local ____SerializationType = require("enums.SerializationType")
+local ____SerializationType = require("packages.isaacscript-common.src.enums.SerializationType")
 local SerializationType = ____SerializationType.SerializationType
-local ____featuresInitialized = require("featuresInitialized")
+local ____featuresInitialized = require("packages.isaacscript-common.src.featuresInitialized")
 local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
-local ____deepCopy = require("functions.deepCopy")
+local ____deepCopy = require("packages.isaacscript-common.src.functions.deepCopy")
 local deepCopy = ____deepCopy.deepCopy
-local ____constants = require("features.saveDataManager.constants")
+local ____constants = require("packages.isaacscript-common.src.features.saveDataManager.constants")
 local SAVE_DATA_MANAGER_FEATURE_NAME = ____constants.SAVE_DATA_MANAGER_FEATURE_NAME
-local ____main = require("features.saveDataManager.main")
+local ____main = require("packages.isaacscript-common.src.features.saveDataManager.main")
 local forceSaveDataManagerLoad = ____main.forceSaveDataManagerLoad
 local forceSaveDataManagerSave = ____main.forceSaveDataManagerSave
-local ____maps = require("features.saveDataManager.maps")
+local restoreDefaultSaveData = ____main.restoreDefaultSaveData
+local ____maps = require("packages.isaacscript-common.src.features.saveDataManager.maps")
 local saveDataConditionalFuncMap = ____maps.saveDataConditionalFuncMap
 local saveDataDefaultsMap = ____maps.saveDataDefaultsMap
 local saveDataMap = ____maps.saveDataMap
@@ -50,4 +51,16 @@ function ____exports.saveDataManagerSetGlobal(self)
     g = saveDataMap
     gd = saveDataDefaultsMap
 end
+function ____exports.saveDataManagerReset(self, key, childObjectKey)
+    errorIfFeaturesNotInitialized(nil, SAVE_DATA_MANAGER_FEATURE_NAME)
+    local keyType = type(key)
+    if keyType ~= "string" then
+        error((("The " .. SAVE_DATA_MANAGER_FEATURE_NAME) .. " requires that keys are strings. You tried to use a key of type: ") .. keyType)
+    end
+    local saveData = saveDataMap[key]
+    if saveData == nil then
+        error((("The " .. SAVE_DATA_MANAGER_FEATURE_NAME) .. " is not managing save data for a key of: ") .. key)
+    end
+    restoreDefaultSaveData(nil, key, saveData, childObjectKey)
+end
 return ____exports

package/{dist/features → features}/saveDataManager/load.lua

@@ -2,15 +2,15 @@ local ____lualib = require("lualib_bundle")
 local __TS__StringTrim = ____lualib.__TS__StringTrim
 local ____exports = {}
 local readSaveDatFile, tryLoadModData, DEFAULT_MOD_DATA
-local ____jsonHelpers = require("functions.jsonHelpers")
+local ____jsonHelpers = require("packages.isaacscript-common.src.functions.jsonHelpers")
 local jsonDecode = ____jsonHelpers.jsonDecode
-local ____log = require("functions.log")
+local ____log = require("packages.isaacscript-common.src.functions.log")
 local log = ____log.log
 local logError = ____log.logError
-local ____constants = require("features.saveDataManager.constants")
+local ____constants = require("packages.isaacscript-common.src.features.saveDataManager.constants")
 local SAVE_DATA_MANAGER_DEBUG = ____constants.SAVE_DATA_MANAGER_DEBUG
 local SAVE_DATA_MANAGER_FEATURE_NAME = ____constants.SAVE_DATA_MANAGER_FEATURE_NAME
-local ____merge = require("features.saveDataManager.merge")
+local ____merge = require("packages.isaacscript-common.src.features.saveDataManager.merge")
 local merge = ____merge.merge
 function readSaveDatFile(self, mod)
     local renderFrameCount = Isaac.GetFrameCount()

package/features/saveDataManager/main.d.ts

@@ -0,0 +1,3 @@
+import { SaveDataKey } from "../../enums/private/SaveDataKey";
+import { SaveData } from "../../types/private/SaveData";
+export declare function restoreDefaultSaveData(subscriberName: string, saveData: SaveData, saveDataKey: SaveDataKey): void;

package/{dist/features → features}/saveDataManager/main.lua

@@ -4,29 +4,30 @@ local ____exports = {}
 local postPlayerInit, preGameExit, postNewLevel, postNewRoomEarly, restoreDefaultsAll, restoreDefaults, clearAndCopyAllElements, mod, loadedDataOnThisRun
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
-local ____cachedClasses = require("cachedClasses")
+local ____cachedClasses = require("packages.isaacscript-common.src.cachedClasses")
 local game = ____cachedClasses.game
-local ____ModCallbackCustom = require("enums.ModCallbackCustom")
+local ____ModCallbackCustom = require("packages.isaacscript-common.src.enums.ModCallbackCustom")
 local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
-local ____SaveDataKeys = require("enums.private.SaveDataKeys")
-local SaveDataKeys = ____SaveDataKeys.SaveDataKeys
-local ____SerializationType = require("enums.SerializationType")
+local ____SaveDataKey = require("packages.isaacscript-common.src.enums.private.SaveDataKey")
+local RESETTABLE_SAVE_DATA_KEYS = ____SaveDataKey.RESETTABLE_SAVE_DATA_KEYS
+local SaveDataKey = ____SaveDataKey.SaveDataKey
+local ____SerializationType = require("packages.isaacscript-common.src.enums.SerializationType")
 local SerializationType = ____SerializationType.SerializationType
-local ____deepCopy = require("functions.deepCopy")
+local ____deepCopy = require("packages.isaacscript-common.src.functions.deepCopy")
 local deepCopy = ____deepCopy.deepCopy
-local ____log = require("functions.log")
+local ____log = require("packages.isaacscript-common.src.functions.log")
 local logError = ____log.logError
-local ____table = require("functions.table")
+local ____table = require("packages.isaacscript-common.src.functions.table")
 local clearTable = ____table.clearTable
-local ____constants = require("features.saveDataManager.constants")
+local ____constants = require("packages.isaacscript-common.src.features.saveDataManager.constants")
 local SAVE_DATA_MANAGER_FEATURE_NAME = ____constants.SAVE_DATA_MANAGER_FEATURE_NAME
-local ____load = require("features.saveDataManager.load")
+local ____load = require("packages.isaacscript-common.src.features.saveDataManager.load")
 local loadFromDisk = ____load.loadFromDisk
-local ____maps = require("features.saveDataManager.maps")
+local ____maps = require("packages.isaacscript-common.src.features.saveDataManager.maps")
 local saveDataConditionalFuncMap = ____maps.saveDataConditionalFuncMap
 local saveDataDefaultsMap = ____maps.saveDataDefaultsMap
 local saveDataMap = ____maps.saveDataMap
-local ____save = require("features.saveDataManager.save")
+local ____save = require("packages.isaacscript-common.src.features.saveDataManager.save")
 local saveToDisk = ____save.saveToDisk
 function postPlayerInit(self)
     if mod == nil then
@@ -52,41 +53,41 @@ function preGameExit(self)
     loadedDataOnThisRun = false
 end
 function postNewLevel(self)
-    restoreDefaults(nil, SaveDataKeys.LEVEL)
+    restoreDefaults(nil, SaveDataKey.LEVEL)
 end
 function postNewRoomEarly(self)
-    restoreDefaults(nil, SaveDataKeys.ROOM)
+    restoreDefaults(nil, SaveDataKey.ROOM)
 end
 function restoreDefaultsAll(self)
-    restoreDefaults(nil, SaveDataKeys.RUN)
-    restoreDefaults(nil, SaveDataKeys.LEVEL)
-    restoreDefaults(nil, SaveDataKeys.ROOM)
+    restoreDefaults(nil, SaveDataKey.RUN)
+    restoreDefaults(nil, SaveDataKey.LEVEL)
+    restoreDefaults(nil, SaveDataKey.ROOM)
 end
-function restoreDefaults(self, childTableName)
-    if childTableName ~= SaveDataKeys.RUN and childTableName ~= SaveDataKeys.LEVEL and childTableName ~= SaveDataKeys.ROOM then
-        error("Unknown child table name of: " .. childTableName)
-    end
+function restoreDefaults(self, saveDataKey)
     for subscriberName, saveData in pairs(saveDataMap) do
-        do
-            local childTable = saveData[childTableName]
-            if childTable == nil then
-                goto __continue14
-            end
-            local saveDataDefaults = saveDataDefaultsMap[subscriberName]
-            if saveDataDefaults == nil then
-                logError("Failed to find the default copy of the save data for subscriber: " .. subscriberName)
-                goto __continue14
-            end
-            local childTableDefaults = saveDataDefaults[childTableName]
-            if childTableDefaults == nil then
-                logError(((("Failed to find the default copy of the child table \"" .. childTableName) .. "\" for subscriber \"") .. subscriberName) .. "\". This error usually means that your save data is out of date. You can try purging all of your save data by deleting the following directory: C:\\Program Files (x86)\\Steam\\steamapps\\common\\The Binding of Isaac Rebirth\\data")
-                goto __continue14
-            end
-            local childTableDefaultsCopy = deepCopy(nil, childTableDefaults, SerializationType.NONE, (subscriberName .. " --> ") .. childTableName)
-            clearAndCopyAllElements(nil, childTable, childTableDefaultsCopy)
-        end
-        ::__continue14::
+        ____exports.restoreDefaultSaveData(nil, subscriberName, saveData, saveDataKey)
+    end
+end
+function ____exports.restoreDefaultSaveData(self, subscriberName, saveData, saveDataKey)
+    if not RESETTABLE_SAVE_DATA_KEYS:has(saveDataKey) then
+        error("Unknown save data key name of: " .. saveDataKey)
+    end
+    local childTable = saveData[saveDataKey]
+    if childTable == nil then
+        return
+    end
+    local saveDataDefaults = saveDataDefaultsMap[subscriberName]
+    if saveDataDefaults == nil then
+        logError("Failed to find the default copy of the save data for subscriber: " .. subscriberName)
+        return
+    end
+    local childTableDefaults = saveDataDefaults[saveDataKey]
+    if childTableDefaults == nil then
+        logError(((("Failed to find the default copy of the child table \"" .. saveDataKey) .. "\" for subscriber \"") .. subscriberName) .. "\". This error usually means that your save data is out of date. You can try purging all of your save data by deleting the following directory: C:\\Program Files (x86)\\Steam\\steamapps\\common\\The Binding of Isaac Rebirth\\data")
+        return
     end
+    local childTableDefaultsCopy = deepCopy(nil, childTableDefaults, SerializationType.NONE, (subscriberName .. " --> ") .. saveDataKey)
+    clearAndCopyAllElements(nil, childTable, childTableDefaultsCopy)
 end
 function clearAndCopyAllElements(self, oldTable, newTable)
     clearTable(nil, oldTable)

package/{dist/features → features}/saveDataManager/merge.lua

@@ -4,26 +4,26 @@ local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local Set = ____lualib.Set
 local ____exports = {}
 local mergeArray, mergeTSTLObject, mergeTable
-local ____SerializationBrand = require("enums.private.SerializationBrand")
+local ____SerializationBrand = require("packages.isaacscript-common.src.enums.private.SerializationBrand")
 local SerializationBrand = ____SerializationBrand.SerializationBrand
-local ____SerializationType = require("enums.SerializationType")
+local ____SerializationType = require("packages.isaacscript-common.src.enums.SerializationType")
 local SerializationType = ____SerializationType.SerializationType
-local ____array = require("functions.array")
+local ____array = require("packages.isaacscript-common.src.functions.array")
 local isArray = ____array.isArray
-local ____deepCopy = require("functions.deepCopy")
+local ____deepCopy = require("packages.isaacscript-common.src.functions.deepCopy")
 local deepCopy = ____deepCopy.deepCopy
-local ____log = require("functions.log")
+local ____log = require("packages.isaacscript-common.src.functions.log")
 local log = ____log.log
-local ____serialization = require("functions.serialization")
+local ____serialization = require("packages.isaacscript-common.src.functions.serialization")
 local deserializeIsaacAPIClass = ____serialization.deserializeIsaacAPIClass
 local isSerializedIsaacAPIClass = ____serialization.isSerializedIsaacAPIClass
-local ____table = require("functions.table")
+local ____table = require("packages.isaacscript-common.src.functions.table")
 local clearTable = ____table.clearTable
-local ____utils = require("functions.utils")
+local ____utils = require("packages.isaacscript-common.src.functions.utils")
 local getTraversalDescription = ____utils.getTraversalDescription
-local ____constants = require("features.saveDataManager.constants")
+local ____constants = require("packages.isaacscript-common.src.features.saveDataManager.constants")
 local SAVE_DATA_MANAGER_DEBUG = ____constants.SAVE_DATA_MANAGER_DEBUG
-local ____serializationBrand = require("features.saveDataManager.serializationBrand")
+local ____serializationBrand = require("packages.isaacscript-common.src.features.saveDataManager.serializationBrand")
 local isSerializationBrand = ____serializationBrand.isSerializationBrand
 function ____exports.merge(self, oldObject, newTable, traversalDescription)
     if SAVE_DATA_MANAGER_DEBUG then

package/{dist/features → features}/saveDataManager/save.lua

@@ -3,15 +3,15 @@ local Map = ____lualib.Map
 local __TS__ObjectKeys = ____lualib.__TS__ObjectKeys
 local ____exports = {}
 local getAllSaveDataToWriteToDisk
-local ____SerializationType = require("enums.SerializationType")
+local ____SerializationType = require("packages.isaacscript-common.src.enums.SerializationType")
 local SerializationType = ____SerializationType.SerializationType
-local ____deepCopy = require("functions.deepCopy")
+local ____deepCopy = require("packages.isaacscript-common.src.functions.deepCopy")
 local deepCopy = ____deepCopy.deepCopy
-local ____jsonHelpers = require("functions.jsonHelpers")
+local ____jsonHelpers = require("packages.isaacscript-common.src.functions.jsonHelpers")
 local jsonEncode = ____jsonHelpers.jsonEncode
-local ____log = require("functions.log")
+local ____log = require("packages.isaacscript-common.src.functions.log")
 local log = ____log.log
-local ____constants = require("features.saveDataManager.constants")
+local ____constants = require("packages.isaacscript-common.src.features.saveDataManager.constants")
 local SAVE_DATA_MANAGER_FEATURE_NAME = ____constants.SAVE_DATA_MANAGER_FEATURE_NAME
 function getAllSaveDataToWriteToDisk(self, saveDataMap, saveDataConditionalFuncMap)
     local allSaveData = {}

package/{dist/features → features}/saveDataManager/serializationBrand.lua

@@ -2,9 +2,9 @@ local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local ____SerializationBrand = require("enums.private.SerializationBrand")
+local ____SerializationBrand = require("packages.isaacscript-common.src.enums.private.SerializationBrand")
 local SerializationBrand = ____SerializationBrand.SerializationBrand
-local ____enums = require("functions.enums")
+local ____enums = require("packages.isaacscript-common.src.functions.enums")
 local getEnumValues = ____enums.getEnumValues
 local SERIALIZATION_BRANDS = getEnumValues(nil, SerializationBrand)
 local SERIALIZATION_BRAND_SET = __TS__New(Set, SERIALIZATION_BRANDS)

package/{dist/features → features}/sirenHelpers.lua

@@ -5,11 +5,11 @@ local postNPCInitSirenHelper, checkReturnFamiliarToPlayer, blacklistEntryExists,
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
-local ____featuresInitialized = require("featuresInitialized")
+local ____featuresInitialized = require("packages.isaacscript-common.src.featuresInitialized")
 local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
-local ____entity = require("functions.entity")
+local ____entity = require("packages.isaacscript-common.src.functions.entity")
 local getEntities = ____entity.getEntities
-local ____exports = require("features.saveDataManager.exports")
+local ____exports = require("packages.isaacscript-common.src.features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 function postNPCInitSirenHelper(self, npc)
     checkReturnFamiliarToPlayer(nil, npc)

package/{dist/features → features}/taintedLazarusPlayers.lua

@@ -6,9 +6,9 @@ local postPlayerInit, checkDequeue, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
-local ____featuresInitialized = require("featuresInitialized")
+local ____featuresInitialized = require("packages.isaacscript-common.src.featuresInitialized")
 local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
-local ____exports = require("features.saveDataManager.exports")
+local ____exports = require("packages.isaacscript-common.src.features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 function postPlayerInit(self, player)
     local entityPtr = EntityPtr(player)

package/{dist/functions → functions}/array.lua

@@ -11,13 +11,13 @@ local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__ArraySome = ____lualib.__TS__ArraySome
 local __TS__ArrayReduce = ____lualib.__TS__ArrayReduce
 local ____exports = {}
-local ____random = require("functions.random")
+local ____random = require("packages.isaacscript-common.src.functions.random")
 local getRandomInt = ____random.getRandomInt
-local ____rng = require("functions.rng")
+local ____rng = require("packages.isaacscript-common.src.functions.rng")
 local getRandomSeed = ____rng.getRandomSeed
 local isRNG = ____rng.isRNG
 local newRNG = ____rng.newRNG
-local ____utils = require("functions.utils")
+local ____utils = require("packages.isaacscript-common.src.functions.utils")
 local erange = ____utils.erange
 local ____repeat = ____utils["repeat"]
 function ____exports.getRandomArrayIndex(self, array, seedOrRNG)

package/{dist/functions → functions}/benchmark.lua

@@ -1,7 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayForEach = ____lualib.__TS__ArrayForEach
 local ____exports = {}
-local ____log = require("functions.log")
+local ____log = require("packages.isaacscript-common.src.functions.log")
 local log = ____log.log
 function ____exports.benchmark(self, numTrials, ...)
     local functions = {...}

package/{dist/functions → functions}/boss.lua

@@ -7,22 +7,22 @@ local getNumBossSegments, DEFAULT_BOSS_MULTI_SEGMENTS
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local EntityType = ____isaac_2Dtypescript_2Ddefinitions.EntityType
 local LokiVariant = ____isaac_2Dtypescript_2Ddefinitions.LokiVariant
-local ____constants = require("constants")
+local ____constants = require("packages.isaacscript-common.src.constants")
 local VectorZero = ____constants.VectorZero
-local ____bossSets = require("sets.bossSets")
+local ____bossSets = require("packages.isaacscript-common.src.sets.bossSets")
 local ALL_BOSSES_SET = ____bossSets.ALL_BOSSES_SET
 local STAGE_TO_COMBINED_BOSS_SET_MAP = ____bossSets.STAGE_TO_COMBINED_BOSS_SET_MAP
 local STAGE_TO_STAGE_TYPE_TO_BOSS_SET_MAP = ____bossSets.STAGE_TO_STAGE_TYPE_TO_BOSS_SET_MAP
-local ____sinEntityTypesSet = require("sets.sinEntityTypesSet")
+local ____sinEntityTypesSet = require("packages.isaacscript-common.src.sets.sinEntityTypesSet")
 local SIN_ENTITY_TYPES_SET = ____sinEntityTypesSet.SIN_ENTITY_TYPES_SET
-local ____entitySpecific = require("functions.entitySpecific")
+local ____entitySpecific = require("packages.isaacscript-common.src.functions.entitySpecific")
 local getNPCs = ____entitySpecific.getNPCs
 local spawnNPC = ____entitySpecific.spawnNPC
-local ____npc = require("functions.npc")
+local ____npc = require("packages.isaacscript-common.src.functions.npc")
 local getAliveNPCs = ____npc.getAliveNPCs
-local ____set = require("functions.set")
+local ____set = require("packages.isaacscript-common.src.functions.set")
 local copySet = ____set.copySet
-local ____utils = require("functions.utils")
+local ____utils = require("packages.isaacscript-common.src.functions.utils")
 local ____repeat = ____utils["repeat"]
 function getNumBossSegments(self, entityType, variant, numSegments)
     if numSegments ~= nil then

package/{dist/functions → functions}/cacheFlag.lua

@@ -1,5 +1,5 @@
 local ____exports = {}
-local ____defaultPlayerStatMap = require("maps.defaultPlayerStatMap")
+local ____defaultPlayerStatMap = require("packages.isaacscript-common.src.maps.defaultPlayerStatMap")
 local DEFAULT_PLAYER_STAT_MAP = ____defaultPlayerStatMap.DEFAULT_PLAYER_STAT_MAP
 function ____exports.getDefaultPlayerStat(self, cacheFlag)
     return DEFAULT_PLAYER_STAT_MAP:get(cacheFlag)

package/{dist/functions → functions}/cards.lua

@@ -8,30 +8,30 @@ local initCardObjects, CARD_TYPE_TO_CARDS_MAP, CARD_SET
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local Card = ____isaac_2Dtypescript_2Ddefinitions.Card
 local ItemConfigCardType = ____isaac_2Dtypescript_2Ddefinitions.ItemConfigCardType
-local ____cachedClasses = require("cachedClasses")
+local ____cachedClasses = require("packages.isaacscript-common.src.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-local ____constantsMax = require("constantsMax")
+local ____constantsMax = require("packages.isaacscript-common.src.constantsMax")
 local FIRST_CARD = ____constantsMax.FIRST_CARD
 local FIRST_MODDED_CARD = ____constantsMax.FIRST_MODDED_CARD
 local LAST_CARD = ____constantsMax.LAST_CARD
 local MAX_VANILLA_CARD = ____constantsMax.MAX_VANILLA_CARD
-local ____cardDescriptions = require("objects.cardDescriptions")
+local ____cardDescriptions = require("packages.isaacscript-common.src.objects.cardDescriptions")
 local CARD_DESCRIPTIONS = ____cardDescriptions.CARD_DESCRIPTIONS
 local DEFAULT_CARD_DESCRIPTION = ____cardDescriptions.DEFAULT_CARD_DESCRIPTION
-local ____cardNames = require("objects.cardNames")
+local ____cardNames = require("packages.isaacscript-common.src.objects.cardNames")
 local CARD_NAMES = ____cardNames.CARD_NAMES
 local DEFAULT_CARD_NAME = ____cardNames.DEFAULT_CARD_NAME
-local ____cardTypes = require("objects.cardTypes")
+local ____cardTypes = require("packages.isaacscript-common.src.objects.cardTypes")
 local CARD_TYPES = ____cardTypes.CARD_TYPES
 local DEFAULT_CARD_TYPE = ____cardTypes.DEFAULT_CARD_TYPE
-local ____enums = require("functions.enums")
+local ____enums = require("packages.isaacscript-common.src.functions.enums")
 local getEnumValues = ____enums.getEnumValues
-local ____rng = require("functions.rng")
+local ____rng = require("packages.isaacscript-common.src.functions.rng")
 local getRandomSeed = ____rng.getRandomSeed
-local ____set = require("functions.set")
+local ____set = require("packages.isaacscript-common.src.functions.set")
 local addSetsToSet = ____set.addSetsToSet
 local getRandomSetElement = ____set.getRandomSetElement
-local ____utils = require("functions.utils")
+local ____utils = require("packages.isaacscript-common.src.functions.utils")
 local irange = ____utils.irange
 function initCardObjects(self)
     for ____, cardType in ipairs(getEnumValues(nil, ItemConfigCardType)) do

package/{dist/functions → functions}/challenges.lua

@@ -1,5 +1,5 @@
 local ____exports = {}
-local ____challengeNames = require("objects.challengeNames")
+local ____challengeNames = require("packages.isaacscript-common.src.objects.challengeNames")
 local CHALLENGE_NAMES = ____challengeNames.CHALLENGE_NAMES
 local DEFAULT_CHALLENGE_NAME = ____challengeNames.DEFAULT_CHALLENGE_NAME
 function ____exports.getChallengeName(self, challenge)

package/{dist/functions → functions}/character.lua

@@ -1,22 +1,22 @@
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local PlayerType = ____isaac_2Dtypescript_2Ddefinitions.PlayerType
-local ____constantsMax = require("constantsMax")
+local ____constantsMax = require("packages.isaacscript-common.src.constantsMax")
 local LAST_VANILLA_CHARACTER = ____constantsMax.LAST_VANILLA_CHARACTER
-local ____characterNames = require("objects.characterNames")
+local ____characterNames = require("packages.isaacscript-common.src.objects.characterNames")
 local CHARACTER_NAMES = ____characterNames.CHARACTER_NAMES
 local DEFAULT_CHARACTER_NAME = ____characterNames.DEFAULT_CHARACTER_NAME
-local ____charactersThatStartWithAnActiveItemSet = require("sets.charactersThatStartWithAnActiveItemSet")
+local ____charactersThatStartWithAnActiveItemSet = require("packages.isaacscript-common.src.sets.charactersThatStartWithAnActiveItemSet")
 local CHARACTERS_THAT_START_WITH_AN_ACTIVE_ITEM_SET = ____charactersThatStartWithAnActiveItemSet.CHARACTERS_THAT_START_WITH_AN_ACTIVE_ITEM_SET
-local ____charactersWithBlackHeartFromEternalHeartSet = require("sets.charactersWithBlackHeartFromEternalHeartSet")
+local ____charactersWithBlackHeartFromEternalHeartSet = require("packages.isaacscript-common.src.sets.charactersWithBlackHeartFromEternalHeartSet")
 local CHARACTERS_WITH_BLACK_HEART_FROM_ETERNAL_HEART_SET = ____charactersWithBlackHeartFromEternalHeartSet.CHARACTERS_WITH_BLACK_HEART_FROM_ETERNAL_HEART_SET
-local ____charactersWithFreeDevilDealsSet = require("sets.charactersWithFreeDevilDealsSet")
+local ____charactersWithFreeDevilDealsSet = require("packages.isaacscript-common.src.sets.charactersWithFreeDevilDealsSet")
 local CHARACTERS_WITH_FREE_DEVIL_DEALS_SET = ____charactersWithFreeDevilDealsSet.CHARACTERS_WITH_FREE_DEVIL_DEALS_SET
-local ____charactersWithNoRedHeartsSet = require("sets.charactersWithNoRedHeartsSet")
+local ____charactersWithNoRedHeartsSet = require("packages.isaacscript-common.src.sets.charactersWithNoRedHeartsSet")
 local CHARACTERS_WITH_NO_RED_HEARTS_SET = ____charactersWithNoRedHeartsSet.CHARACTERS_WITH_NO_RED_HEARTS_SET
-local ____charactersWithNoSoulHeartsSet = require("sets.charactersWithNoSoulHeartsSet")
+local ____charactersWithNoSoulHeartsSet = require("packages.isaacscript-common.src.sets.charactersWithNoSoulHeartsSet")
 local CHARACTERS_WITH_NO_SOUL_HEARTS_SET = ____charactersWithNoSoulHeartsSet.CHARACTERS_WITH_NO_SOUL_HEARTS_SET
-local ____lostStyleCharactersSet = require("sets.lostStyleCharactersSet")
+local ____lostStyleCharactersSet = require("packages.isaacscript-common.src.sets.lostStyleCharactersSet")
 local LOST_STYLE_CHARACTERS_SET = ____lostStyleCharactersSet.LOST_STYLE_CHARACTERS_SET
 function ____exports.isVanillaCharacter(self, character)
     return character <= LAST_VANILLA_CHARACTER

package/{dist/functions → functions}/charge.lua

@@ -6,12 +6,12 @@ local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local RoomShape = ____isaac_2Dtypescript_2Ddefinitions.RoomShape
 local SoundEffect = ____isaac_2Dtypescript_2Ddefinitions.SoundEffect
 local TrinketType = ____isaac_2Dtypescript_2Ddefinitions.TrinketType
-local ____cachedClasses = require("cachedClasses")
+local ____cachedClasses = require("packages.isaacscript-common.src.cachedClasses")
 local game = ____cachedClasses.game
 local sfxManager = ____cachedClasses.sfxManager
-local ____collectibles = require("functions.collectibles")
+local ____collectibles = require("packages.isaacscript-common.src.functions.collectibles")
 local getCollectibleMaxCharges = ____collectibles.getCollectibleMaxCharges
-local ____playerIndex = require("functions.playerIndex")
+local ____playerIndex = require("packages.isaacscript-common.src.functions.playerIndex")
 local getPlayers = ____playerIndex.getPlayers
 function ____exports.addRoomClearChargeToSlot(self, player, activeSlot, ignoreBigRoomDoubleCharge)
     if ignoreBigRoomDoubleCharge == nil then

package/{dist/functions → functions}/chargeBar.lua

@@ -1,6 +1,6 @@
 local ____exports = {}
 local getChargeBarClamp
-local ____constants = require("constants")
+local ____constants = require("packages.isaacscript-common.src.constants")
 local VectorZero = ____constants.VectorZero
 function getChargeBarClamp(self, charges, maxCharges)
     local meterMultiplier = 24 / maxCharges

package/{dist/functions → functions}/collectibleCacheFlag.lua

@@ -5,18 +5,18 @@ local Set = ____lualib.Set
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CacheFlag = ____isaac_2Dtypescript_2Ddefinitions.CacheFlag
-local ____cachedClasses = require("cachedClasses")
+local ____cachedClasses = require("packages.isaacscript-common.src.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-local ____collectibles = require("functions.collectibles")
+local ____collectibles = require("packages.isaacscript-common.src.functions.collectibles")
 local getCollectibleTypeRange = ____collectibles.getCollectibleTypeRange
-local ____enums = require("functions.enums")
+local ____enums = require("packages.isaacscript-common.src.functions.enums")
 local getEnumValues = ____enums.getEnumValues
-local ____flag = require("functions.flag")
+local ____flag = require("packages.isaacscript-common.src.functions.flag")
 local hasFlag = ____flag.hasFlag
-local ____set = require("functions.set")
+local ____set = require("packages.isaacscript-common.src.functions.set")
 local copySet = ____set.copySet
 local getSortedSetValues = ____set.getSortedSetValues
-local ____utils = require("functions.utils")
+local ____utils = require("packages.isaacscript-common.src.functions.utils")
 local ____repeat = ____utils["repeat"]
 function ____exports.collectibleHasCacheFlag(self, collectibleType, cacheFlag)
     local itemConfigItem = itemConfig:GetCollectible(collectibleType)

package/{dist/functions → functions}/collectibleSet.lua

@@ -2,21 +2,24 @@ local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local ____cachedClasses = require("cachedClasses")
+local ____cachedClasses = require("packages.isaacscript-common.src.cachedClasses")
 local itemConfig = ____cachedClasses.itemConfig
-local ____constantsMax = require("constantsMax")
+local ____constantsMax = require("packages.isaacscript-common.src.constantsMax")
 local LAST_VANILLA_COLLECTIBLE_TYPE = ____constantsMax.LAST_VANILLA_COLLECTIBLE_TYPE
-local ____collectibles = require("functions.collectibles")
+local ____collectibles = require("packages.isaacscript-common.src.functions.collectibles")
 local getCollectibleTypeRange = ____collectibles.getCollectibleTypeRange
-local ____set = require("functions.set")
+local ____set = require("packages.isaacscript-common.src.functions.set")
 local copySet = ____set.copySet
 local ALL_COLLECTIBLES_SET = __TS__New(Set)
 local VANILLA_COLLECTIBLES_SET = __TS__New(Set)
 local MODDED_COLLECTIBLES_SET = __TS__New(Set)
 local function initCollectibleSets(self)
     for ____, collectibleType in ipairs(getCollectibleTypeRange(nil)) do
-        local itemConfigItem = itemConfig:GetCollectible(collectibleType)
-        if itemConfigItem ~= nil then
+        do
+            local itemConfigItem = itemConfig:GetCollectible(collectibleType)
+            if itemConfigItem == nil then
+                goto __continue3
+            end
             ALL_COLLECTIBLES_SET:add(collectibleType)
             if collectibleType <= LAST_VANILLA_COLLECTIBLE_TYPE then
                 VANILLA_COLLECTIBLES_SET:add(collectibleType)
@@ -24,6 +27,7 @@ local function initCollectibleSets(self)
                 MODDED_COLLECTIBLES_SET:add(collectibleType)
             end
         end
+        ::__continue3::
     end
 end
 function ____exports.getCollectibleSet(self)