isaacscript-common 1.2.289 → 1.2.290

package/dist/callbacks/postItemDischarged.d.ts

@@ -0,0 +1,2 @@
+import { ModUpgraded } from "../classes/ModUpgraded";
+export declare function postItemDischargeCallbackInit(mod: ModUpgraded): void;

package/dist/callbacks/postItemDischarged.lua

@@ -0,0 +1,83 @@
+local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
+local Map = ____lualib.Map
+local ____exports = {}
+local hasSubscriptions, postPEffectUpdate, playerRecentlyCollidedWithBulb, preNPCCollision, v
+local ____cachedClasses = require("cachedClasses")
+local game = ____cachedClasses.game
+local ____DefaultMap = require("classes.DefaultMap")
+local DefaultMap = ____DefaultMap.DefaultMap
+local ____exports = require("features.saveDataManager.exports")
+local saveDataManager = ____exports.saveDataManager
+local ____charge = require("functions.charge")
+local getTotalCharge = ____charge.getTotalCharge
+local ____playerDataStructures = require("functions.playerDataStructures")
+local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
+local mapGetPlayer = ____playerDataStructures.mapGetPlayer
+local mapSetPlayer = ____playerDataStructures.mapSetPlayer
+local ____utils = require("functions.utils")
+local getEnumValues = ____utils.getEnumValues
+local ____postItemDischarged = require("callbacks.subscriptions.postItemDischarged")
+local postItemDischargeFire = ____postItemDischarged.postItemDischargeFire
+local postItemDischargeHasSubscriptions = ____postItemDischarged.postItemDischargeHasSubscriptions
+function hasSubscriptions(self)
+    return postItemDischargeHasSubscriptions(nil)
+end
+function postPEffectUpdate(self, player)
+    if not hasSubscriptions(nil) then
+        return
+    end
+    local chargeMap = defaultMapGetPlayer(nil, v.run.playersChargeMap, player)
+    for ____, activeSlot in ipairs(getEnumValues(nil, ActiveSlot)) do
+        do
+            local currentCharge = getTotalCharge(nil, player, activeSlot)
+            local previousCharge = chargeMap:getAndSetDefault(activeSlot, currentCharge)
+            chargeMap:set(activeSlot, currentCharge)
+            if playerRecentlyCollidedWithBulb(nil, player) then
+                goto __continue8
+            end
+            if currentCharge < previousCharge then
+                local collectibleType = player:GetActiveItem(activeSlot)
+                postItemDischargeFire(nil, player, collectibleType, activeSlot)
+            end
+        end
+        ::__continue8::
+    end
+end
+function playerRecentlyCollidedWithBulb(self, player)
+    local gameFrameCount = game:GetFrameCount()
+    local bulbLastCollisionFrame = mapGetPlayer(nil, v.room.playersBulbLastCollisionFrame, player)
+    local collidedOnThisFrame = gameFrameCount == bulbLastCollisionFrame
+    local collidedOnLastFrame = gameFrameCount - 1 == bulbLastCollisionFrame
+    return collidedOnThisFrame or collidedOnLastFrame
+end
+function preNPCCollision(self, npc, collider)
+    if not hasSubscriptions(nil) then
+        return
+    end
+    if npc.Variant ~= 5 then
+        return
+    end
+    local player = collider:ToPlayer()
+    if player == nil then
+        return
+    end
+    local gameFrameCount = game:GetFrameCount()
+    mapSetPlayer(nil, v.room.playersBulbLastCollisionFrame, player, gameFrameCount)
+end
+v = {
+    run = {playersChargeMap = __TS__New(
+        DefaultMap,
+        function() return __TS__New(
+            DefaultMap,
+            function(____, _playerIndex, charge) return charge end
+        ) end
+    )},
+    room = {playersBulbLastCollisionFrame = __TS__New(Map)}
+}
+function ____exports.postItemDischargeCallbackInit(self, mod)
+    saveDataManager(nil, "postItemDischarge", v, hasSubscriptions)
+    mod:AddCallback(ModCallbacks.MC_POST_PEFFECT_UPDATE, postPEffectUpdate)
+    mod:AddCallback(ModCallbacks.MC_PRE_NPC_COLLISION, preNPCCollision, EntityType.ENTITY_SUCKER)
+end
+return ____exports

package/dist/callbacks/subscriptions/postItemDischarged.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="isaac-typescript-definitions" />
+export declare type PostItemDischargedCallbackType = (player: EntityPlayer, collectibleType: CollectibleType | int, activeSlot: ActiveSlot) => void;

package/dist/callbacks/subscriptions/postItemDischarged.lua

