isaacscript-common 1.2.172 → 1.2.175

package/dist/functions/gridEntity.lua

@@ -112,13 +112,9 @@ function ____exports.getCollidingEntitiesWithGridEntity(self, gridEntity)
     local gridEntityCollisionTopLeft = Vector(gridEntity.Position.X - DISTANCE_OF_GRID_TILE / 2, gridEntity.Position.Y - DISTANCE_OF_GRID_TILE / 2)
     local gridEntityCollisionBottomRight = Vector(gridEntity.Position.X + DISTANCE_OF_GRID_TILE / 2, gridEntity.Position.Y + DISTANCE_OF_GRID_TILE / 2)
     local closeEntities = Isaac.FindInRadius(gridEntity.Position, DISTANCE_OF_GRID_TILE * 2)
-    local closeEntitiesThatCollideWithGrid = __TS__ArrayFilter(
-        closeEntities,
-        function(____, entity) return entity:CollidesWithGrid() end
-    )
     return __TS__ArrayFilter(
-        closeEntitiesThatCollideWithGrid,
-        function(____, entity) return isCircleIntersectingRectangle(
+        closeEntities,
+        function(____, entity) return entity:CollidesWithGrid() and isCircleIntersectingRectangle(
             nil,
             entity.Position,
             entity.Size + 0.1,
@@ -151,11 +147,6 @@ function ____exports.getGridEntitiesMap(self, ...)
     end
     return gridEntityMap
 end
-function ____exports.getTopLeftWall(self)
-    local room = game:GetRoom()
-    local topLeftWallGridIndex = ____exports.getTopLeftWallGridIndex(nil)
-    return room:GetGridEntity(topLeftWallGridIndex)
-end
 function ____exports.getSurroundingGridEntities(self, gridEntity)
     local room = game:GetRoom()
     local gridWidth = room:GetGridWidth()
@@ -179,6 +170,11 @@ function ____exports.getSurroundingGridEntities(self, gridEntity)
     end
     return surroundingGridEntities
 end
+function ____exports.getTopLeftWall(self)
+    local room = game:GetRoom()
+    local topLeftWallGridIndex = ____exports.getTopLeftWallGridIndex(nil)
+    return room:GetGridEntity(topLeftWallGridIndex)
+end
 function ____exports.isAllPressurePlatesPushed(self)
     local room = game:GetRoom()
     local hasPressurePlates = room:HasTriggerPressurePlates()

package/dist/functions/jsonHelpers.d.ts

@@ -1,11 +1,4 @@
 /// <reference types="typescript-to-lua/language-extensions" />
-/**
- * Converts a Lua table to a JSON string.
- * In most cases, this function will be used for writing data to a "save#.dat" file.
- * If encoding fails, it will throw an error to prevent writing a blank string or corrupted data to
- * a user's "save#.dat" file.
- */
-export declare function jsonEncode(table: unknown): string;
 /**
  * Converts a JSON string to a Lua table.
  * In most cases, this function will be used for reading data from a "save#.dat" file.
@@ -14,3 +7,10 @@ export declare function jsonEncode(table: unknown): string;
  * manually removed their existing save data.)
  */
 export declare function jsonDecode(jsonString: string): LuaTable;
+/**
+ * Converts a Lua table to a JSON string.
+ * In most cases, this function will be used for writing data to a "save#.dat" file.
+ * If encoding fails, it will throw an error to prevent writing a blank string or corrupted data to
+ * a user's "save#.dat" file.
+ */
+export declare function jsonEncode(table: unknown): string;

package/dist/functions/jsonHelpers.lua

@@ -1,21 +1,13 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
-local tryEncode, tryDecode
 local json = require("@NoResolution:json")
 local ____log = require("functions.log")
 local log = ____log.log
-function tryEncode(____table)
-    return json.encode(____table)
-end
-function tryDecode(jsonString)
+local function tryDecode(jsonString)
     return json.decode(jsonString)
 end
-function ____exports.jsonEncode(self, ____table)
-    local ok, jsonStringOrErrMsg = pcall(tryEncode, ____table)
-    if not ok then
-        error("Failed to convert the Lua table to JSON: " .. jsonStringOrErrMsg)
-    end
-    return jsonStringOrErrMsg
+local function tryEncode(____table)
+    return json.encode(____table)
 end
 function ____exports.jsonDecode(self, jsonString)
     local ok, luaTableOrErrMsg = pcall(tryDecode, jsonString)
@@ -25,4 +17,11 @@ function ____exports.jsonDecode(self, jsonString)
     end
     return luaTableOrErrMsg
 end
+function ____exports.jsonEncode(self, ____table)
+    local ok, jsonStringOrErrMsg = pcall(tryEncode, ____table)
+    if not ok then
+        error("Failed to convert the Lua table to JSON: " .. jsonStringOrErrMsg)
+    end
+    return jsonStringOrErrMsg
+end
 return ____exports

package/dist/functions/log.d.ts

@@ -10,44 +10,44 @@ export declare function getDebugPrependString(msg: string, numParentFunctions?:
  * and the line number before the string.
  */
 export declare function log(this: void, msg: string): void;
+export declare function logArray<T>(this: void, array: T[]): void;
+export declare function logColor(this: void, color: Color): void;
 /** Helper function for printing out every damage flag that is turned on. Useful when debugging. */
-export declare function logAllDamageFlags(this: void, flags: int): void;
+export declare function logDamageFlags(this: void, flags: int): void;
+export declare function logEntities(this: void, includeBackgroundEffects: boolean, entityTypeFilter?: EntityType | int): void;
+export declare function logEntity(this: void, entity: Entity): void;
 /** Helper function for printing out every entity flag that is turned on. Useful when debugging. */
-export declare function logAllEntityFlags(this: void, flags: int): void;
+export declare function logEntityFlags(this: void, flags: int): void;
 /** Helper function for printing out every flag that is turned on. Useful when debugging. */
-export declare function logAllFlags(this: void, flags: int, flagEnum?: LuaTable, description?: string): void;
+export declare function logFlags(this: void, flags: int, flagEnum?: LuaTable, description?: string): void;
 /**
  * Helper function for printing out every game state flag that is turned on. Useful when debugging.
  */
-export declare function logAllGameStateFlags(this: void): void;
+export declare function logGameStateFlags(this: void): void;
+export declare function logGridEntities(this: void, includeWalls: boolean, gridEntityTypeFilter?: GridEntityType | int): void;
+export declare function logKColor(this: void, kColor: KColor): void;
+export declare function logMap(this: void, map: Map<AnyNotNil, unknown>): void;
+export declare function logPlayerHealth(this: void, player: EntityPlayer): void;
 /**
  * Helper function for printing out every projectile flag that is turned on. Useful when debugging.
  */
-export declare function logAllProjectileFlags(this: void, flags: int): void;
+export declare function logProjectileFlags(this: void, flags: int): void;
+/** Helper function for logging information about the current room. */
+export declare function logRoom(this: void): void;
 /**
  * Helper function for printing out every seed effect (i.e. Easter Egg) that is turned on for the
  * particular run.
  */
-export declare function logAllSeedEffects(this: void): void;
-/** Helper function for printing out every tear flag that is turned on. Useful when debugging. */
-export declare function logAllTearFlags(this: void, flags: int): void;
-/** Helper function for printing out every use flag that is turned on. Useful when debugging. */
-export declare function logAllUseFlags(this: void, _flags: int): void;
-export declare function logArray<T>(this: void, array: T[]): void;
-export declare function logColor(this: void, color: Color): void;
-export declare function logEntity(this: void, entity: Entity): void;
-export declare function logEntities(this: void, includeBackgroundEffects: boolean, entityTypeFilter?: EntityType | int): void;
-export declare function logGridEntities(this: void, includeWalls: boolean, gridEntityTypeFilter?: GridEntityType | int): void;
-export declare function logKColor(this: void, kColor: KColor): void;
-export declare function logMap(this: void, map: Map<AnyNotNil, unknown>): void;
-export declare function logPlayerHealth(this: void, player: EntityPlayer): void;
-/** Helper function for logging information about the current room. */
-export declare function logRoom(this: void): void;
+export declare function logSeedEffects(this: void): void;
+export declare function logSet(this: void, set: Set<AnyNotNil>): void;
 /** Helper function for logging every sound effect that is currently playing. */
 export declare function logSounds(this: void): void;
 export declare function logTable(this: void, table: unknown, parentTables?: number): void;
+/** Helper function for printing out every tear flag that is turned on. Useful when debugging. */
+export declare function logTearFlags(this: void, flags: int): void;
 export declare function logTemporaryEffects(this: void, player: EntityPlayer): void;
-export declare function logSet(this: void, set: Set<AnyNotNil>): void;
+/** Helper function for printing out every use flag that is turned on. Useful when debugging. */
+export declare function logUseFlags(this: void, _flags: int): void;
 export declare function logVector(this: void, vector: Vector): void;
 /**
  * Converts every `isaacscript-common` function that begins with "log" to a global function.

package/dist/functions/log.lua

@@ -28,10 +28,10 @@ local getEffectsList = ____player.getEffectsList
 local getPlayerName = ____player.getPlayerName
 local ____playerHealth = require("functions.playerHealth")
 local getPlayerHealth = ____playerHealth.getPlayerHealth
-local ____rooms = require("functions.rooms")
-local getRoomData = ____rooms.getRoomData
-local getRoomGridIndex = ____rooms.getRoomGridIndex
-local getRoomListIndex = ____rooms.getRoomListIndex
+local ____roomData = require("functions.roomData")
+local getRoomData = ____roomData.getRoomData
+local getRoomGridIndex = ____roomData.getRoomGridIndex
+local getRoomListIndex = ____roomData.getRoomListIndex
 local ____set = require("functions.set")
 local getSortedSetValues = ____set.getSortedSetValues
 local ____trinkets = require("functions.trinkets")
@@ -55,7 +55,7 @@ function ____exports.log(msg)
     local debugMsg = ____exports.getDebugPrependString(nil, msg)
     Isaac.DebugString(debugMsg)
 end
-function ____exports.logAllFlags(flags, flagEnum, description)
+function ____exports.logFlags(flags, flagEnum, description)
     if description == nil then
         description = ""
     end
@@ -72,19 +72,19 @@ function ____exports.logAllFlags(flags, flagEnum, description)
             end
         end
     end
-    ____exports.log(((("Logging all " .. description) .. "flags for value ") .. tostring(flags)) .. ":")
+    ____exports.log(((("Logging " .. description) .. "flags for value ") .. tostring(flags)) .. ":")
     local hasNoFlags = true
     for key, value in pairs(flagEnum) do
         do
             if type(value) ~= "number" then
-                goto __continue13
+                goto __continue34
             end
             if hasFlag(nil, flags, value) then
                 ____exports.log(((("  Has flag: " .. tostring(key)) .. " (") .. tostring(value)) .. ")")
                 hasNoFlags = false
             end
         end
-        ::__continue13::
+        ::__continue34::
     end
     if hasNoFlags then
         ____exports.log("  n/a (no flags)")
@@ -101,51 +101,6 @@ local IGNORE_EFFECT_VARIANTS = __TS__New(Set, {
     EffectVariant.LIGHT,
     EffectVariant.TADPOLE
 })
-function ____exports.logAllDamageFlags(flags)
-    ____exports.logAllFlags(flags, DamageFlag, "damage")
-end
-function ____exports.logAllEntityFlags(flags)
-    ____exports.logAllFlags(flags, EntityFlag, "entity")
-end
-function ____exports.logAllGameStateFlags()
-    ____exports.log("Logging all game state flags:")
-    local hasNoFlags = true
-    for key, value in pairs(GameStateFlag) do
-        local gameStateFlag = value
-        local flagValue = game:GetStateFlag(gameStateFlag)
-        if flagValue then
-            ____exports.log(((("  Has flag: " .. key) .. " (") .. tostring(value)) .. ")")
-            hasNoFlags = false
-        end
-    end
-    if hasNoFlags then
-        ____exports.log("  n/a (no flags)")
-    end
-end
-function ____exports.logAllProjectileFlags(flags)
-    ____exports.logAllFlags(flags, ProjectileFlags, "projectile")
-end
-function ____exports.logAllSeedEffects()
-    local seeds = game:GetSeeds()
-    ____exports.log("Logging all seed effects:")
-    local hasNoSeedEffects = true
-    for key, value in pairs(SeedEffect) do
-        local seedEffect = value
-        if seeds:HasSeedEffect(seedEffect) then
-            ____exports.log(((("  " .. key) .. " (") .. tostring(value)) .. ")")
-            hasNoSeedEffects = false
-        end
-    end
-    if hasNoSeedEffects then
-        ____exports.log("  n/a (no seed effects)")
-    end
-end
-function ____exports.logAllTearFlags(flags)
-    ____exports.logAllFlags(flags, TearFlags, "tear")
-end
-function ____exports.logAllUseFlags(_flags)
-    ____exports.log("The \"logAllUseFlags\" helper function is temporarily disabled while the UseFlag enum remains unpatched in vanilla.")
-end
 function ____exports.logArray(array)
     local arrayString = arrayToString(nil, array)
     ____exports.log("Array: " .. arrayString)
@@ -153,8 +108,8 @@ end
 function ____exports.logColor(color)
     ____exports.log((((((((((((("Color: R" .. tostring(color.R)) .. ", G") .. tostring(color.G)) .. ", B") .. tostring(color.B)) .. ", A") .. tostring(color.A)) .. ", RO") .. tostring(color.RO)) .. ", BO") .. tostring(color.BO)) .. ", GO") .. tostring(color.GO))
 end
-function ____exports.logEntity(entity)
-    ____exports.log((((("Entity: " .. tostring(entity.Type)) .. ".") .. tostring(entity.Variant)) .. ".") .. tostring(entity.SubType))
+function ____exports.logDamageFlags(flags)
+    ____exports.logFlags(flags, DamageFlag, "damage")
 end
 function ____exports.logEntities(includeBackgroundEffects, entityTypeFilter)
     local headerMsg = "Entities in the room"
@@ -234,6 +189,27 @@ function ____exports.logEntities(includeBackgroundEffects, entityTypeFilter)
         ____exports.log(("(" .. tostring(numMatchedEntities)) .. " total entities)")
     end
 end
+function ____exports.logEntity(entity)
+    ____exports.log((((("Entity: " .. tostring(entity.Type)) .. ".") .. tostring(entity.Variant)) .. ".") .. tostring(entity.SubType))
+end
+function ____exports.logEntityFlags(flags)
+    ____exports.logFlags(flags, EntityFlag, "entity")
+end
+function ____exports.logGameStateFlags()
+    ____exports.log("Logging game state flags:")
+    local hasNoFlags = true
+    for key, value in pairs(GameStateFlag) do
+        local gameStateFlag = value
+        local flagValue = game:GetStateFlag(gameStateFlag)
+        if flagValue then
+            ____exports.log(((("  Has flag: " .. key) .. " (") .. tostring(value)) .. ")")
+            hasNoFlags = false
+        end
+    end
+    if hasNoFlags then
+        ____exports.log("  n/a (no flags)")
+    end
+end
 function ____exports.logGridEntities(includeWalls, gridEntityTypeFilter)
     local headerMsg = "Grid entities in the room"
     if gridEntityTypeFilter ~= nil then
@@ -329,6 +305,9 @@ function ____exports.logPlayerHealth(player)
     ____exports.log("  Blood charges: " .. tostring(playerHealth.bloodCharges))
     ____exports.log(("  Soul heart types: [" .. table.concat(playerHealth.soulHeartTypes, "," or ",")) .. "]")
 end
+function ____exports.logProjectileFlags(flags)
+    ____exports.logFlags(flags, ProjectileFlags, "projectile")
+end
 function ____exports.logRoom()
     local roomGridIndex = getRoomGridIndex(nil)
     local roomListIndex = getRoomListIndex(nil)
@@ -343,6 +322,29 @@ function ____exports.logRoom()
     ____exports.log("Current room grid index: " .. tostring(roomGridIndex))
     ____exports.log("Current room list index: " .. tostring(roomListIndex))
 end
+function ____exports.logSeedEffects()
+    local seeds = game:GetSeeds()
+    ____exports.log("Logging seed effects:")
+    local hasNoSeedEffects = true
+    for key, value in pairs(SeedEffect) do
+        local seedEffect = value
+        if seeds:HasSeedEffect(seedEffect) then
+            ____exports.log(((("  " .. key) .. " (") .. tostring(value)) .. ")")
+            hasNoSeedEffects = false
+        end
+    end
+    if hasNoSeedEffects then
+        ____exports.log("  n/a (no seed effects)")
+    end
+end
+function ____exports.logSet(set)
+    ____exports.log("Printing out a TSTL Set:")
+    local setValues = getSortedSetValues(nil, set)
+    for ____, value in ipairs(setValues) do
+        ____exports.log("  Value: " .. tostring(value))
+    end
+    ____exports.log("The size of the set was: " .. tostring(set.size))
+end
 function ____exports.logSounds()
     for ____, soundEffect in ipairs(range(nil, 0, SoundEffect.NUM_SOUND_EFFECTS - 1)) do
         if sfxManager:IsPlaying(soundEffect) then
@@ -377,9 +379,12 @@ function ____exports.logTable(____table, parentTables)
     end
     ____exports.log("The size of the table was: " .. tostring(numKeys))
 end
+function ____exports.logTearFlags(flags)
+    ____exports.logFlags(flags, TearFlags, "tear")
+end
 function ____exports.logTemporaryEffects(player)
     local effects = getEffectsList(nil, player)
-    ____exports.log("Logging all player temporary effects:")
+    ____exports.log("Logging player temporary effects:")
     if #effects == 0 then
         ____exports.log("  n/a (no temporary effects)")
         return
@@ -401,13 +406,8 @@ function ____exports.logTemporaryEffects(player)
         end
     )
 end
-function ____exports.logSet(set)
-    ____exports.log("Printing out a TSTL Set:")
-    local setValues = getSortedSetValues(nil, set)
-    for ____, value in ipairs(setValues) do
-        ____exports.log("  Value: " .. tostring(value))
-    end
-    ____exports.log("The size of the set was: " .. tostring(set.size))
+function ____exports.logUseFlags(_flags)
+    ____exports.log("The \"logUseFlags\" helper function is temporarily disabled while the UseFlag enum remains unpatched in vanilla.")
 end
 function ____exports.logVector(vector)
     ____exports.log(((("Vector: (" .. tostring(vector.X)) .. ", ") .. tostring(vector.Y)) .. ")")
@@ -415,26 +415,27 @@ end
 function ____exports.setLogFunctionsGlobal(self)
     local globals = _G
     globals.log = ____exports.log
-    globals.logAllDamageFlags = ____exports.logAllDamageFlags
-    globals.logAllEntityFlags = ____exports.logAllEntityFlags
-    globals.logAllFlags = ____exports.logAllFlags
-    globals.logAllGameStateFlags = ____exports.logAllGameStateFlags
-    globals.logAllProjectileFlags = ____exports.logAllProjectileFlags
-    globals.logAllSeedEffects = ____exports.logAllSeedEffects
-    globals.logAllTearFlags = ____exports.logAllTearFlags
-    globals.logAllUseFlags = ____exports.logAllUseFlags
     globals.logArray = ____exports.logArray
     globals.logColor = ____exports.logColor
-    globals.logEntity = ____exports.logEntity
+    globals.logDamageFlags = ____exports.logDamageFlags
     globals.logEntities = ____exports.logEntities
+    globals.logEntity = ____exports.logEntity
+    globals.logEntityFlags = ____exports.logEntityFlags
+    globals.logFlags = ____exports.logFlags
+    globals.logGameStateFlags = ____exports.logGameStateFlags
     globals.logGridEntities = ____exports.logGridEntities
     globals.logKColor = ____exports.logKColor
     globals.logMap = ____exports.logMap
+    globals.logPlayerHealth = ____exports.logPlayerHealth
+    globals.logProjectileFlags = ____exports.logProjectileFlags
     globals.logRoom = ____exports.logRoom
-    globals.logTable = ____exports.logTable
-    globals.logTemporaryEffects = ____exports.logTemporaryEffects
+    globals.logSeedEffects = ____exports.logSeedEffects
     globals.logSet = ____exports.logSet
     globals.logSounds = ____exports.logSounds
+    globals.logTable = ____exports.logTable
+    globals.logTearFlags = ____exports.logTearFlags
+    globals.logTemporaryEffects = ____exports.logTemporaryEffects
+    globals.logUseFlags = ____exports.logUseFlags
     globals.logVector = ____exports.logVector
 end
 return ____exports

package/dist/functions/math.d.ts

@@ -36,8 +36,8 @@ export declare function range(start: int, end: int): int[];
  * @param numDecimalPlaces Default is 0.
  */
 export declare function round(num: float, numDecimalPlaces?: number): float;
-export declare function tanh(x: number): number;
 /**
  * @returns 1 if n is positive, -1 if n is negative, or 0 if n is 0.
  */
 export declare function sign(n: number): int;
+export declare function tanh(x: number): number;

package/dist/functions/math.lua

@@ -83,9 +83,6 @@ function ____exports.round(self, num, numDecimalPlaces)
     ))
     return roundedNum == nil and 0 or roundedNum
 end
-function ____exports.tanh(self, x)
-    return (math.exp(x) - math.exp(-x)) / (math.exp(x) + math.exp(-x))
-end
 function ____exports.sign(self, n)
     if n > 0 then
         return 1
@@ -95,4 +92,7 @@ function ____exports.sign(self, n)
     end
     return 0
 end
+function ____exports.tanh(self, x)
+    return (math.exp(x) - math.exp(-x)) / (math.exp(x) + math.exp(-x))
+end
 return ____exports

package/dist/functions/mergeTests.lua

@@ -1,10 +1,16 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
-local oldTableHasUpdatedValue, newTableHasSameValue, oldTableHasUpdatedValueFromNull, oldTableHasFilledInterface
+local oldTableHasUpdatedValue, newTableHasSameValue, oldTableHasUpdatedValueFromNull, oldTableHasFilledInterface, oldTableHasVector, oldTableHasVectorSerialized
+local ____SerializationType = require("enums.SerializationType")
+local SerializationType = ____SerializationType.SerializationType
 local ____merge = require("features.saveDataManager.merge")
 local merge = ____merge.merge
+local ____deepCopy = require("functions.deepCopy")
+local deepCopy = ____deepCopy.deepCopy
 local ____log = require("functions.log")
 local log = ____log.log
+local ____vector = require("functions.vector")
+local isVector = ____vector.isVector
 function oldTableHasUpdatedValue(self)
     local key = "foo"
     local oldValue = "bar"
@@ -55,11 +61,60 @@ function oldTableHasFilledInterface(self)
         error("The old table's key of \"bar\" was not filled.")
     end
 end
+function oldTableHasVector(self)
+    local key = "foo"
+    local x = 50
+    local y = 60
+    local newValue = Vector(x, y)
+    local oldTable = {foo = nil}
+    local foo = {bar = newValue}
+    local newTable = {foo = foo}
+    merge(nil, oldTable, newTable, "oldTableHasVector")
+    local oldTableValue = oldTable[key]
+    if oldTableValue == nil then
+        error(("The old table's key of \"" .. key) .. "\" was not filled.")
+    end
+    if oldTableValue.bar.X ~= x then
+        error("The old table's value for \"x\" does not match: " .. tostring(x))
+    end
+    if oldTableValue.bar.Y ~= y then
+        error("The old table's value for \"y\" does not match: " .. tostring(y))
+    end
+    if not isVector(nil, oldTableValue.bar) then
+        error("The old table's value is not a Vector object.")
+    end
+end
+function oldTableHasVectorSerialized(self)
+    local key = "foo"
+    local x = 50
+    local y = 60
+    local newValue = Vector(x, y)
+    local oldTable = {foo = nil}
+    local foo = {bar = newValue}
+    local newTable = {foo = foo}
+    local newTableSerialized = deepCopy(nil, newTable, SerializationType.SERIALIZE)
+    merge(nil, oldTable, newTableSerialized, "oldTableHasVectorSerialized")
+    local oldTableValue = oldTable[key]
+    if oldTableValue == nil then
+        error(("The old table's key of \"" .. key) .. "\" was not filled.")
+    end
+    if oldTableValue.bar.X ~= x then
+        error("The old table's value for \"x\" does not match: " .. tostring(x))
+    end
+    if oldTableValue.bar.Y ~= y then
+        error("The old table's value for \"y\" does not match: " .. tostring(y))
+    end
+    if not isVector(nil, oldTableValue.bar) then
+        error("The old table's value is not a Vector object.")
+    end
+end
 function ____exports.mergeTests(self)
     oldTableHasUpdatedValue(nil)
     newTableHasSameValue(nil)
     oldTableHasUpdatedValueFromNull(nil)
     oldTableHasFilledInterface(nil)
+    oldTableHasVector(nil)
+    oldTableHasVectorSerialized(nil)
     log("All merge tests passed!")
 end
 return ____exports

package/dist/functions/player.d.ts

@@ -3,8 +3,6 @@ import { HealthType } from "../enums/HealthType";
 import { PlayerIndex } from "../types/PlayerIndex";
 export declare function addCollectibleCostume(player: EntityPlayer, collectibleType: CollectibleType | int): void;
 export declare function addTrinketCostume(player: EntityPlayer, trinketType: TrinketType | int): void;
-/** Iterates over all players and checks if any player is close enough to the specified position. */
-export declare function anyPlayerCloserThan(position: Vector, distance: float): boolean;
 export declare function anyPlayerHasCollectible(collectibleType: CollectibleType | int): boolean;
 export declare function anyPlayerHasTrinket(trinketType: TrinketType | int): boolean;
 /**
@@ -24,6 +22,11 @@ export declare function anyPlayerIs(...matchingCharacters: Array<PlayerType | in
  * - the player has Stompy (transformation 13)
  */
 export declare function canPlayerCrushRocks(player: EntityPlayer): boolean;
+/**
+ * Helper function for detecting when a player is one of the characters that can take free Devil
+ * Deals. (e.g. The Lost, Tainted Lost, etc.)
+ */
+export declare function canTakeFreeDevilDeals(player: EntityPlayer): boolean;
 /**
  * Helper function to determine if the provided character can have red heart containers. Returns
  * true for characters like Isaac, Magdalene, or Cain. Returns true for Keeper and Tainted Keeper,
@@ -47,8 +50,8 @@ export declare function characterGetsBlackHeartFromEternalHeart(character: Playe
  * Helper function to get every player with no restrictions, by using `Game.GetNumPlayers` and
  * `Isaac.GetPlayer`.
  *
- * This function is almost never what you want to use. For most intents and purposes, use the
- * `getPlayers` helper function instead to get a filtered list of players.
+ * This function is almost never what you want to use. For most purposes, use the `getPlayers`
+ * helper function instead to get a filtered list of players.
  */
 export declare function getAllPlayers(): EntityPlayer[];
 /**
@@ -284,16 +287,11 @@ export declare function isJacobOrEsau(player: EntityPlayer): boolean;
 export declare function isKeeper(player: EntityPlayer): boolean;
 /** Helper function for detecting when a player is The Lost or Tainted Lost. */
 export declare function isLost(player: EntityPlayer): boolean;
-/**
- * Helper function for detecting when a player is one of the characters that can take free Devil
- * Deals. (e.g. The Lost, Tainted Lost, etc.)
- */
-export declare function canTakeFreeDevilDeals(player: EntityPlayer): boolean;
+export declare function isModdedCharacter(player: EntityPlayer): boolean;
 /** Helper function for detecting if a player is one of the Tainted characters. */
 export declare function isTainted(player: EntityPlayer): boolean;
 /** Helper function for detecting when a player is Tainted Lazarus or Dead Tainted Lazarus. */
 export declare function isTaintedLazarus(player: EntityPlayer): boolean;
-export declare function isModdedCharacter(player: EntityPlayer): boolean;
 export declare function isVanillaCharacter(player: EntityPlayer): boolean;
 /**
  * Helper function to remove a collectible costume from a player. Use this helper function to avoid