isaacscript-common 1.2.51 → 1.2.54

package/dist/callbacks/itemPickup.lua

@@ -3,7 +3,7 @@ local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local hasSubscriptions, postPEffectUpdateReordered, queueEmpty, queueNotEmpty, getPickingUpItemForPlayer, v
+local hasSubscriptions, postPEffectUpdateReordered, queueEmpty, resetPickingUpItem, queueNotEmpty, getPickingUpItemForPlayer, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____player = require("functions.player")
@@ -31,20 +31,32 @@ function postPEffectUpdateReordered(self, player)
     end
 end
 function queueEmpty(self, player, pickingUpItem)
-    if pickingUpItem.id ~= CollectibleType.COLLECTIBLE_NULL then
-        postItemPickupFire(nil, player, pickingUpItem)
-        pickingUpItem.id = CollectibleType.COLLECTIBLE_NULL
-        pickingUpItem.type = ItemType.ITEM_NULL
+    if pickingUpItem.subType == CollectibleType.COLLECTIBLE_NULL then
+        return
+    end
+    postItemPickupFire(nil, player, pickingUpItem)
+    resetPickingUpItem(nil, pickingUpItem)
+    local character = player:GetPlayerType()
+    if character == PlayerType.PLAYER_THEFORGOTTEN then
+        local theSoul = player:GetSubPlayer()
+        if theSoul ~= nil then
+            local theSoulPickingUpItem = getPickingUpItemForPlayer(nil, theSoul)
+            resetPickingUpItem(nil, theSoulPickingUpItem)
+        end
     end
 end
+function resetPickingUpItem(self, pickingUpItem)
+    pickingUpItem.itemType = ItemType.ITEM_NULL
+    pickingUpItem.subType = CollectibleType.COLLECTIBLE_NULL
+end
 function queueNotEmpty(self, player, pickingUpItem)
     local queuedItem = player.QueuedItem.Item
     if queuedItem == nil then
         return
     end
-    if queuedItem.Type ~= pickingUpItem.type or queuedItem.ID ~= pickingUpItem.id then
-        pickingUpItem.type = queuedItem.Type
-        pickingUpItem.id = queuedItem.ID
+    if queuedItem.Type ~= pickingUpItem.itemType or queuedItem.ID ~= pickingUpItem.subType then
+        pickingUpItem.itemType = queuedItem.Type
+        pickingUpItem.subType = queuedItem.ID
         preItemPickupFire(nil, player, pickingUpItem)
     end
 end
@@ -52,7 +64,7 @@ function getPickingUpItemForPlayer(self, player)
     local index = getPlayerIndex(nil, player)
     local pickingUpItem = v.run.pickingUpItem:get(index)
     if pickingUpItem == nil then
-        pickingUpItem = {id = CollectibleType.COLLECTIBLE_NULL, type = ItemType.ITEM_NULL}
+        pickingUpItem = {itemType = ItemType.ITEM_NULL, subType = CollectibleType.COLLECTIBLE_NULL}
         v.run.pickingUpItem:set(index, pickingUpItem)
     end
     return pickingUpItem

package/dist/callbacks/subscriptions/postItemPickup.lua

@@ -15,10 +15,10 @@ function ____exports.postItemPickupFire(self, player, pickingUpItem)
         local itemType = ____value[2]
         local itemID = ____value[3]
         do
-            if itemType ~= nil and itemType ~= pickingUpItem.type then
+            if itemType ~= nil and itemType ~= pickingUpItem.itemType then
                 goto __continue5
             end
-            if itemID ~= nil and itemID ~= pickingUpItem.id then
+            if itemID ~= nil and itemID ~= pickingUpItem.subType then
                 goto __continue5
             end
             callback(nil, player, pickingUpItem)

package/dist/callbacks/subscriptions/preItemPickup.lua

