isaacscript-common 1.2.290 → 1.2.291

package/dist/callbacks/postItemDischarged.lua

@@ -27,21 +27,28 @@ function postPEffectUpdate(self, player)
     if not hasSubscriptions(nil) then
         return
     end
-    local chargeMap = defaultMapGetPlayer(nil, v.run.playersChargeMap, player)
+    local activeItemMap = defaultMapGetPlayer(nil, v.run.playersActiveItemMap, player)
+    local chargeMap = defaultMapGetPlayer(nil, v.run.playersActiveChargeMap, player)
     for ____, activeSlot in ipairs(getEnumValues(nil, ActiveSlot)) do
         do
+            local currentActiveItem = player:GetActiveItem()
+            local previousActiveItem = activeItemMap:getAndSetDefault(activeSlot, currentActiveItem)
+            activeItemMap:set(activeSlot, currentActiveItem)
+            if currentActiveItem ~= previousActiveItem then
+                goto __continue10
+            end
             local currentCharge = getTotalCharge(nil, player, activeSlot)
             local previousCharge = chargeMap:getAndSetDefault(activeSlot, currentCharge)
             chargeMap:set(activeSlot, currentCharge)
             if playerRecentlyCollidedWithBulb(nil, player) then
-                goto __continue8
+                goto __continue10
             end
             if currentCharge < previousCharge then
                 local collectibleType = player:GetActiveItem(activeSlot)
                 postItemDischargeFire(nil, player, collectibleType, activeSlot)
             end
         end
-        ::__continue8::
+        ::__continue10::
     end
 end
 function playerRecentlyCollidedWithBulb(self, player)
@@ -66,13 +73,22 @@ function preNPCCollision(self, npc, collider)
     mapSetPlayer(nil, v.room.playersBulbLastCollisionFrame, player, gameFrameCount)
 end
 v = {
-    run = {playersChargeMap = __TS__New(
-        DefaultMap,
-        function() return __TS__New(
+    run = {
+        playersActiveItemMap = __TS__New(
+            DefaultMap,
+            function() return __TS__New(
+                DefaultMap,
+                function(____, _playerIndex, collectibleType) return collectibleType end
+            ) end
+        ),
+        playersActiveChargeMap = __TS__New(
             DefaultMap,
-            function(____, _playerIndex, charge) return charge end
-        ) end
-    )},
+            function() return __TS__New(
+                DefaultMap,
+                function(____, _playerIndex, charge) return charge end
+            ) end
+        )
+    },
     room = {playersBulbLastCollisionFrame = __TS__New(Map)}
 }
 function ____exports.postItemDischargeCallbackInit(self, mod)

package/dist/functions/pocketItems.d.ts

@@ -1,5 +1,10 @@
 /// <reference types="isaac-typescript-definitions" />
 import { PocketItemDescription } from "../types/PocketItemDescription";
+/**
+ * Helper function to get the `PocketItemSlot` that the player's pocket active item is in, if any.
+ * Returns undefined if the player does not have a pocket active item.
+ */
+export declare function getActivePocketItemSlot(player: EntityPlayer): PocketItemSlot | undefined;
 export declare function getFirstCardOrPill(player: EntityPlayer): PocketItemDescription | undefined;
 /**
  * Use this helper function as a workaround for the `EntityPlayer.GetPocketItem` method not working

package/dist/functions/pocketItems.lua

@@ -43,6 +43,15 @@ function ____exports.getPocketItems(self, player)
     end
     return pocketItems
 end
+function ____exports.getActivePocketItemSlot(self, player)
+    local pocketItems = ____exports.getPocketItems(nil, player)
+    for ____, pocketItem in ipairs(pocketItems) do
+        if pocketItem.type == PocketItemType.ACTIVE_ITEM then
+            return pocketItem.slot
+        end
+    end
+    return nil
+end
 function ____exports.getFirstCardOrPill(self, player)
     local pocketItems = ____exports.getPocketItems(nil, player)
     return __TS__ArrayFind(

package/package.json

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