@@ -0,0 +1,23 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+local subscriptions = {}
+function ____exports.postItemDischargeHasSubscriptions(self)
+    return #subscriptions > 0
+end
+function ____exports.postItemDischargeRegister(self, callback, activeSlot)
+    subscriptions[#subscriptions + 1] = {callback, activeSlot}
+end
+function ____exports.postItemDischargeFire(self, player, collectibleType, activeSlot)
+    for ____, ____value in ipairs(subscriptions) do
+        local callback = ____value[1]
+        local callbackCollectibleType = ____value[2]
+        do
+            if callbackCollectibleType ~= nil and callbackCollectibleType ~= collectibleType then
+                goto __continue5
+            end
+            callback(nil, player, collectibleType, activeSlot)
+        end
+        ::__continue5::
+    end
+end
+return ____exports

package/dist/callbacks/subscriptions/postNPCStateChanged.lua

@@ -4,17 +4,21 @@ local subscriptions = {}
 function ____exports.postNPCStateChangedHasSubscriptions(self)
     return #subscriptions > 0
 end
-function ____exports.postNPCStateChangedRegister(self, callback, entityType)
-    subscriptions[#subscriptions + 1] = {callback, entityType}
+function ____exports.postNPCStateChangedRegister(self, callback, entityType, variant)
+    subscriptions[#subscriptions + 1] = {callback, entityType, variant}
 end
 function ____exports.postNPCStateChangedFire(self, npc, previousState, currentState)
     for ____, ____value in ipairs(subscriptions) do
         local callback = ____value[1]
         local entityType = ____value[2]
+        local variant = ____value[3]
         do
             if entityType ~= nil and entityType ~= npc.Type then
                 goto __continue5
             end
+            if variant ~= nil and variant ~= npc.Variant then
+                goto __continue5
+            end
             callback(nil, npc, previousState, currentState)
         end
         ::__continue5::

package/dist/enums/ModCallbacksCustom.d.ts

@@ -46,21 +46,22 @@ export declare enum ModCallbacksCustom {
     MC_POST_SACRIFICE = 37,
     MC_POST_CURSED_TELEPORT = 38,
     MC_POST_TRINKET_BREAK = 39,
-    MC_POST_SLOT_INIT = 40,
-    MC_POST_SLOT_UPDATE = 41,
-    MC_POST_SLOT_RENDER = 42,
-    MC_POST_SLOT_ANIMATION_CHANGED = 43,
-    MC_POST_SLOT_DESTROYED = 44,
-    MC_POST_FAMILIAR_STATE_CHANGED = 45,
-    MC_POST_PICKUP_STATE_CHANGED = 46,
-    MC_POST_EFFECT_STATE_CHANGED = 47,
-    MC_POST_NPC_STATE_CHANGED = 48,
-    MC_POST_GRID_ENTITY_INIT = 49,
-    MC_POST_GRID_ENTITY_UPDATE = 50,
-    MC_POST_GRID_ENTITY_REMOVE = 51,
-    MC_POST_GRID_ENTITY_STATE_CHANGE = 52,
-    MC_POST_GRID_ENTITY_BROKEN = 53,
-    MC_POST_GRID_ENTITY_COLLISION = 54,
-    MC_POST_BONE_SWING = 55,
-    MC_POST_CUSTOM_DOOR_ENTER = 56
+    MC_POST_ITEM_DISCHARGE = 40,
+    MC_POST_SLOT_INIT = 41,
+    MC_POST_SLOT_UPDATE = 42,
+    MC_POST_SLOT_RENDER = 43,
+    MC_POST_SLOT_ANIMATION_CHANGED = 44,
+    MC_POST_SLOT_DESTROYED = 45,
+    MC_POST_FAMILIAR_STATE_CHANGED = 46,
+    MC_POST_PICKUP_STATE_CHANGED = 47,
+    MC_POST_EFFECT_STATE_CHANGED = 48,
+    MC_POST_NPC_STATE_CHANGED = 49,
+    MC_POST_GRID_ENTITY_INIT = 50,
+    MC_POST_GRID_ENTITY_UPDATE = 51,
+    MC_POST_GRID_ENTITY_REMOVE = 52,
+    MC_POST_GRID_ENTITY_STATE_CHANGE = 53,
+    MC_POST_GRID_ENTITY_BROKEN = 54,
+    MC_POST_GRID_ENTITY_COLLISION = 55,
+    MC_POST_BONE_SWING = 56,
+    MC_POST_CUSTOM_DOOR_ENTER = 57
 }

package/dist/enums/ModCallbacksCustom.lua

@@ -81,38 +81,40 @@ ____exports.ModCallbacksCustom.MC_POST_CURSED_TELEPORT = 38
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_CURSED_TELEPORT] = "MC_POST_CURSED_TELEPORT"
 ____exports.ModCallbacksCustom.MC_POST_TRINKET_BREAK = 39
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_TRINKET_BREAK] = "MC_POST_TRINKET_BREAK"
-____exports.ModCallbacksCustom.MC_POST_SLOT_INIT = 40
+____exports.ModCallbacksCustom.MC_POST_ITEM_DISCHARGE = 40
+____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_ITEM_DISCHARGE] = "MC_POST_ITEM_DISCHARGE"
+____exports.ModCallbacksCustom.MC_POST_SLOT_INIT = 41
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_INIT] = "MC_POST_SLOT_INIT"
-____exports.ModCallbacksCustom.MC_POST_SLOT_UPDATE = 41
+____exports.ModCallbacksCustom.MC_POST_SLOT_UPDATE = 42
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_UPDATE] = "MC_POST_SLOT_UPDATE"
-____exports.ModCallbacksCustom.MC_POST_SLOT_RENDER = 42
+____exports.ModCallbacksCustom.MC_POST_SLOT_RENDER = 43
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_RENDER] = "MC_POST_SLOT_RENDER"
-____exports.ModCallbacksCustom.MC_POST_SLOT_ANIMATION_CHANGED = 43
+____exports.ModCallbacksCustom.MC_POST_SLOT_ANIMATION_CHANGED = 44
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_ANIMATION_CHANGED] = "MC_POST_SLOT_ANIMATION_CHANGED"
-____exports.ModCallbacksCustom.MC_POST_SLOT_DESTROYED = 44
+____exports.ModCallbacksCustom.MC_POST_SLOT_DESTROYED = 45
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_SLOT_DESTROYED] = "MC_POST_SLOT_DESTROYED"
-____exports.ModCallbacksCustom.MC_POST_FAMILIAR_STATE_CHANGED = 45
+____exports.ModCallbacksCustom.MC_POST_FAMILIAR_STATE_CHANGED = 46
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_FAMILIAR_STATE_CHANGED] = "MC_POST_FAMILIAR_STATE_CHANGED"
-____exports.ModCallbacksCustom.MC_POST_PICKUP_STATE_CHANGED = 46
+____exports.ModCallbacksCustom.MC_POST_PICKUP_STATE_CHANGED = 47
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_PICKUP_STATE_CHANGED] = "MC_POST_PICKUP_STATE_CHANGED"
-____exports.ModCallbacksCustom.MC_POST_EFFECT_STATE_CHANGED = 47
+____exports.ModCallbacksCustom.MC_POST_EFFECT_STATE_CHANGED = 48
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_EFFECT_STATE_CHANGED] = "MC_POST_EFFECT_STATE_CHANGED"
-____exports.ModCallbacksCustom.MC_POST_NPC_STATE_CHANGED = 48
+____exports.ModCallbacksCustom.MC_POST_NPC_STATE_CHANGED = 49
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_NPC_STATE_CHANGED] = "MC_POST_NPC_STATE_CHANGED"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_INIT = 49
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_INIT = 50
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_INIT] = "MC_POST_GRID_ENTITY_INIT"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_UPDATE = 50
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_UPDATE = 51
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_UPDATE] = "MC_POST_GRID_ENTITY_UPDATE"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_REMOVE = 51
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_REMOVE = 52
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_REMOVE] = "MC_POST_GRID_ENTITY_REMOVE"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_STATE_CHANGE = 52
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_STATE_CHANGE = 53
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_STATE_CHANGE] = "MC_POST_GRID_ENTITY_STATE_CHANGE"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_BROKEN = 53
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_BROKEN = 54
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_BROKEN] = "MC_POST_GRID_ENTITY_BROKEN"
-____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION = 54
+____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION = 55
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_GRID_ENTITY_COLLISION] = "MC_POST_GRID_ENTITY_COLLISION"
-____exports.ModCallbacksCustom.MC_POST_BONE_SWING = 55
+____exports.ModCallbacksCustom.MC_POST_BONE_SWING = 56
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_BONE_SWING] = "MC_POST_BONE_SWING"
-____exports.ModCallbacksCustom.MC_POST_CUSTOM_DOOR_ENTER = 56
+____exports.ModCallbacksCustom.MC_POST_CUSTOM_DOOR_ENTER = 57
 ____exports.ModCallbacksCustom[____exports.ModCallbacksCustom.MC_POST_CUSTOM_DOOR_ENTER] = "MC_POST_CUSTOM_DOOR_ENTER"
 return ____exports

