isaacscript-common 87.9.6 → 87.9.7

package/dist/functions/mergeTests.lua

@@ -1,8 +1,8 @@
 local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
+local Map = ____lualib.Map
 local ____exports = {}
-local oldTableHasUpdatedValue, newTableHasSameValue, oldTableHasUpdatedValueFromNull, oldTableHasSerializedIsaacAPIClass, oldTableHasFilledChildTable, oldTableHasFilledMap, oldTableHasFilledDefaultMap, oldTableHasVector, oldTableHasVectorSerialized, oldTableHasRNG, oldTableHasRNGSerialized
+local newTableHasSameValue, oldTableHasFilledChildTable, oldTableHasFilledDefaultMap, oldTableHasFilledMap, oldTableHasRNG, oldTableHasRNGSerialized, oldTableHasSerializedIsaacAPIClass, oldTableHasUpdatedValue, oldTableHasUpdatedValueFromNull, oldTableHasVector, oldTableHasVectorSerialized
 local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____SerializationType = require("enums.SerializationType")
@@ -21,18 +21,6 @@ local isSerializedIsaacAPIClass = ____serialization.isSerializedIsaacAPIClass
 local ____vector = require("functions.vector")
 local isVector = ____vector.isVector
 local serializeVector = ____vector.serializeVector
-function oldTableHasUpdatedValue(self)
-    local key = "foo"
-    local oldValue = "bar"
-    local newValue = "baz"
-    local oldTable = {foo = oldValue}
-    local newTable = {foo = newValue}
-    merge(nil, oldTable, newTable, "oldTableHasUpdatedValue")
-    local oldTableValue = oldTable[key]
-    if oldTableValue ~= newValue then
-        error("The old table does not have a value of: " .. newValue)
-    end
-end
 function newTableHasSameValue(self)
     local key = "foo"
     local oldValue = "bar"
@@ -45,26 +33,6 @@ function newTableHasSameValue(self)
         error("The new table does not have a value of: " .. newValue)
     end
 end
-function oldTableHasUpdatedValueFromNull(self)
-    local key = "foo"
-    local newValue = "baz"
-    local oldTable = {foo = nil}
-    local newTable = {foo = newValue}
-    merge(nil, oldTable, newTable, "oldTableHasUpdatedValueFromNull")
-    local oldTableValue = oldTable[key]
-    if oldTableValue ~= newValue then
-        error("The old table does not have a value of: " .. newValue)
-    end
-end
-function oldTableHasSerializedIsaacAPIClass(self)
-    local x = 50
-    local y = 60
-    local vector = Vector(x, y)
-    local vectorSerialized = serializeVector(nil, vector)
-    if not isSerializedIsaacAPIClass(nil, vectorSerialized) then
-        error("The \"isSerializedIsaacAPIClass\" function says that a serialized vector is not serialized.")
-    end
-end
 function oldTableHasFilledChildTable(self)
     local key = "foo"
     local newValue = "baz"
@@ -80,74 +48,147 @@ function oldTableHasFilledChildTable(self)
         error("The old table's key of \"bar\" was not filled.")
     end
 end
-function oldTableHasFilledMap(self)
-    local fakeV = {run = {myMap = __TS__New(Map)}}
-    local saveData = {run = {myMap = __TS__New(Map, {{"foo1", "bar1"}, {"foo2", "bar2"}, {"foo3", "bar3"}})}}
+function oldTableHasFilledDefaultMap(self)
+    local fakeV = {run = {myDefaultMap = __TS__New(DefaultMap, "default")}}
+    local saveData = {run = {myDefaultMap = __TS__New(DefaultMap, "default", {{"foo1", "bar1"}, {"foo2", "bar2"}, {"foo3", "bar3"}})}}
     local serializedSaveData = deepCopy(nil, saveData, SerializationType.SERIALIZE)
-    merge(nil, fakeV, serializedSaveData, "oldTableHasFilledMap")
+    merge(nil, fakeV, serializedSaveData, "oldTableHasFilledDefaultMap")
     local expectedSize = 3
-    if fakeV.run.myMap.size ~= expectedSize then
-        error((("The size of the merged map was equal to " .. tostring(fakeV.run.myMap.size)) .. ", but it should be equal to: ") .. tostring(expectedSize))
+    if fakeV.run.myDefaultMap.size ~= expectedSize then
+        error((("The size of the merged default map was equal to " .. tostring(fakeV.run.myDefaultMap.size)) .. ", but it should be equal to: ") .. tostring(expectedSize))
     end
     do
         local key = "foo1"
         local expectedValue = "bar1"
-        local value = fakeV.run.myMap:get(key)
+        local value = fakeV.run.myDefaultMap:get(key)
         if value ~= expectedValue then