@@ -15,10 +15,10 @@ function ____exports.preItemPickupFire(self, player, pickingUpItem)
         local itemType = ____value[2]
         local itemID = ____value[3]
         do
-            if itemType ~= nil and itemType ~= pickingUpItem.type then
+            if itemType ~= nil and itemType ~= pickingUpItem.itemType then
                 goto __continue5
             end
-            if itemID ~= nil and itemID ~= pickingUpItem.id then
+            if itemID ~= nil and itemID ~= pickingUpItem.subType then
                 goto __continue5
             end
             callback(nil, player, pickingUpItem)

package/dist/index.d.ts

@@ -73,6 +73,7 @@ export * from "./maps/trinketNameMap";
 export * from "./sets/cards";
 export * from "./types/AnyEntity";
 export * from "./types/CallbackParametersCustom";
+export * from "./types/DefaultMap";
 export * from "./types/HealthType";
 export * from "./types/JSONDoor";
 export * from "./types/JSONEntity";

package/dist/index.lua

@@ -578,6 +578,14 @@ do
         end
     end
 end
+do
+    local ____export = require("types.DefaultMap")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("types.HealthType")
     for ____exportKey, ____exportValue in pairs(____export) do

package/dist/types/DefaultMap.d.ts

@@ -0,0 +1,26 @@
+declare type FirstArg<K, V> = Iterable<[K, V]> | V | ((k: K) => V);
+declare type SecondArg<K, V> = V | ((k: K) => V);
+/**
+ * An extended Map with a new method of `getAndSetDefault`.
+ *
+ * When instantiating the object, you must specify either a default value or a function that returns
+ * a default value.
+ *
+ * Example:
+ * ```ts
+ * const defaultMap1 = new DefaultMap<string, string>("foo");
+ * const defaultMap2 = new DefaultMap<string, string>(["a", "b", "c"], "bar");
+ * ```
+ */
+export declare class DefaultMap<K, V> extends Map<K, V> {
+    private defaultValue;
+    private defaultValueFactory;
+    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
+     * this method will set the default value for the key and return the default value.
+     */
+    getAndSetDefault(key: K): V | undefined;
+    getDefaultValue(key: K): V;
+}
+export {};

package/dist/types/DefaultMap.lua

@@ -0,0 +1,67 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local Map = ____lualib.Map
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local parseArguments, parseArgumentsOne, parseArgumentsTwo, parseDefaultValueOrDefaultValueFactory
+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}
+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}
+end
+function parseDefaultValueOrDefaultValueFactory(self, arg)
+    local argType = type(arg)
+    if argType == "function" then
+        return {nil, arg}
+    end
+    if argType == "boolean" or argType == "number" or argType == "string" then
+        return {arg, 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.")
+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))
+    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
+    if iterable == nil then
+        Map.prototype.____constructor(self)
+    else
+        Map.prototype.____constructor(self, iterable)
+    end
+    self.defaultValue = defaultValue
+    self.defaultValueFactory = defaultValueFactory
+end
+function DefaultMap.prototype.getAndSetDefault(self, key)
+    if self:has(key) then
+        return self:get(key)
+    end
+    local defaultValue = self:getDefaultValue(key)
+    self:set(key, defaultValue)
+    return defaultValue
+end
+function DefaultMap.prototype.getDefaultValue(self, key)
+    if self.defaultValue ~= nil then
+        return self.defaultValue
+    end
+    if self.defaultValueFactory ~= nil then
+        return self:defaultValueFactory(key)
+    end
+    return error("A DefaultMap was incorrectly instantiated.")
+end
+return ____exports

package/dist/types/PickingUpItem.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="isaac-typescript-definitions" />
 export interface PickingUpItem {
     /** Needed so that we can distinguish between picking up a collectible and a trinket. */
-    type: ItemType;
-    id: int;
+    itemType: ItemType;
+    /** Equal to either the collectible type or the trinket type. */
+    subType: CollectibleType | TrinketType | int;
 }

package/package.json

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