package/dist/objects/callbackRegisterFunctions.lua

@@ -42,6 +42,8 @@ local ____postGridEntityStateChange = require("callbacks.subscriptions.postGridE
 local postGridEntityStateChangeRegister = ____postGridEntityStateChange.postGridEntityStateChangeRegister
 local ____postGridEntityUpdate = require("callbacks.subscriptions.postGridEntityUpdate")
 local postGridEntityUpdateRegister = ____postGridEntityUpdate.postGridEntityUpdateRegister
+local ____postItemDischarged = require("callbacks.subscriptions.postItemDischarged")
+local postItemDischargeRegister = ____postItemDischarged.postItemDischargeRegister
 local ____postItemPickup = require("callbacks.subscriptions.postItemPickup")
 local postItemPickupRegister = ____postItemPickup.postItemPickupRegister
 local ____postKnifeInitLate = require("callbacks.subscriptions.postKnifeInitLate")
@@ -157,6 +159,7 @@ ____exports.CALLBACK_REGISTER_FUNCTIONS = {
     [ModCallbacksCustom.MC_POST_SACRIFICE] = postSacrificeRegister,
     [ModCallbacksCustom.MC_POST_CURSED_TELEPORT] = postCursedTeleportRegister,
     [ModCallbacksCustom.MC_POST_TRINKET_BREAK] = postTrinketBreakRegister,
+    [ModCallbacksCustom.MC_POST_ITEM_DISCHARGE] = postItemDischargeRegister,
     [ModCallbacksCustom.MC_POST_SLOT_INIT] = postSlotInitRegister,
     [ModCallbacksCustom.MC_POST_SLOT_UPDATE] = postSlotUpdateRegister,
     [ModCallbacksCustom.MC_POST_SLOT_RENDER] = postSlotRenderRegister,

package/dist/types/AddCallbackParametersCustom.d.ts

@@ -20,6 +20,7 @@ import { PostGridEntityInitCallbackType } from "../callbacks/subscriptions/postG
 import { PostGridEntityRemoveCallbackType } from "../callbacks/subscriptions/postGridEntityRemove";
 import { PostGridEntityStateChangeCallbackType } from "../callbacks/subscriptions/postGridEntityStateChange";
 import { PostGridEntityUpdateCallbackType } from "../callbacks/subscriptions/postGridEntityUpdate";
+import { PostItemDischargedCallbackType } from "../callbacks/subscriptions/postItemDischarged";
 import { PostItemPickupCallbackType } from "../callbacks/subscriptions/postItemPickup";
 import { PostKnifeInitLateCallbackType } from "../callbacks/subscriptions/postKnifeInitLate";
 import { PostLaserInitLateCallbackType } from "../callbacks/subscriptions/postLaserInitLate";
@@ -198,6 +199,10 @@ export interface AddCallbackParametersCustom {
         callback: PostTrinketBreakCallbackType,
         trinketType?: TrinketType | int
     ];
+    [ModCallbacksCustom.MC_POST_ITEM_DISCHARGE]: [
+        callback: PostItemDischargedCallbackType,
+        collectibleType?: CollectibleType | int
+    ];
     [ModCallbacksCustom.MC_POST_SLOT_INIT]: [
         callback: PostSlotInitCallbackType,
         slotVariant?: SlotVariant
@@ -232,7 +237,8 @@ export interface AddCallbackParametersCustom {
     ];
     [ModCallbacksCustom.MC_POST_NPC_STATE_CHANGED]: [
         callback: PostNPCStateChangedCallbackType,
-        entityType?: EntityType
+        entityType?: EntityType | int,
+        variant?: int
     ];
     [ModCallbacksCustom.MC_POST_GRID_ENTITY_INIT]: [
         callback: PostGridEntityInitCallbackType,

package/dist/upgradeMod.lua

@@ -32,6 +32,8 @@ local ____postGridEntity = require("callbacks.postGridEntity")
 local postGridEntityCallbacksInit = ____postGridEntity.postGridEntityCallbacksInit
 local ____postGridEntityCollision = require("callbacks.postGridEntityCollision")
 local postGridEntityCollisionInit = ____postGridEntityCollision.postGridEntityCollisionInit
+local ____postItemDischarged = require("callbacks.postItemDischarged")
+local postItemDischargeCallbackInit = ____postItemDischarged.postItemDischargeCallbackInit
 local ____postKnifeInitLate = require("callbacks.postKnifeInitLate")
 local postKnifeInitLateCallbackInit = ____postKnifeInitLate.postKnifeInitLateCallbackInit
 local ____postLaserInitLate = require("callbacks.postLaserInitLate")
@@ -155,6 +157,7 @@ function initCustomCallbacks(self, mod)
     postPurchaseCallbackInit(nil, mod)
     postSacrificeCallbackInit(nil, mod)
     postTrinketBreakCallbackInit(nil, mod)
+    postItemDischargeCallbackInit(nil, mod)
     postCursedTeleportCallbackInit(nil, mod)
     postSlotInitUpdateCallbacksInit(nil, mod)
     postSlotRenderCallbacksInit(nil, mod)

package/package.json

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