-            error((((("The old table's map key of \"" .. key) .. "\" was not equal to \"") .. expectedValue) .. "\" and was instead equal to: ") .. tostring(value))
+            error((((("The old table's default map key of \"" .. key) .. "\" was not equal to \"") .. expectedValue) .. "\" and was instead equal to: ") .. tostring(value))
         end
     end
     do
         local key = "foo2"
         local expectedValue = "bar2"
-        local value = fakeV.run.myMap:get(key)
+        local value = fakeV.run.myDefaultMap:get(key)
         if value ~= expectedValue then
-            error((((("The old table's map key of \"" .. key) .. "\" was not equal to \"") .. expectedValue) .. "\" and was instead equal to: ") .. tostring(value))
+            error((((("The old table's default map key of \"" .. key) .. "\" was not equal to \"") .. expectedValue) .. "\" and was instead equal to: ") .. tostring(value))
         end
     end
     do
         local key = "foo3"
         local expectedValue = "bar3"
-        local value = fakeV.run.myMap:get(key)
+        local value = fakeV.run.myDefaultMap:get(key)
         if value ~= expectedValue then
-            error((((("The old table's map key of \"" .. key) .. "\" was not equal to \"") .. expectedValue) .. "\" and was instead equal to: ") .. tostring(value))
+            error((((("The old table's default map key of \"" .. key) .. "\" was not equal to \"") .. expectedValue) .. "\" and was instead equal to: ") .. tostring(value))
         end
     end
 end
-function oldTableHasFilledDefaultMap(self)
-    local fakeV = {run = {myDefaultMap = __TS__New(DefaultMap, "default")}}
-    local saveData = {run = {myDefaultMap = __TS__New(DefaultMap, "default", {{"foo1", "bar1"}, {"foo2", "bar2"}, {"foo3", "bar3"}})}}
+function oldTableHasFilledMap(self)
+    local fakeV = {run = {myMap = __TS__New(Map)}}
+    local saveData = {run = {myMap = __TS__New(Map, {{"foo1", "bar1"}, {"foo2", "bar2"}, {"foo3", "bar3"}})}}
     local serializedSaveData = deepCopy(nil, saveData, SerializationType.SERIALIZE)
-    merge(nil, fakeV, serializedSaveData, "oldTableHasFilledDefaultMap")
+    merge(nil, fakeV, serializedSaveData, "oldTableHasFilledMap")
     local expectedSize = 3
-    if fakeV.run.myDefaultMap.size ~= expectedSize then
-        error((("The size of the merged default map was equal to " .. tostring(fakeV.run.myDefaultMap.size)) .. ", but it should be equal to: ") .. tostring(expectedSize))
+    if fakeV.run.myMap.size ~= expectedSize then
+        error((("The size of the merged map was equal to " .. tostring(fakeV.run.myMap.size)) .. ", but it should be equal to: ") .. tostring(expectedSize))
     end
     do
         local key = "foo1"
         local expectedValue = "bar1"
-        local value = fakeV.run.myDefaultMap:get(key)
+        local value = fakeV.run.myMap:get(key)
         if value ~= expectedValue then
-            error((((("The old table's default map key of \"" .. key) .. "\" was not equal to \"") .. expectedValue) .. "\" and was instead equal to: ") .. tostring(value))
+            error((((("The old table's map key of \"" .. key) .. "\" was not equal to \"") .. expectedValue) .. "\" and was instead equal to: ") .. tostring(value))
         end
     end
     do
         local key = "foo2"
         local expectedValue = "bar2"
-        local value = fakeV.run.myDefaultMap:get(key)
+        local value = fakeV.run.myMap:get(key)
         if value ~= expectedValue then
-            error((((("The old table's default map key of \"" .. key) .. "\" was not equal to \"") .. expectedValue) .. "\" and was instead equal to: ") .. tostring(value))
+            error((((("The old table's map key of \"" .. key) .. "\" was not equal to \"") .. expectedValue) .. "\" and was instead equal to: ") .. tostring(value))
         end
     end
     do
         local key = "foo3"
         local expectedValue = "bar3"
-        local value = fakeV.run.myDefaultMap:get(key)
+        local value = fakeV.run.myMap:get(key)
         if value ~= expectedValue then
-            error((((("The old table's default map key of \"" .. key) .. "\" was not equal to \"") .. expectedValue) .. "\" and was instead equal to: ") .. tostring(value))
+            error((((("The old table's map key of \"" .. key) .. "\" was not equal to \"") .. expectedValue) .. "\" and was instead equal to: ") .. tostring(value))
         end
     end
 end
