isaacscript-common 3.1.1 → 3.4.0

package/callbacks/customRevive.lua

@@ -1,5 +1,5 @@
 local ____exports = {}
-local hasSubscriptions, postRender, postNewRoom, postPEffectUpdateReordered, checkWaitingForItemAnimation, postPlayerFatalDamage, preBerserkDeath, playerIsAboutToDie, logStateChanged, DEBUG, CustomReviveState, v
+local hasSubscriptions, postRender, postNewRoomReordered, postPEffectUpdateReordered, checkWaitingForItemAnimation, postPlayerFatalDamage, preBerserkDeath, playerIsAboutToDie, logStateChanged, DEBUG, CustomReviveState, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local CollectibleType = ____isaac_2Dtypescript_2Ddefinitions.CollectibleType
 local FamiliarVariant = ____isaac_2Dtypescript_2Ddefinitions.FamiliarVariant
@@ -41,7 +41,7 @@ function postRender(self)
     end
     sfxManager:Stop(SoundEffect.ONE_UP)
 end
-function postNewRoom(self)
+function postNewRoomReordered(self)
     if v.run.state ~= CustomReviveState.WAITING_FOR_ROOM_TRANSITION then
         return
     end
@@ -139,7 +139,7 @@ v = {run = {state = CustomReviveState.DISABLED, revivalType = nil, dyingPlayerIn
 function ____exports.customReviveCallbacksInit(self, mod)
     saveDataManager(nil, "customRevive", v, hasSubscriptions)
     mod:AddCallback(ModCallback.POST_RENDER, postRender)
-    mod:AddCallback(ModCallback.POST_NEW_ROOM, postNewRoom)
+    mod:AddCallbackCustom(ModCallbackCustom.POST_NEW_ROOM_REORDERED, postNewRoomReordered)
     mod:AddCallbackCustom(ModCallbackCustom.POST_PEFFECT_UPDATE_REORDERED, postPEffectUpdateReordered)
     mod:AddCallbackCustom(ModCallbackCustom.POST_PLAYER_FATAL_DAMAGE, postPlayerFatalDamage)
     mod:AddCallbackCustom(ModCallbackCustom.PRE_BERSERK_DEATH, preBerserkDeath)

package/callbacks/postGridEntity.lua

@@ -3,9 +3,11 @@ local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
-local hasSubscriptions, postUpdate, checkGridEntitiesRemoved, checkGridEntityStateChanged, checkNewGridEntity, updateTupleInMap, postNewRoom, v
+local hasSubscriptions, postUpdate, checkGridEntitiesRemoved, checkGridEntityStateChanged, checkNewGridEntity, updateTupleInMap, postNewRoomReordered, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
+local ____ModCallbackCustom = require("enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____gridEntity = require("functions.gridEntity")
@@ -85,7 +87,7 @@ function updateTupleInMap(self, gridEntity)
     local newTuple = {gridEntityType, gridEntityVariant, gridEntity.State}
     v.room.initializedGridEntities:set(gridIndex, newTuple)
 end
-function postNewRoom(self)
+function postNewRoomReordered(self)
     if not hasSubscriptions(nil) then
         return
     end
@@ -102,6 +104,6 @@ v = {room = {initializedGridEntities = __TS__New(Map)}}
 function ____exports.postGridEntityCallbacksInit(self, mod)
     saveDataManager(nil, "postGridEntity", v, hasSubscriptions)
     mod:AddCallback(ModCallback.POST_UPDATE, postUpdate)
-    mod:AddCallback(ModCallback.POST_NEW_ROOM, postNewRoom)
+    mod:AddCallbackCustom(ModCallbackCustom.POST_NEW_ROOM_REORDERED, postNewRoomReordered)
 end
 return ____exports

package/callbacks/postHolyMantleRemoved.lua

@@ -12,7 +12,7 @@ local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____playerDataStructures = require("functions.playerDataStructures")
 local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
-local defaultMapSetPlayer = ____playerDataStructures.defaultMapSetPlayer
+local mapSetPlayer = ____playerDataStructures.mapSetPlayer
 local ____postHolyMantleRemoved = require("callbacks.subscriptions.postHolyMantleRemoved")
 local postHolyMantleRemovedFire = ____postHolyMantleRemoved.postHolyMantleRemovedFire
 local postHolyMantleRemovedHasSubscriptions = ____postHolyMantleRemoved.postHolyMantleRemovedHasSubscriptions
@@ -26,7 +26,7 @@ function postPEffectUpdateReordered(self, player)
     local effects = player:GetEffects()
     local newNumHolyMantles = effects:GetCollectibleEffectNum(CollectibleType.HOLY_MANTLE)
     local oldNumHolyMantles = defaultMapGetPlayer(nil, v.run.playersHolyMantleMap, player)
-    defaultMapSetPlayer(nil, v.run.playersHolyMantleMap, player, newNumHolyMantles)
+    mapSetPlayer(nil, v.run.playersHolyMantleMap, player, newNumHolyMantles)
     if newNumHolyMantles < oldNumHolyMantles then
         postHolyMantleRemovedFire(nil, player, oldNumHolyMantles, newNumHolyMantles)
     end

package/callbacks/postPlayerCollectible.d.ts

@@ -0,0 +1 @@
+export {};

package/callbacks/postPlayerCollectible.lua

@@ -0,0 +1,95 @@
+local ____lualib = require("lualib_bundle")
+local Map = ____lualib.Map
+local __TS__New = ____lualib.__TS__New
+local __TS__Spread = ____lualib.__TS__Spread
+local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
+local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
+local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
+local ____exports = {}
+local hasSubscriptions, postPEffectUpdate, collectibleCountChanged, v
+local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
+local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
+local ____DefaultMap = require("classes.DefaultMap")
+local DefaultMap = ____DefaultMap.DefaultMap
+local ____exports = require("features.saveDataManager.exports")
+local saveDataManager = ____exports.saveDataManager
+local ____player = require("functions.player")
+local getPlayerCollectibleMap = ____player.getPlayerCollectibleMap
+local ____playerDataStructures = require("functions.playerDataStructures")
+local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
+local mapGetPlayer = ____playerDataStructures.mapGetPlayer
+local mapSetPlayer = ____playerDataStructures.mapSetPlayer
+local ____utils = require("functions.utils")
+local ____repeat = ____utils["repeat"]
+local ____postPlayerCollectibleAdded = require("callbacks.subscriptions.postPlayerCollectibleAdded")
+local postPlayerCollectibleAddedFire = ____postPlayerCollectibleAdded.postPlayerCollectibleAddedFire
+local postPlayerCollectibleAddedHasSubscriptions = ____postPlayerCollectibleAdded.postPlayerCollectibleAddedHasSubscriptions
+local ____postPlayerCollectibleRemoved = require("callbacks.subscriptions.postPlayerCollectibleRemoved")
+local postPlayerCollectibleRemovedFire = ____postPlayerCollectibleRemoved.postPlayerCollectibleRemovedFire
+local postPlayerCollectibleRemovedHasSubscriptions = ____postPlayerCollectibleRemoved.postPlayerCollectibleRemovedHasSubscriptions
+function hasSubscriptions(self)
+    return postPlayerCollectibleAddedHasSubscriptions(nil) or postPlayerCollectibleRemovedHasSubscriptions(nil)
+end
+function postPEffectUpdate(self, player)
+    if not hasSubscriptions(nil) then
+        return
+    end
+    local oldCollectibleCount = mapGetPlayer(nil, v.run.playersCollectibleCount, player)
+    local newCollectibleCount = player:GetCollectibleCount()
+    mapSetPlayer(nil, v.run.playersCollectibleCount, player, newCollectibleCount)
+    if oldCollectibleCount == nil then
+        return
+    end
+    local difference = newCollectibleCount - oldCollectibleCount
+    if difference > 0 then
+        collectibleCountChanged(nil, player, difference, true)
+    elseif difference < 0 then
+        collectibleCountChanged(nil, player, difference * -1, false)
+    end
+end
+function collectibleCountChanged(self, player, numCollectiblesChanged, increased)
+    local oldCollectibleMap = defaultMapGetPlayer(nil, v.run.playersCollectibleMap, player, player)
+    local newCollectibleMap = getPlayerCollectibleMap(nil, player)
+    mapSetPlayer(nil, v.run.playersCollectibleMap, player, newCollectibleMap)
+    local ____array_0 = __TS__SparseArrayNew(__TS__Spread(oldCollectibleMap:keys()))
+    __TS__SparseArrayPush(
+        ____array_0,
+        __TS__Spread(newCollectibleMap:keys())
+    )
+    local collectibleTypes = {__TS__SparseArraySpread(____array_0)}
+    local numFired = 0
+    for ____, collectibleType in ipairs(collectibleTypes) do
+        local oldNum = oldCollectibleMap:get(collectibleType) or 0
+        local newNum = newCollectibleMap:get(collectibleType) or 0
+        local difference = math.abs(newNum - oldNum)
+        ____repeat(
+            nil,
+            difference,
+            function()
+                if increased then
+                    postPlayerCollectibleAddedFire(nil, player, collectibleType)
+                else
+                    postPlayerCollectibleRemovedFire(nil, player, collectibleType)
+                end
+                numFired = numFired + 1
+            end
+        )
+        if numFired == numCollectiblesChanged then
+            return
+        end
+    end
+end
+v = {run = {
+    playersCollectibleCount = __TS__New(Map),
+    playersCollectibleMap = __TS__New(
+        DefaultMap,
+        function(____, player) return getPlayerCollectibleMap(nil, player) end
+    )
+}}
+---
+-- @internal
+function ____exports.postPlayerCollectibleCallbackInit(self, mod)
+    saveDataManager(nil, "postPlayerCollectible", v, hasSubscriptions)
+    mod:AddCallback(ModCallback.POST_PEFFECT_UPDATE, postPEffectUpdate)
+end
+return ____exports

package/callbacks/postRoomClearChanged.lua

@@ -1,9 +1,11 @@
 local ____exports = {}
-local hasSubscriptions, postUpdate, postNewRoom, v
+local hasSubscriptions, postUpdate, postNewRoomReordered, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
 local ____cachedClasses = require("cachedClasses")
 local game = ____cachedClasses.game
+local ____ModCallbackCustom = require("enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____postRoomClearChanged = require("callbacks.subscriptions.postRoomClearChanged")
@@ -23,7 +25,7 @@ function postUpdate(self)
         postRoomClearChangedFire(nil, roomClear)
     end
 end
-function postNewRoom(self)
+function postNewRoomReordered(self)
     if not hasSubscriptions(nil) then
         return
     end
@@ -37,6 +39,6 @@ v = {room = {cleared = false}}
 function ____exports.postRoomClearChangedCallbackInit(self, mod)
     saveDataManager(nil, "postRoomClearChanged", v, hasSubscriptions)
     mod:AddCallback(ModCallback.POST_UPDATE, postUpdate)
-    mod:AddCallback(ModCallback.POST_NEW_ROOM, postNewRoom)
+    mod:AddCallbackCustom(ModCallbackCustom.POST_NEW_ROOM_REORDERED, postNewRoomReordered)
 end
 return ____exports

package/callbacks/postSlotInitUpdate.lua

@@ -2,9 +2,11 @@ local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local hasSubscriptions, postUpdate, postNewRoom, checkNewEntity, v
+local hasSubscriptions, postUpdate, postNewRoomReordered, checkNewEntity, v
 local ____isaac_2Dtypescript_2Ddefinitions = require("isaac-typescript-definitions")
 local ModCallback = ____isaac_2Dtypescript_2Ddefinitions.ModCallback
+local ____ModCallbackCustom = require("enums.ModCallbackCustom")
+local ModCallbackCustom = ____ModCallbackCustom.ModCallbackCustom
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____entitySpecific = require("functions.entitySpecific")
@@ -27,7 +29,7 @@ function postUpdate(self)
         postSlotUpdateFire(nil, slot)
     end
 end
-function postNewRoom(self)
+function postNewRoomReordered(self)
     if not hasSubscriptions(nil) then
         return
     end
@@ -48,6 +50,6 @@ v = {room = {initializedSlots = __TS__New(Set)}}
 function ____exports.postSlotInitUpdateCallbacksInit(self, mod)
     saveDataManager(nil, "postSlotInitUpdate", v, hasSubscriptions)
     mod:AddCallback(ModCallback.POST_UPDATE, postUpdate)
-    mod:AddCallback(ModCallback.POST_NEW_ROOM, postNewRoom)
+    mod:AddCallbackCustom(ModCallbackCustom.POST_NEW_ROOM_REORDERED, postNewRoomReordered)
 end
 return ____exports

package/callbacks/subscriptions/postPlayerCollectibleAdded.d.ts

@@ -0,0 +1,6 @@
+import { CollectibleType, PlayerType, PlayerVariant } from "isaac-typescript-definitions";
+export declare type PostPlayerCollectibleAddedRegisterParameters = [
+    callback: (player: EntityPlayer, collectibleType: CollectibleType) => void,
+    playerVariant?: PlayerVariant,
+    character?: PlayerType
+];

package/callbacks/subscriptions/postPlayerCollectibleAdded.lua

@@ -0,0 +1,34 @@
+local ____exports = {}
+local subscriptions = {}
+---
+-- @internal
+function ____exports.postPlayerCollectibleAddedHasSubscriptions(self)
+    return #subscriptions > 0
+end
+---
+-- @internal
+function ____exports.postPlayerCollectibleAddedRegister(self, ...)
+    local args = {...}
+    subscriptions[#subscriptions + 1] = args
+end
+---
+-- @internal
+function ____exports.postPlayerCollectibleAddedFire(self, player, collectibleType)
+    local character = player:GetPlayerType()
+    for ____, ____value in ipairs(subscriptions) do
+        local callback = ____value[1]
+        local playerVariant = ____value[2]
+        local callbackCharacter = ____value[3]
+        do
+            if playerVariant ~= nil and playerVariant ~= player.Variant then
+                goto __continue5
+            end
+            if callbackCharacter ~= nil and callbackCharacter ~= character then
+                goto __continue5
+            end
+            callback(nil, player, collectibleType)
+        end
+        ::__continue5::
+    end
+end
+return ____exports

package/callbacks/subscriptions/postPlayerCollectibleRemoved.d.ts

@@ -0,0 +1,6 @@
+import { CollectibleType, PlayerType, PlayerVariant } from "isaac-typescript-definitions";
+export declare type PostPlayerCollectibleRemovedRegisterParameters = [
+    callback: (player: EntityPlayer, collectibleType: CollectibleType) => void,
+    playerVariant?: PlayerVariant,
+    character?: PlayerType
+];

package/callbacks/subscriptions/postPlayerCollectibleRemoved.lua

@@ -0,0 +1,34 @@
+local ____exports = {}
+local subscriptions = {}
+---
+-- @internal
+function ____exports.postPlayerCollectibleRemovedHasSubscriptions(self)
+    return #subscriptions > 0
+end
+---
+-- @internal
+function ____exports.postPlayerCollectibleRemovedRegister(self, ...)
+    local args = {...}
+    subscriptions[#subscriptions + 1] = args
+end
+---
+-- @internal
+function ____exports.postPlayerCollectibleRemovedFire(self, player, collectibleType)
+    local character = player:GetPlayerType()
+    for ____, ____value in ipairs(subscriptions) do
+        local callback = ____value[1]
+        local playerVariant = ____value[2]
+        local callbackCharacter = ____value[3]
+        do
+            if playerVariant ~= nil and playerVariant ~= player.Variant then
+                goto __continue5
+            end
+            if callbackCharacter ~= nil and callbackCharacter ~= character then
+                goto __continue5
+            end
+            callback(nil, player, collectibleType)
+        end
+        ::__continue5::
+    end
+end
+return ____exports

package/classes/DefaultMap.d.ts

@@ -46,7 +46,7 @@ export declare type FactoryFunction<V, Args extends unknown[]> = (...extraArgs:
  *
  * ```ts
  * // Initializes a new empty DefaultMap with a default value of a new empty array.
- * const factoryFunction = () => [] as ;
+ * const factoryFunction = () => [];
  * const defaultMapWithArray = new DefaultMap<string, string[]>(factoryFunction);
  * ```
  *
@@ -96,7 +96,6 @@ export declare class DefaultMap<Key, Value, Args extends unknown[] = []> extends
      * it will set a default value for the provided key, and then return the default value.
      */
     getAndSetDefault(key: Key, ...extraArgs: Args): Value;
-    getWithoutDefault(key: Key): Value | undefined;
     /**
      * Returns the default value to be used for a new key. (If a factory function was provided during
      * instantiation, this will execute the factory function.)

package/classes/DefaultMap.lua

@@ -46,7 +46,7 @@ local ____exports = {}
 -- 
 -- ```ts
 -- // Initializes a new empty DefaultMap with a default value of a new empty array.
--- const factoryFunction = () => [] as ;
+-- const factoryFunction = () => [];
 -- const defaultMapWithArray = new DefaultMap<string, string[]>(factoryFunction);
 -- ```
 -- 
@@ -111,9 +111,6 @@ function DefaultMap.prototype.getAndSetDefault(self, key, ...)
     self:set(key, defaultValue)
     return defaultValue
 end
-function DefaultMap.prototype.getWithoutDefault(self, key)
-    return Map.prototype.get(self, key)
-end
 function DefaultMap.prototype.getDefaultValue(self, ...)
     if self.defaultValue ~= nil then
         return self.defaultValue

package/constants.d.ts

@@ -82,6 +82,11 @@ export declare const LAST_STAGE: LevelStage;
 /** Corresponds to the maximum value for `EntityPlayer.SamsonBerserkCharge`. */
 export declare const MAX_TAINTED_SAMSON_BERSERK_CHARGE = 100000;
 export declare const NUM_DIMENSIONS: number;
+/**
+ * The pill pool for each run is comprised of one effect for each unique pill color (minus gold and
+ * horse pills.)
+ */
+export declare const NUM_PILLS_IN_POOL: number;
 export declare const SECOND_IN_MILLISECONDS = 1000;
 export declare const MINUTE_IN_MILLISECONDS: number;
 export declare const ONE_BY_ONE_ROOM_GRID_SIZE = 135;

package/constants.lua

@@ -5,6 +5,8 @@ local ItemPoolType = ____isaac_2Dtypescript_2Ddefinitions.ItemPoolType
 local LevelStage = ____isaac_2Dtypescript_2Ddefinitions.LevelStage
 local RoomType = ____isaac_2Dtypescript_2Ddefinitions.RoomType
 local TrinketSlot = ____isaac_2Dtypescript_2Ddefinitions.TrinketSlot
+local ____constantsFirstLast = require("constantsFirstLast")
+local NUM_NORMAL_PILL_COLORS = ____constantsFirstLast.NUM_NORMAL_PILL_COLORS
 local ____enums = require("functions.enums")
 local getEnumLength = ____enums.getEnumLength
 local getLastEnumValue = ____enums.getLastEnumValue
@@ -69,6 +71,9 @@ ____exports.LAST_STAGE = getLastEnumValue(nil, LevelStage)
 --- Corresponds to the maximum value for `EntityPlayer.SamsonBerserkCharge`.
 ____exports.MAX_TAINTED_SAMSON_BERSERK_CHARGE = 100000
 ____exports.NUM_DIMENSIONS = getEnumLength(nil, Dimension) - 1
+--- The pill pool for each run is comprised of one effect for each unique pill color (minus gold and
+-- horse pills.)
+____exports.NUM_PILLS_IN_POOL = NUM_NORMAL_PILL_COLORS
 ____exports.SECOND_IN_MILLISECONDS = 1000
 ____exports.MINUTE_IN_MILLISECONDS = 60 * ____exports.SECOND_IN_MILLISECONDS
 ____exports.ONE_BY_ONE_ROOM_GRID_SIZE = 135