isaacscript-common 1.0.319 → 1.0.320
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -85,26 +85,32 @@ function mergeTSTLObject(self, oldObject, newTable, traversalDescription)
|
|
|
85
85
|
end
|
|
86
86
|
function mergeTable(self, oldTable, newTable, traversalDescription)
|
|
87
87
|
for key, value in pairs(newTable) do
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
local valueType = type(value)
|
|
92
|
-
if valueType == "table" then
|
|
93
|
-
local oldValue = oldTable[key]
|
|
94
|
-
local oldValueType = type(oldValue)
|
|
95
|
-
if oldValueType == "table" then
|
|
96
|
-
traversalDescription = addTraversalDescription(nil, key, traversalDescription)
|
|
97
|
-
____exports.merge(nil, oldValue, value, traversalDescription)
|
|
88
|
+
do
|
|
89
|
+
if isBrand(nil, key) then
|
|
90
|
+
goto __continue22
|
|
98
91
|
end
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
92
|
+
if mergeVector(nil, oldTable, key, value) then
|
|
93
|
+
goto __continue22
|
|
94
|
+
end
|
|
95
|
+
local valueType = type(value)
|
|
96
|
+
if valueType == "table" then
|
|
97
|
+
local oldValue = oldTable[key]
|
|
98
|
+
local oldValueType = type(oldValue)
|
|
99
|
+
if oldValueType == "table" then
|
|
100
|
+
traversalDescription = addTraversalDescription(nil, key, traversalDescription)
|
|
101
|
+
____exports.merge(nil, oldValue, value, traversalDescription)
|
|
102
|
+
end
|
|
103
|
+
else
|
|
104
|
+
if DEBUG then
|
|
105
|
+
log(
|
|
106
|
+
nil,
|
|
107
|
+
(("Merging key \"" .. tostring(key)) .. "\" with value: ") .. tostring(value)
|
|
108
|
+
)
|
|
109
|
+
end
|
|
110
|
+
oldTable[key] = value
|
|
105
111
|
end
|
|
106
|
-
oldTable[key] = value
|
|
107
112
|
end
|
|
113
|
+
::__continue22::
|
|
108
114
|
end
|
|
109
115
|
end
|
|
110
116
|
function mergeVector(self, oldTable, key, value)
|