+function oldTableHasRNG(self)
+    local key = "foo"
+    local seed = 50
+    local newValue = newRNG(nil, seed)
+    local oldTable = {foo = nil}
+    local foo = {bar = newValue}
+    local newTable = {foo = foo}
+    merge(nil, oldTable, newTable, "oldTableHasRNG")
+    local oldTableValue = oldTable[key]
+    if oldTableValue == nil then
+        error(("The old table's key of \"" .. key) .. "\" was not filled.")
+    end
+    if not isRNG(nil, oldTableValue.bar) then
+        error("The old table's value is not an RNG object.")
+    end
+    local newSeed = oldTableValue.bar:GetSeed()
+    if newSeed ~= seed then
+        error("The old table's seed not match: " .. tostring(seed))
+    end
+end
+function oldTableHasRNGSerialized(self)
+    local key = "foo"
+    local seed = 50
+    local newValue = newRNG(nil, seed)
+    local oldTable = {foo = nil}
+    local foo = {bar = newValue}
+    local newTable = {foo = foo}
+    local newTableSerialized = deepCopy(nil, newTable, SerializationType.SERIALIZE, "oldTableHasRNGSerialized")
+    merge(nil, oldTable, newTableSerialized, "oldTableHasRNGSerialized")
+    local oldTableValue = oldTable[key]
+    if oldTableValue == nil then
+        error(("The old table's key of \"" .. key) .. "\" was not filled.")
+    end
+    if not isRNG(nil, oldTableValue.bar) then
+        error("The old table's value is not an RNG object (during the serialized test).")
+    end
+    local newSeed = oldTableValue.bar:GetSeed()
+    if newSeed ~= seed then
+        error("The old table's seed not match: " .. tostring(seed))
+    end
+end
+function oldTableHasSerializedIsaacAPIClass(self)
+    local x = 50
+    local y = 60
+    local vector = Vector(x, y)
+    local vectorSerialized = serializeVector(nil, vector)
+    if not isSerializedIsaacAPIClass(nil, vectorSerialized) then
+        error("The \"isSerializedIsaacAPIClass\" function says that a serialized vector is not serialized.")
+    end
+end
+function oldTableHasUpdatedValue(self)
+    local key = "foo"
+    local oldValue = "bar"
+    local newValue = "baz"
+    local oldTable = {foo = oldValue}
+    local newTable = {foo = newValue}
+    merge(nil, oldTable, newTable, "oldTableHasUpdatedValue")
+    local oldTableValue = oldTable[key]
+    if oldTableValue ~= newValue then
+        error("The old table does not have a value of: " .. newValue)
+    end
+end
+function oldTableHasUpdatedValueFromNull(self)
+    local key = "foo"
+    local newValue = "baz"
+    local oldTable = {foo = nil}
+    local newTable = {foo = newValue}
+    merge(nil, oldTable, newTable, "oldTableHasUpdatedValueFromNull")
+    local oldTableValue = oldTable[key]
+    if oldTableValue ~= newValue then
+        error("The old table does not have a value of: " .. newValue)
+    end
+end
 function oldTableHasVector(self)
     local key = "foo"
     local x = 50
@@ -195,47 +236,6 @@ function oldTableHasVectorSerialized(self)
         error("The old table's value is not a Vector object (during the serialized test).")
     end
 end
-function oldTableHasRNG(self)
-    local key = "foo"
-    local seed = 50
-    local newValue = newRNG(nil, seed)
-    local oldTable = {foo = nil}
-    local foo = {bar = newValue}
-    local newTable = {foo = foo}
-    merge(nil, oldTable, newTable, "oldTableHasRNG")
-    local oldTableValue = oldTable[key]
-    if oldTableValue == nil then
-        error(("The old table's key of \"" .. key) .. "\" was not filled.")
-    end
-    if not isRNG(nil, oldTableValue.bar) then
-        error("The old table's value is not an RNG object.")
-    end
-    local newSeed = oldTableValue.bar:GetSeed()
-    if newSeed ~= seed then
-        error("The old table's seed not match: " .. tostring(seed))
-    end
-end
-function oldTableHasRNGSerialized(self)
-    local key = "foo"
-    local seed = 50
-    local newValue = newRNG(nil, seed)
-    local oldTable = {foo = nil}
-    local foo = {bar = newValue}
-    local newTable = {foo = foo}
-    local newTableSerialized = deepCopy(nil, newTable, SerializationType.SERIALIZE, "oldTableHasRNGSerialized")
-    merge(nil, oldTable, newTableSerialized, "oldTableHasRNGSerialized")
-    local oldTableValue = oldTable[key]
-    if oldTableValue == nil then
-        error(("The old table's key of \"" .. key) .. "\" was not filled.")
-    end
-    if not isRNG(nil, oldTableValue.bar) then
-        error("The old table's value is not an RNG object (during the serialized test).")
-    end
-    local newSeed = oldTableValue.bar:GetSeed()
-    if newSeed ~= seed then
-        error("The old table's seed not match: " .. tostring(seed))
-    end
-end
 --- Run the suite of tests that prove that the "merge" function works properly.
 -- 
 -- This function is only useful if you are troubleshooting the save data manager.

