isaacscript-common 1.0.316 → 1.0.320

package/dist/callbacks/reorderedCallbacks.lua

@@ -42,10 +42,14 @@ function postNewRoomVanilla(self)
     local level = game:GetLevel()
     local stage = level:GetStage()
     local stageType = level:GetStageType()
-    if usedGlowingHourGlass and ((currentStage ~= stage) or (currentStageType ~= stageType)) then
-        recordCurrentStage(nil)
-        postNewLevelReordered:fire()
-        postNewRoomReordered:fire()
+    if usedGlowingHourGlass then
+        usedGlowingHourGlass = false
+        if (currentStage ~= stage) or (currentStageType ~= stageType) then
+            recordCurrentStage(nil)
+            postNewLevelReordered:fire()
+            postNewRoomReordered:fire()
+            return
+        end
     end
     if (((gameFrameCount == 0) or (currentStage ~= stage)) or (currentStageType ~= stageType)) and (not forceNewRoom) then
         return

package/dist/features/saveDataManager/merge.lua

@@ -11,6 +11,7 @@ local ____deepCopy = require("functions.deepCopy")
 local addTraversalDescription = ____deepCopy.addTraversalDescription
 local deepCopy = ____deepCopy.deepCopy
 local deserializeVector = ____deepCopy.deserializeVector
+local isBrand = ____deepCopy.isBrand
 local SerializationType = ____deepCopy.SerializationType
 local ____log = require("functions.log")
 local log = ____log.log
@@ -55,6 +56,9 @@ function mergeTSTLObject(self, oldObject, newTable, traversalDescription)
     local convertStringKeysToNumbers = newTable[TSTL_OBJECT_WITH_NUMBER_KEYS_BRAND] ~= nil
     for key, value in pairs(newTable) do
         do
+            if isBrand(nil, key) then
+                goto __continue13
+            end
             local keyToUse = key
             if convertStringKeysToNumbers then
                 local numberKey = tonumber(key)
@@ -81,26 +85,32 @@ function mergeTSTLObject(self, oldObject, newTable, traversalDescription)
 end
 function mergeTable(self, oldTable, newTable, traversalDescription)
     for key, value in pairs(newTable) do
-        if mergeVector(nil, oldTable, key, value) then
-            return
-        end
-        local valueType = type(value)
-        if valueType == "table" then
-            local oldValue = oldTable[key]
-            local oldValueType = type(oldValue)
-            if oldValueType == "table" then
-                traversalDescription = addTraversalDescription(nil, key, traversalDescription)
-                ____exports.merge(nil, oldValue, value, traversalDescription)
+        do
+            if isBrand(nil, key) then
+                goto __continue22
             end
-        else
-            if DEBUG then
-                log(
-                    nil,
-                    (("Merging key \"" .. tostring(key)) .. "\" with value: ") .. tostring(value)
-                )
+            if mergeVector(nil, oldTable, key, value) then
+                goto __continue22
+            end
+            local valueType = type(value)
+            if valueType == "table" then
+                local oldValue = oldTable[key]
+                local oldValueType = type(oldValue)
+                if oldValueType == "table" then
+                    traversalDescription = addTraversalDescription(nil, key, traversalDescription)
+                    ____exports.merge(nil, oldValue, value, traversalDescription)
+                end
+            else
+                if DEBUG then
+                    log(
+                        nil,
+                        (("Merging key \"" .. tostring(key)) .. "\" with value: ") .. tostring(value)
+                    )
+                end
+                oldTable[key] = value
             end
-            oldTable[key] = value
         end
+        ::__continue22::
     end
 end
 function mergeVector(self, oldTable, key, value)

package/dist/functions/deepCopy.d.ts

@@ -24,5 +24,6 @@ export declare enum SerializationType {
  * @param traversalDescription Used to track the current key that we are operating on.
  */
 export declare function deepCopy(oldObject: LuaTable | Map<AnyNotNil, unknown> | Set<AnyNotNil>, serializationType?: SerializationType, traversalDescription?: string): LuaTable | Map<AnyNotNil, unknown> | Set<AnyNotNil>;
+export declare function isBrand(key: AnyNotNil): boolean;
 export declare function deserializeVector(vectorTable: LuaTable): Vector;
 export declare function addTraversalDescription(key: AnyNotNil, traversalDescription: string): string;

package/dist/functions/deepCopy.lua

@@ -14,7 +14,7 @@ local log = ____log.log
 local ____util = require("functions.util")
 local isSerializedVector = ____util.isSerializedVector
 local isVector = ____util.isVector
-local TSTL_CLASS_KEYS, isTSTLClass, cloneClass, getNewClassFromMetatable, isBrand, deepCopyValue, copyVector, checkMetatable, validateValue
+local TSTL_CLASS_KEYS, isTSTLClass, cloneClass, getNewClassFromMetatable, deepCopyValue, copyVector, checkMetatable, validateValue
 function ____exports.deepCopy(self, oldObject, serializationType, traversalDescription)
     if serializationType == nil then
         serializationType = ____exports.SerializationType.NONE
@@ -75,7 +75,7 @@ function ____exports.deepCopy(self, oldObject, serializationType, traversalDescr
             local value
             value = ____value[2]
             do
-                if isBrand(nil, key) then
+                if ____exports.isBrand(nil, key) then
                     goto __continue17
                 end
                 deepCopyValue(nil, oldObject, newObject, key, value, traversalDescription, serializationType)
@@ -87,7 +87,7 @@ function ____exports.deepCopy(self, oldObject, serializationType, traversalDescr
             oldObject:values()
         ) do
             do
-                if isBrand(nil, key) then
+                if ____exports.isBrand(nil, key) then
                     goto __continue20
                 end
                 local value = ""
@@ -98,7 +98,7 @@ function ____exports.deepCopy(self, oldObject, serializationType, traversalDescr
     else
         for key, value in pairs(oldObject) do
             do
-                if isBrand(nil, key) then
+                if ____exports.isBrand(nil, key) then
                     goto __continue23
                 end
                 deepCopyValue(nil, oldObject, newObject, key, value, traversalDescription, serializationType)
@@ -139,7 +139,7 @@ function getNewClassFromMetatable(self, metatable)
     newClass:____constructor()
     return newClass
 end
-function isBrand(self, key)
+function ____exports.isBrand(self, key)
     return ((((key == TSTL_MAP_BRAND) or (key == TSTL_SET_BRAND)) or (key == TSTL_CLASS_BRAND)) or (key == TSTL_OBJECT_WITH_NUMBER_KEYS_BRAND)) or (key == VECTOR_BRAND)
 end
 function deepCopyValue(self, oldObject, newObject, key, value, traversalDescription, serializationType)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.0.316",
+  "version": "1.0.320",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",