isaacscript-common 1.2.53 → 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/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.53",
+  "version": "1.2.54",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",