package/dist/functions/nextStage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nextStage.d.ts","sourceRoot":"","sources":["../../src/functions/nextStage.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,UAAU,EACV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAUtC;;;;;;;GAOG;AACH,wBAAgB,YAAY,IAAI,UAAU,CAmGzC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,UAAQ,GAAG,SAAS,CAkF3D"}
+{"version":3,"file":"nextStage.d.ts","sourceRoot":"","sources":["../../src/functions/nextStage.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,UAAU,EACV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAUtC;;;;;;;GAOG;AACH,wBAAgB,YAAY,IAAI,UAAU,CAoGzC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,UAAQ,GAAG,SAAS,CAkF3D"}

package/dist/functions/nextStage.js

@@ -20,13 +20,13 @@ function getNextStage() {
     const backwardsPath = cachedClasses_1.game.GetStateFlag(isaac_typescript_definitions_1.GameStateFlag.BACKWARDS_PATH);
     const mausoleumHeartKilled = cachedClasses_1.game.GetStateFlag(isaac_typescript_definitions_1.GameStateFlag.MAUSOLEUM_HEART_KILLED);
     const stage = level.GetStage();
-    const repentanceStage = (0, stage_1.onRepentanceStage)();
-    const roomGridIndex = (0, roomData_1.getRoomGridIndex)();
     // First, handle the special case of being on the backwards path.
     if (backwardsPath) {
         const nextStage = stage - 1;
         return nextStage === 0 ? isaac_typescript_definitions_1.LevelStage.HOME : nextStage;
     }
+    const repentanceStage = (0, stage_1.onRepentanceStage)();
+    const roomGridIndex = (0, roomData_1.getRoomGridIndex)();
     // Second, handle the special case of being in a specific off-grid room.
     switch (roomGridIndex) {
         // -8
@@ -134,8 +134,8 @@ function getNextStageType(upwards = false) {
         return (0, stage_1.calculateStageTypeRepentance)(nextStage);
     }
     if (repentanceStage
-        && stage === isaac_typescript_definitions_1.LevelStage.DEPTHS_2
-        && mausoleumHeartKilled) {
+        && mausoleumHeartKilled
+        && stage === isaac_typescript_definitions_1.LevelStage.DEPTHS_2) {
         return (0, stage_1.calculateStageTypeRepentance)(nextStage);
     }
     // 9

package/dist/functions/nextStage.lua

@@ -26,12 +26,12 @@ function ____exports.getNextStage(self)
     local backwardsPath = game:GetStateFlag(GameStateFlag.BACKWARDS_PATH)
     local mausoleumHeartKilled = game:GetStateFlag(GameStateFlag.MAUSOLEUM_HEART_KILLED)
     local stage = level:GetStage()
-    local repentanceStage = onRepentanceStage(nil)
-    local roomGridIndex = getRoomGridIndex(nil)
     if backwardsPath then
         local nextStage = stage - 1
         return nextStage == 0 and LevelStage.HOME or nextStage
     end
+    local repentanceStage = onRepentanceStage(nil)
+    local roomGridIndex = getRoomGridIndex(nil)
     repeat
         local ____switch4 = roomGridIndex
         local ____cond4 = ____switch4 == GridRoom.BLUE_WOMB
@@ -117,7 +117,7 @@ function ____exports.getNextStageType(self, upwards)
     if repentanceStage and (stage == LevelStage.BASEMENT_1 or stage == LevelStage.CAVES_1 or stage == LevelStage.DEPTHS_1 or stage == LevelStage.WOMB_1) then
         return calculateStageTypeRepentance(nil, nextStage)
     end
-    if repentanceStage and stage == LevelStage.DEPTHS_2 and mausoleumHeartKilled then
+    if repentanceStage and mausoleumHeartKilled and stage == LevelStage.DEPTHS_2 then
         return calculateStageTypeRepentance(nil, nextStage)
     end
     if nextStage == LevelStage.BLUE_WOMB then

package/dist/functions/pickupVariants.js

@@ -1,5 +1,5 @@
 "use strict";
-/* eslint-disable sort-exports/sort-exports */
+/* eslint-disable perfectionist/sort-modules */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isHeart = isHeart;
 exports.isCoin = isCoin;

package/dist/functions/playerHealth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"playerHealth.d.ts","sourceRoot":"","sources":["../../src/functions/playerHealth.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAiB,MAAM,4BAA4B,CAAC;AAQ9E,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,GAAG,GACb,IAAI,CA+CN;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAMlE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAK1E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAKzE;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,CAYtE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,CAK9D;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,CA2E5E;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,GACrB,GAAG,CAmDL;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,CAKzD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CAoDnE;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,CAqCrE;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,CAK7D;AAED;;;;;;;;;GASG;AACH,wBAAgB,wCAAwC,CACtD,MAAM,EAAE,YAAY,GACnB,GAAG,CAML;AAED,sDAAsD;AACtD,wBAAgB,eAAe,IAAI,YAAY,CAc9C;AAED;;;GAGG;AACH,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,YAAY,GACnB,IAAI,CAcN;AAED;;;GAGG;AACH,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,YAAY,GACnB,IAAI,CAcN;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAMjE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAwBhE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,YAAY,GACzB,IAAI,CAyHN;AAED;;;;;;;;;GASG;AACH,wBAAgB,sDAAsD,CACpE,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,KAAK,GAClB,OAAO,CAyBT"}
+{"version":3,"file":"playerHealth.d.ts","sourceRoot":"","sources":["../../src/functions/playerHealth.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAiB,MAAM,4BAA4B,CAAC;AAQ9E,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,GAAG,GACb,IAAI,CA+CN;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAMlE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAK1E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAKzE;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,CAYtE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,CAK9D;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,CA2E5E;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,UAAU,GACrB,GAAG,CAmDL;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,CAKzD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CAoDnE;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,CAqCrE;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,GAAG,CAK7D;AAED;;;;;;;;;GASG;AACH,wBAAgB,wCAAwC,CACtD,MAAM,EAAE,YAAY,GACnB,GAAG,CAML;AAED,sDAAsD;AACtD,wBAAgB,eAAe,IAAI,YAAY,CAc9C;AAED;;;GAGG;AACH,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,YAAY,GACnB,IAAI,CAcN;AAED;;;GAGG;AACH,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,YAAY,GACnB,IAAI,CAcN;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAMjE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAwBhE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,YAAY,GACzB,IAAI,CA2HN;AAED;;;;;;;;;GASG;AACH,wBAAgB,sDAAsD,CACpE,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,KAAK,GAClB,OAAO,CAyBT"}

package/dist/functions/playerHealth.js

@@ -166,7 +166,7 @@ function getPlayerHealth(player) {
     const soulCharges = player.GetEffectiveSoulCharge();
     const bloodCharges = player.GetEffectiveBloodCharge();
     // The Forgotten and The Soul has special health, so we need to account for this.
-    if (character === isaac_typescript_definitions_1.PlayerType.FORGOTTEN && subPlayer !== undefined) {
+    if (subPlayer !== undefined && character === isaac_typescript_definitions_1.PlayerType.FORGOTTEN) {
         // The Forgotten does not have red heart containers.
         maxHearts = boneHearts * 2;
         boneHearts = 0;
@@ -174,7 +174,7 @@ function getPlayerHealth(player) {
         // sub player.
         soulHearts = subPlayer.GetSoulHearts();
     }
-    else if (character === isaac_typescript_definitions_1.PlayerType.SOUL && subPlayer !== undefined) {
+    else if (subPlayer !== undefined && character === isaac_typescript_definitions_1.PlayerType.SOUL) {
         // The Soul will always have 0 bone hearts; we need to get the bone heart amount from the sub
         // player. We need to store it as "maxHearts" instead of "boneHearts".
         maxHearts = subPlayer.GetBoneHearts() * 2;
@@ -188,7 +188,7 @@ function getPlayerHealth(player) {
     const soulHeartTypes = [];
     for (let i = 0; i < extraHearts; i++) {
         let isBoneHeart = player.IsBoneHeart(i);
-        if (character === isaac_typescript_definitions_1.PlayerType.FORGOTTEN && subPlayer !== undefined) {
+        if (subPlayer !== undefined && character === isaac_typescript_definitions_1.PlayerType.FORGOTTEN) {
             isBoneHeart = subPlayer.IsBoneHeart(i);
         }
         if (isBoneHeart) {
@@ -197,7 +197,7 @@ function getPlayerHealth(player) {
         else {
             // We need to add 1 here because only the second half of a black heart is considered black.
             let isBlackHeart = player.IsBlackHeart(currentSoulHeart + 1);
-            if (character === isaac_typescript_definitions_1.PlayerType.FORGOTTEN && subPlayer !== undefined) {
+            if (subPlayer !== undefined && character === isaac_typescript_definitions_1.PlayerType.FORGOTTEN) {
                 isBlackHeart = subPlayer.IsBlackHeart(currentSoulHeart + 1);
             }
             if (isBlackHeart) {
@@ -451,10 +451,10 @@ function removeAllPlayerHealth(player) {
     const brokenHearts = player.GetBrokenHearts();
     // To avoid bugs, we have to remove the exact amount of certain types of hearts. We remove Golden
     // Hearts first so that they don't break.
-    player.AddGoldenHearts(goldenHearts * -1);
-    player.AddEternalHearts(eternalHearts * -1);
-    player.AddBoneHearts(boneHearts * -1);
-    player.AddBrokenHearts(brokenHearts * -1);
+    player.AddGoldenHearts(-goldenHearts);
+    player.AddEternalHearts(-eternalHearts);
+    player.AddBoneHearts(-boneHearts);
+    player.AddBrokenHearts(-brokenHearts);
     player.AddMaxHearts(constants_1.MAX_PLAYER_HEART_CONTAINERS * -2, true);
     player.AddSoulHearts(constants_1.MAX_PLAYER_HEART_CONTAINERS * -2);
     // If we are The Soul, the `EntityPlayer.AddBoneHearts` method will not remove Forgotten's bone
@@ -463,7 +463,7 @@ function removeAllPlayerHealth(player) {
         const forgotten = player.GetSubPlayer();
         if (forgotten !== undefined) {
             const forgottenBoneHearts = forgotten.GetBoneHearts();
-            forgotten.AddBoneHearts(forgottenBoneHearts * -1);
+            forgotten.AddBoneHearts(-forgottenBoneHearts);
         }
     }
 }
@@ -484,11 +484,14 @@ function setPlayerHealth(player, playerHealth) {
     for (const activeSlot of alabasterBoxActiveSlots) {
         const totalCharge = (0, charge_1.getTotalCharge)(player, activeSlot);
         (0, playerCollectibles_1.setActiveItem)(player, isaac_typescript_definitions_1.CollectibleType.NULL, activeSlot);
-        alabasterBoxDescriptions.push({ activeSlot, totalCharge });
+        alabasterBoxDescriptions.push({
+            activeSlot,
+            totalCharge,
+        });
     }
     removeAllPlayerHealth(player);
     // Add the red heart containers.
-    if (character === isaac_typescript_definitions_1.PlayerType.SOUL && subPlayer !== undefined) {
+    if (subPlayer !== undefined && character === isaac_typescript_definitions_1.PlayerType.SOUL) {
         // Adding health to The Soul is a special case.
         subPlayer.AddMaxHearts(playerHealth.maxHearts, false);
     }
@@ -501,27 +504,25 @@ function setPlayerHealth(player, playerHealth) {
     let soulHeartsRemaining = playerHealth.soulHearts;
     for (const [i, soulHeartType] of playerHealth.soulHeartTypes.entries()) {
         const isHalf = playerHealth.soulHearts + playerHealth.boneHearts * 2 < (i + 1) * 2;
-        let addAmount = 2;
-        if (isHalf
-            || soulHeartType === isaac_typescript_definitions_1.HeartSubType.BONE
-            || soulHeartsRemaining < 2) {
-            // Fix the bug where a half soul heart to the left of a bone heart will be treated as a full
-            // soul heart.
-            addAmount = 1;
-        }
+        /**
+         * Fix the bug where a half soul heart to the left of a bone heart will be treated as a full
+         * soul heart.
+         */
+        const shouldAddOneSoulHeart = isHalf || soulHeartType === isaac_typescript_definitions_1.HeartSubType.BONE || soulHeartsRemaining < 2;
+        const numSoulHearts = shouldAddOneSoulHeart ? 1 : 2;
         switch (soulHeartType) {
             case isaac_typescript_definitions_1.HeartSubType.SOUL: {
-                player.AddSoulHearts(addAmount);
-                soulHeartsRemaining -= addAmount;
+                player.AddSoulHearts(numSoulHearts);
+                soulHeartsRemaining -= numSoulHearts;
                 break;
             }
             case isaac_typescript_definitions_1.HeartSubType.BLACK: {
-                player.AddBlackHearts(addAmount);
-                soulHeartsRemaining -= addAmount;
+                player.AddBlackHearts(numSoulHearts);
+                soulHeartsRemaining -= numSoulHearts;
                 break;
             }
             case isaac_typescript_definitions_1.HeartSubType.BONE: {
-                player.AddBoneHearts(addAmount);
+                player.AddBoneHearts(numSoulHearts);
                 break;
             }
         }

package/dist/functions/playerHealth.lua

@@ -86,17 +86,17 @@ function ____exports.removeAllPlayerHealth(self, player)
     local eternalHearts = player:GetEternalHearts()
     local boneHearts = player:GetBoneHearts()
     local brokenHearts = player:GetBrokenHearts()
-    player:AddGoldenHearts(goldenHearts * -1)
-    player:AddEternalHearts(eternalHearts * -1)
-    player:AddBoneHearts(boneHearts * -1)
-    player:AddBrokenHearts(brokenHearts * -1)
+    player:AddGoldenHearts(-goldenHearts)
+    player:AddEternalHearts(-eternalHearts)
+    player:AddBoneHearts(-boneHearts)
+    player:AddBrokenHearts(-brokenHearts)
     player:AddMaxHearts(MAX_PLAYER_HEART_CONTAINERS * -2, true)
     player:AddSoulHearts(MAX_PLAYER_HEART_CONTAINERS * -2)
     if isCharacter(nil, player, PlayerType.SOUL) then
         local forgotten = player:GetSubPlayer()
         if forgotten ~= nil then
             local forgottenBoneHearts = forgotten:GetBoneHearts()
-            forgotten:AddBoneHearts(forgottenBoneHearts * -1)
+            forgotten:AddBoneHearts(-forgottenBoneHearts)
         end
     end
 end
@@ -116,7 +116,7 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
         alabasterBoxDescriptions[#alabasterBoxDescriptions + 1] = {activeSlot = activeSlot, totalCharge = totalCharge}
     end
     ____exports.removeAllPlayerHealth(nil, player)
-    if character == PlayerType.SOUL and subPlayer ~= nil then
+    if subPlayer ~= nil and character == PlayerType.SOUL then
         subPlayer:AddMaxHearts(playerHealth.maxHearts, false)
     else
         player:AddMaxHearts(playerHealth.maxHearts, false)
@@ -127,32 +127,32 @@ function ____exports.setPlayerHealth(self, player, playerHealth)
         local i = ____value[1]
         local soulHeartType = ____value[2]
         local isHalf = playerHealth.soulHearts + playerHealth.boneHearts * 2 < (i + 1) * 2
-        local addAmount = 2
-        if isHalf or soulHeartType == HeartSubType.BONE or soulHeartsRemaining < 2 then
-            addAmount = 1
-        end
+        --- Fix the bug where a half soul heart to the left of a bone heart will be treated as a full
+        -- soul heart.
+        local shouldAddOneSoulHeart = isHalf or soulHeartType == HeartSubType.BONE or soulHeartsRemaining < 2
+        local numSoulHearts = shouldAddOneSoulHeart and 1 or 2
         repeat
-            local ____switch71 = soulHeartType
-            local ____cond71 = ____switch71 == HeartSubType.SOUL
-            if ____cond71 then
+            local ____switch70 = soulHeartType
+            local ____cond70 = ____switch70 == HeartSubType.SOUL
+            if ____cond70 then
                 do
-                    player:AddSoulHearts(addAmount)
-                    soulHeartsRemaining = soulHeartsRemaining - addAmount
+                    player:AddSoulHearts(numSoulHearts)
+                    soulHeartsRemaining = soulHeartsRemaining - numSoulHearts
                     break
                 end
             end
-            ____cond71 = ____cond71 or ____switch71 == HeartSubType.BLACK
-            if ____cond71 then
+            ____cond70 = ____cond70 or ____switch70 == HeartSubType.BLACK
+            if ____cond70 then
                 do
-                    player:AddBlackHearts(addAmount)
-                    soulHeartsRemaining = soulHeartsRemaining - addAmount
+                    player:AddBlackHearts(numSoulHearts)
+                    soulHeartsRemaining = soulHeartsRemaining - numSoulHearts
                     break
                 end
             end
-            ____cond71 = ____cond71 or ____switch71 == HeartSubType.BONE
-            if ____cond71 then
+            ____cond70 = ____cond70 or ____switch70 == HeartSubType.BONE
+            if ____cond70 then
                 do
-                    player:AddBoneHearts(addAmount)
+                    player:AddBoneHearts(numSoulHearts)
                     break
                 end
             end
@@ -341,11 +341,11 @@ function ____exports.getPlayerHealth(self, player)
     local subPlayer = player:GetSubPlayer()
     local soulCharges = player:GetEffectiveSoulCharge()
     local bloodCharges = player:GetEffectiveBloodCharge()
-    if character == PlayerType.FORGOTTEN and subPlayer ~= nil then
+    if subPlayer ~= nil and character == PlayerType.FORGOTTEN then
         maxHearts = boneHearts * 2
         boneHearts = 0
         soulHearts = subPlayer:GetSoulHearts()
-    elseif character == PlayerType.SOUL and subPlayer ~= nil then
+    elseif subPlayer ~= nil and character == PlayerType.SOUL then
         maxHearts = subPlayer:GetBoneHearts() * 2
         hearts = subPlayer:GetHearts()
     end
@@ -356,14 +356,14 @@ function ____exports.getPlayerHealth(self, player)
         local i = 0
         while i < extraHearts do
             local isBoneHeart = player:IsBoneHeart(i)
-            if character == PlayerType.FORGOTTEN and subPlayer ~= nil then
+            if subPlayer ~= nil and character == PlayerType.FORGOTTEN then
                 isBoneHeart = subPlayer:IsBoneHeart(i)
             end
             if isBoneHeart then
                 soulHeartTypes[#soulHeartTypes + 1] = HeartSubType.BONE
             else
                 local isBlackHeart = player:IsBlackHeart(currentSoulHeart + 1)
-                if character == PlayerType.FORGOTTEN and subPlayer ~= nil then
+                if subPlayer ~= nil and character == PlayerType.FORGOTTEN then
                     isBlackHeart = subPlayer:IsBlackHeart(currentSoulHeart + 1)
                 end
                 if isBlackHeart then

package/dist/functions/playerIndex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"playerIndex.d.ts","sourceRoot":"","sources":["../../src/functions/playerIndex.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAUxD;;;;;;GAMG;AACH,wBAAgB,aAAa,IAAI,SAAS,YAAY,EAAE,CAUvD;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,YAAY,EAAE,CAM7E;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,WAAW,GACvB,YAAY,GAAG,SAAS,CAG1B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,6BAA6B,UAAQ,GACpC,WAAW,CA8Bb;AAiBD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,YAAY,GACzB,GAAG,GAAG,SAAS,CAajB;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACxB,0BAA0B,UAAQ,GACjC,SAAS,YAAY,EAAE,CASzB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,eAAe,GACzB,YAAY,GAAG,SAAS,CAa1B;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAE3D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAMzD"}
+{"version":3,"file":"playerIndex.d.ts","sourceRoot":"","sources":["../../src/functions/playerIndex.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAUxD;;;;;;GAMG;AACH,wBAAgB,aAAa,IAAI,SAAS,YAAY,EAAE,CAUvD;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,YAAY,EAAE,CAM7E;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,WAAW,GACvB,YAAY,GAAG,SAAS,CAG1B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,6BAA6B,UAAQ,GACpC,WAAW,CA8Bb;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,YAAY,GACzB,GAAG,GAAG,SAAS,CAajB;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACxB,0BAA0B,UAAQ,GACjC,SAAS,YAAY,EAAE,CASzB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,eAAe,GACzB,YAAY,GAAG,SAAS,CAa1B;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAE3D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAMzD"}

package/dist/functions/playerIndex.js

@@ -104,15 +104,6 @@ function getPlayerIndex(player, differentiateForgottenAndSoul = false) {
     const seed = collectibleRNG.GetSeed();
     return seed;
 }
-function getPlayerIndexCollectibleType(player, differentiateForgottenAndSoul) {
-    const character = player.GetPlayerType();
-    if (character === isaac_typescript_definitions_1.PlayerType.SOUL) {
-        return differentiateForgottenAndSoul
-            ? isaac_typescript_definitions_1.CollectibleType.INNER_EYE
-            : DEFAULT_COLLECTIBLE_TYPE;
-    }
-    return DEFAULT_COLLECTIBLE_TYPE;
-}
 /**
  * Helper function to return the index of this player with respect to the output of the
  * `Isaac.GetPlayer` method.
@@ -183,3 +174,12 @@ function isFoundSoul(player) {
         && player.Variant === isaac_typescript_definitions_1.PlayerVariant.COOP_BABY
         && player.SubType === isaac_typescript_definitions_1.BabySubType.FOUND_SOUL);
 }
+function getPlayerIndexCollectibleType(player, differentiateForgottenAndSoul) {
+    const character = player.GetPlayerType();
+    if (character === isaac_typescript_definitions_1.PlayerType.SOUL) {
+        return differentiateForgottenAndSoul
+            ? isaac_typescript_definitions_1.CollectibleType.INNER_EYE
+            : DEFAULT_COLLECTIBLE_TYPE;
+    }
+    return DEFAULT_COLLECTIBLE_TYPE;
+}

package/dist/functions/playerIndex.lua

@@ -77,13 +77,6 @@ function ____exports.getPlayerIndex(self, player, differentiateForgottenAndSoul)
     local seed = collectibleRNG:GetSeed()
     return seed
 end
-function getPlayerIndexCollectibleType(self, player, differentiateForgottenAndSoul)
-    local character = player:GetPlayerType()
-    if character == PlayerType.SOUL then
-        return differentiateForgottenAndSoul and CollectibleType.INNER_EYE or DEFAULT_COLLECTIBLE_TYPE
-    end
-    return DEFAULT_COLLECTIBLE_TYPE
-end
 --- This function always excludes players with a non-undefined parent, since they are not real
 -- players (e.g. the Strawman Keeper).
 -- 
@@ -132,6 +125,13 @@ end
 function ____exports.isChildPlayer(self, player)
     return player.Parent ~= nil
 end
+function getPlayerIndexCollectibleType(self, player, differentiateForgottenAndSoul)
+    local character = player:GetPlayerType()
+    if character == PlayerType.SOUL then
+        return differentiateForgottenAndSoul and CollectibleType.INNER_EYE or DEFAULT_COLLECTIBLE_TYPE
+    end
+    return DEFAULT_COLLECTIBLE_TYPE
+end
 DEFAULT_COLLECTIBLE_TYPE = CollectibleType.SAD_ONION
 EXCLUDED_CHARACTERS = __TS__New(ReadonlySet, {PlayerType.ESAU, PlayerType.SOUL_B})
 --- Helper function to get all of the other players in the room besides the one provided. (This