isaacscript-common 1.2.56 → 1.2.59

package/dist/callbacks/itemPickup.lua

@@ -52,17 +52,7 @@ function queueNotEmpty(self, player, pickingUpItem)
     end
 end
 function getPickingUpItemForPlayer(self, player)
-    local character = player:GetPlayerType()
-    local playerIndex
-    if character == PlayerType.PLAYER_THESOUL then
-        local forgotten = player:GetSubPlayer()
-        if forgotten == nil then
-            error("Failed")
-        end
-        playerIndex = getPlayerIndex(nil, forgotten)
-    else
-        playerIndex = getPlayerIndex(nil, player)
-    end
+    local playerIndex = getPlayerIndex(nil, player)
     local pickingUpItem = v.run.pickingUpItem:get(playerIndex)
     if pickingUpItem == nil then
         pickingUpItem = newPickingUpItem(nil)

package/dist/callbacks/postPlayerChangeHealth.lua

@@ -25,7 +25,7 @@ function postPEffectUpdateReordered(self, player)
     if not hasSubscriptions(nil) then
         return
     end
-    local playerIndex = getPlayerIndex(nil, player)
+    local playerIndex = getPlayerIndex(nil, player, true)
     local playerHealthMap = v.run.playersHealthMap:get(playerIndex)
     if playerHealthMap == nil then
         playerHealthMap = __TS__New(Map)

package/dist/types/DefaultMap.d.ts

@@ -15,6 +15,10 @@ declare type SecondArg<K, V> = V | ((k: K) => V);
 export declare class DefaultMap<K, V> extends Map<K, V> {
     private defaultValue;
     private defaultValueFactory;
+    /**
+     * See the DefaultMap documentation:
+     * https://isaacscript.github.io/isaacscript-common/classes/types_DefaultMap.DefaultMap.html
+     */
     constructor(iterableOrDefaultValueOrDefaultValueFactory: FirstArg<K, V>, defaultValueOrDefaultValueFactory?: SecondArg<K, V>);
     /**
      * Almost the same as `Map.prototype.get`. However, if the key does not exist in the map, then

package/dist/types/DefaultMap.lua

@@ -9,33 +9,40 @@ function parseArguments(self, firstArg, secondArg)
     return secondArg == nil and parseArgumentsOne(nil, firstArg) or parseArgumentsTwo(nil, firstArg, secondArg)
 end
 function parseArgumentsOne(self, firstArg)
-    local defaultValue, defaultValueFactory = table.unpack(parseDefaultValueOrDefaultValueFactory(nil, firstArg))
-    return {nil, defaultValue, defaultValueFactory}
+    local ____parseDefaultValueOrDefaultValueFactory_result_1 = parseDefaultValueOrDefaultValueFactory(nil, firstArg)
+    local defaultValue = ____parseDefaultValueOrDefaultValueFactory_result_1.defaultValue
+    local defaultValueFactory = ____parseDefaultValueOrDefaultValueFactory_result_1.defaultValueFactory
+    return {iterable = nil, defaultValue = defaultValue, defaultValueFactory = defaultValueFactory}
 end
 function parseArgumentsTwo(self, firstArg, secondArg)
     local firstArgType = type(firstArg)
     if firstArgType ~= "table" then
         error("A DefaultMap constructor with two arguments must have the first argument be an array.")
     end
-    local defaultValue, defaultValueFactory = table.unpack(parseDefaultValueOrDefaultValueFactory(nil, secondArg))
-    return {firstArg, defaultValue, defaultValueFactory}
+    local ____parseDefaultValueOrDefaultValueFactory_result_2 = parseDefaultValueOrDefaultValueFactory(nil, secondArg)
+    local defaultValue = ____parseDefaultValueOrDefaultValueFactory_result_2.defaultValue
+    local defaultValueFactory = ____parseDefaultValueOrDefaultValueFactory_result_2.defaultValueFactory
+    return {iterable = firstArg, defaultValue = defaultValue, defaultValueFactory = defaultValueFactory}
 end
 function parseDefaultValueOrDefaultValueFactory(self, arg)
     local argType = type(arg)
     if argType == "function" then
-        return {nil, arg}
+        return {defaultValue = nil, defaultValueFactory = arg}
     end
     if argType == "boolean" or argType == "number" or argType == "string" then
-        return {arg, nil}
+        return {defaultValue = arg, defaultValueFactory = nil}
     end
-    return error("A DefaultMap must be initialized with a default value that is either a primitive or a function that returns a default value.")
+    return error("A DefaultMap was instantiated with an unknown type of: " .. argType)
 end
 ____exports.DefaultMap = __TS__Class()
 local DefaultMap = ____exports.DefaultMap
 DefaultMap.name = "DefaultMap"
 __TS__ClassExtends(DefaultMap, Map)
 function DefaultMap.prototype.____constructor(self, iterableOrDefaultValueOrDefaultValueFactory, defaultValueOrDefaultValueFactory)
-    local iterable, defaultValue, defaultValueFactory = table.unpack(parseArguments(nil, iterableOrDefaultValueOrDefaultValueFactory, defaultValueOrDefaultValueFactory))
+    local ____parseArguments_result_0 = parseArguments(nil, iterableOrDefaultValueOrDefaultValueFactory, defaultValueOrDefaultValueFactory)
+    local iterable = ____parseArguments_result_0.iterable
+    local defaultValue = ____parseArguments_result_0.defaultValue
+    local defaultValueFactory = ____parseArguments_result_0.defaultValueFactory
     if defaultValue == nil and defaultValueFactory == nil then
         error("A DefaultMap must be instantiated with either a default value or a function that returns a default value.")
     end

package/package.json

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