isaacscript-common 1.2.123 → 1.2.126

package/dist/callbacks/itemPickup.lua

@@ -5,8 +5,8 @@ local ____exports = {}
 local hasSubscriptions, postPEffectUpdateReordered, queueEmpty, queueNotEmpty, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____player = require("functions.player")
-local getPlayerIndex = ____player.getPlayerIndex
+local ____playerDataStructures = require("functions.playerDataStructures")
+local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
 local ____DefaultMap = require("types.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
@@ -27,8 +27,7 @@ function postPEffectUpdateReordered(self, player)
     if not hasSubscriptions(nil) then
         return
     end
-    local playerIndex = getPlayerIndex(nil, player)
-    local pickingUpItem = v.run.playerPickingUpItemMap:getAndSetDefault(playerIndex)
+    local pickingUpItem = defaultMapGetPlayer(nil, v.run.playersPickingUpItemMap, player)
     if player:IsItemQueueEmpty() then
         queueEmpty(nil, player, pickingUpItem)
     else
@@ -53,7 +52,7 @@ function queueNotEmpty(self, player, pickingUpItem)
         preItemPickupFire(nil, player, pickingUpItem)
     end
 end
-v = {run = {playerPickingUpItemMap = __TS__New(
+v = {run = {playersPickingUpItemMap = __TS__New(
     DefaultMap,
     function() return newPickingUpItem(nil) end
 )}}

package/dist/callbacks/postCursedTeleport.lua

@@ -9,8 +9,10 @@ local saveDataManager = ____exports.saveDataManager
 local ____flag = require("functions.flag")
 local hasFlag = ____flag.hasFlag
 local ____player = require("functions.player")
-local getPlayerIndex = ____player.getPlayerIndex
 local getPlayerNumHitsRemaining = ____player.getPlayerNumHitsRemaining
+local ____playerDataStructures = require("functions.playerDataStructures")
+local mapGetPlayer = ____playerDataStructures.mapGetPlayer
+local mapSetPlayer = ____playerDataStructures.mapSetPlayer
 local ____postCursedTeleport = require("callbacks.subscriptions.postCursedTeleport")
 local postCursedTeleportFire = ____postCursedTeleport.postCursedTeleportFire
 local postCursedTeleportHasSubscriptions = ____postCursedTeleport.postCursedTeleportHasSubscriptions
@@ -31,8 +33,7 @@ function setDamageFrame(self, tookDamage, damageFlags)
     if player == nil then
         return
     end
-    local playerIndex = getPlayerIndex(nil, player)
-    local trackingArray = v.run.damageFrameMap:get(playerIndex)
+    local trackingArray = mapGetPlayer(nil, v.run.playersDamageFrameMap, player)
     if trackingArray ~= nil then
         local lastDamageFrame, callbackFiredOnThisFrame = table.unpack(trackingArray)
         if lastDamageFrame == gameFrameCount and callbackFiredOnThisFrame then
@@ -42,7 +43,8 @@ function setDamageFrame(self, tookDamage, damageFlags)
     if isPotentialNaturalTeleportFromSacrificeRoom(nil, damageFlags) then
         return
     end
-    v.run.damageFrameMap:set(playerIndex, {gameFrameCount, false})
+    local newTrackingArray = {gameFrameCount, false}
+    mapSetPlayer(nil, v.run.playersDamageFrameMap, player, newTrackingArray)
 end
 function isPotentialNaturalTeleportFromSacrificeRoom(self, damageFlags)
     local game = Game()
@@ -65,10 +67,7 @@ function postPlayerRenderPlayer(self, player)
     if not hasSubscriptions(nil) then
         return
     end
-    local game = Game()
-    local gameFrameCount = game:GetFrameCount()
-    local playerIndex = getPlayerIndex(nil, player)
-    local trackingArray = v.run.damageFrameMap:get(playerIndex)
+    local trackingArray = mapGetPlayer(nil, v.run.playersDamageFrameMap, player)
     if trackingArray == nil then
         return
     end
@@ -79,7 +78,10 @@ function postPlayerRenderPlayer(self, player)
     if callbackActivatedOnThisFrame then
         return
     end
-    v.run.damageFrameMap:set(playerIndex, {gameFrameCount, true})
+    local game = Game()
+    local gameFrameCount = game:GetFrameCount()
+    local newTrackingArray = {gameFrameCount, true}
+    mapSetPlayer(nil, v.run.playersDamageFrameMap, player, newTrackingArray)
     postCursedTeleportFire(nil, player)
 end
 function playerIsTeleportingFromCursedTeleport(self, player, lastDamageFrame)
@@ -102,7 +104,7 @@ function playerIsTeleportingFromCursedTeleport(self, player, lastDamageFrame)
     return false
 end
 v = {
-    run = {damageFrameMap = __TS__New(Map)},
+    run = {playersDamageFrameMap = __TS__New(Map)},
     level = {numSacrifices = 0}
 }
 function ____exports.postCursedTeleportCallbackInit(self, mod)

package/dist/callbacks/postPlayerChangeType.lua

@@ -1,13 +1,15 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local hasSubscriptions, postPEffectUpdateReordered, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____player = require("functions.player")
-local getPlayerIndex = ____player.getPlayerIndex
+local ____playerDataStructures = require("functions.playerDataStructures")
+local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
+local mapSetPlayer = ____playerDataStructures.mapSetPlayer
+local ____DefaultMap = require("types.DefaultMap")
+local DefaultMap = ____DefaultMap.DefaultMap
 local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
 local ModCallbacksCustom = ____ModCallbacksCustom.ModCallbacksCustom
 local ____postPlayerChangeType = require("callbacks.subscriptions.postPlayerChangeType")
@@ -21,18 +23,16 @@ function postPEffectUpdateReordered(self, player)
         return
     end
     local character = player:GetPlayerType()
-    local playerIndex = getPlayerIndex(nil, player)
-    local storedCharacter = v.run.characterMap:get(playerIndex)
-    if storedCharacter == nil then
-        v.run.characterMap:set(playerIndex, character)
-        return
-    end
+    local storedCharacter = defaultMapGetPlayer(nil, v.run.playersCharacterMap, player, character)
     if character ~= storedCharacter then
-        v.run.characterMap:set(playerIndex, character)
+        mapSetPlayer(nil, v.run.playersCharacterMap, player, character)
         postPlayerChangeTypeFire(nil, player, storedCharacter, character)
     end
 end
-v = {run = {characterMap = __TS__New(Map)}}
+v = {run = {playersCharacterMap = __TS__New(
+    DefaultMap,
+    function(____, _key, character) return character end
+)}}
 function ____exports.postPlayerChangeTypeCallbackInit(self, mod)
     saveDataManager(nil, "postPlayerChangeType", v, hasSubscriptions)
     mod:AddCallbackCustom(ModCallbacksCustom.MC_POST_PEFFECT_UPDATE_REORDERED, postPEffectUpdateReordered)

package/dist/callbacks/postPlayerFatalDamage.lua

@@ -6,8 +6,10 @@ local hasSubscriptions, entityTakeDmgPlayer, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____player = require("functions.player")
-local getPlayerIndex = ____player.getPlayerIndex
 local isChildPlayer = ____player.isChildPlayer
+local ____playerDataStructures = require("functions.playerDataStructures")
+local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
+local mapSetPlayer = ____playerDataStructures.mapSetPlayer
 local ____revive = require("functions.revive")
 local isDamageToPlayerFatal = ____revive.isDamageToPlayerFatal
 local willPlayerRevive = ____revive.willPlayerRevive
@@ -32,8 +34,8 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damage
     end
     local game = Game()
     local gameFrameCount = game:GetFrameCount()
-    local playerIndex = getPlayerIndex(nil, player)
-    local lastDamageGameFrame = v.run.playersLastDamageGameFrame:getAndSetDefault(playerIndex, gameFrameCount)
+    local lastDamageGameFrame = defaultMapGetPlayer(nil, v.run.playersLastDamageGameFrame, player)
+    mapSetPlayer(nil, v.run.playersLastDamageGameFrame, player, gameFrameCount)
     if willPlayerRevive(nil, player) then
         return nil
     end
@@ -59,10 +61,7 @@ function entityTakeDmgPlayer(self, tookDamage, damageAmount, damageFlags, damage
     end
     return nil
 end
-v = {run = {playersLastDamageGameFrame = __TS__New(
-    DefaultMap,
-    function(____, _key, gameFrameCount) return gameFrameCount end
-)}}
+v = {run = {playersLastDamageGameFrame = __TS__New(DefaultMap, nil)}}
 function ____exports.postPlayerFatalDamageCallbackInit(self, mod)
     saveDataManager(nil, "postPlayerFatalDamage", v)
     mod:AddCallback(ModCallbacks.MC_ENTITY_TAKE_DMG, entityTakeDmgPlayer, EntityType.ENTITY_PLAYER)

package/dist/callbacks/postPlayerInitLate.lua

@@ -6,8 +6,9 @@ local ____exports = {}
 local hasSubscriptions, postPlayerUpdate, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____player = require("functions.player")
-local getPlayerIndex = ____player.getPlayerIndex
+local ____playerDataStructures = require("functions.playerDataStructures")
+local setAddPlayer = ____playerDataStructures.setAddPlayer
+local setHasPlayer = ____playerDataStructures.setHasPlayer
 local ____postPlayerInitLate = require("callbacks.subscriptions.postPlayerInitLate")
 local postPlayerInitLateFire = ____postPlayerInitLate.postPlayerInitLateFire
 local postPlayerInitLateHasSubscriptions = ____postPlayerInitLate.postPlayerInitLateHasSubscriptions
@@ -18,13 +19,12 @@ function postPlayerUpdate(self, player)
     if not hasSubscriptions(nil) then
         return
     end
-    local playerIndex = getPlayerIndex(nil, player)
-    if not v.run.firedSet:has(playerIndex) then
-        v.run.firedSet:add(playerIndex)
+    if not setHasPlayer(nil, v.run.playersFiredSet, player) then
+        setAddPlayer(nil, v.run.playersFiredSet, player)
         postPlayerInitLateFire(nil, player)
     end
 end
-v = {run = {firedSet = __TS__New(Set)}}
+v = {run = {playersFiredSet = __TS__New(Set)}}
 function ____exports.postPlayerInitLateCallbackInit(self, mod)
     saveDataManager(nil, "postPlayerInitLate", v, hasSubscriptions)
     mod:AddCallback(ModCallbacks.MC_POST_PLAYER_UPDATE, postPlayerUpdate)

package/dist/callbacks/postPurchase.lua

@@ -8,8 +8,9 @@ local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____pickups = require("functions.pickups")
 local getPickups = ____pickups.getPickups
-local ____player = require("functions.player")
-local getPlayerIndex = ____player.getPlayerIndex
+local ____playerDataStructures = require("functions.playerDataStructures")
+local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
+local mapSetPlayer = ____playerDataStructures.mapSetPlayer
 local ____DefaultMap = require("types.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____postPurchase = require("callbacks.subscriptions.postPurchase")
@@ -23,9 +24,8 @@ function postPEffectUpdate(self, player)
         return
     end
     local isHoldingItem = player:IsHoldingItem()
-    local playerIndex = getPlayerIndex(nil, player)
-    local wasHoldingItemOnLastFrame = v.room.playersHoldingItemOnLastFrameMap:getAndSetDefault(playerIndex)
-    v.room.playersHoldingItemOnLastFrameMap:set(playerIndex, isHoldingItem)
+    local wasHoldingItemOnLastFrame = defaultMapGetPlayer(nil, v.room.playersHoldingItemOnLastFrameMap, player)
+    mapSetPlayer(nil, v.room.playersHoldingItemOnLastFrameMap, player, isHoldingItem)
     if not wasHoldingItemOnLastFrame and isHoldingItem then
         playerPickedUpNewItem(nil, player)
     end

package/dist/callbacks/postTransformation.lua

@@ -9,8 +9,8 @@ local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____math = require("functions.math")
 local range = ____math.range
-local ____player = require("functions.player")
-local getPlayerIndex = ____player.getPlayerIndex
+local ____playerDataStructures = require("functions.playerDataStructures")
+local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
 local ____DefaultMap = require("types.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
@@ -25,8 +25,7 @@ function postPEffectUpdateReordered(self, player)
     if not hasSubscriptions(nil) then
         return
     end
-    local playerIndex = getPlayerIndex(nil, player)
-    local playerTransformationsMap = v.run.playersTransformationsMap:getAndSetDefault(playerIndex)
+    local playerTransformationsMap = defaultMapGetPlayer(nil, v.run.playersTransformationsMap, player)
     for ____, playerForm in ipairs(VALID_TRANSFORMATIONS) do
         local hasForm = player:HasPlayerForm(playerForm)
         local storedForm = playerTransformationsMap:getAndSetDefault(playerForm)

package/dist/callbacks/postTrinketBreak.lua

@@ -5,8 +5,8 @@ local ____exports = {}
 local hasSubscriptions, entityTakeDmgPlayer, postPEffectUpdateReordered, TRINKETS_THAT_CAN_BREAK, v
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
-local ____player = require("functions.player")
-local getPlayerIndex = ____player.getPlayerIndex
+local ____playerDataStructures = require("functions.playerDataStructures")
+local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
 local ____DefaultMap = require("types.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____ModCallbacksCustom = require("types.ModCallbacksCustom")
@@ -25,8 +25,7 @@ function entityTakeDmgPlayer(self, tookDamage, _damageAmount, _damageFlags, _dam
     if player == nil then
         return
     end
-    local playerIndex = getPlayerIndex(nil, player)
-    local trinketMap = v.run.playersTrinketMap:getAndSetDefault(playerIndex)
+    local trinketMap = defaultMapGetPlayer(nil, v.run.playersTrinketMap, player)
     for ____, trinketType in ipairs(TRINKETS_THAT_CAN_BREAK) do
         do
             local numTrinketsHeld = player:GetTrinketMultiplier(trinketType)
@@ -48,8 +47,7 @@ function postPEffectUpdateReordered(self, player)
     if not hasSubscriptions(nil) then
         return
     end
-    local playerIndex = getPlayerIndex(nil, player)
-    local trinketMap = v.run.playersTrinketMap:getAndSetDefault(playerIndex)
+    local trinketMap = defaultMapGetPlayer(nil, v.run.playersTrinketMap, player)
     for ____, trinketType in ipairs(TRINKETS_THAT_CAN_BREAK) do
         local numTrinkets = player:GetTrinketMultiplier(trinketType)
         trinketMap:set(trinketType, numTrinkets)

package/dist/constants.d.ts

@@ -63,7 +63,6 @@ export declare const FINAL_STAGE: number;
  * second TMTRAINER item subtracts one from that, and so on.
  */
 export declare const FIRST_GLITCHED_COLLECTIBLE_TYPE: number;
-export declare const GOLDEN_TRINKET_SHIFT: number;
 export declare const GRID_INDEX_CENTER_OF_1X1_ROOM = 67;
 export declare const GAME_FRAMES_PER_SECOND = 30;
 export declare const ISAAC_FRAMES_PER_SECOND = 60;
@@ -105,8 +104,36 @@ export declare const NUM_DIMENSIONS = 3;
 export declare const SECOND_IN_MILLISECONDS = 1000;
 export declare const MINUTE_IN_MILLISECONDS: number;
 export declare const ONE_BY_ONE_ROOM_GRID_SIZE = 135;
+/**
+ * In vanilla, this is part of the `PillColor` enum, but we implement it as a constant in
+ * IsaacScript since it is not a real pill color.
+ *
+ * 1 << 11
+ */
+export declare const PILL_GIANT_FLAG = 2048;
+/**
+ * In vanilla, this is part of the `PillColor` enum, but we implement it as a constant in
+ * IsaacScript since it is not a real pill color.
+ *
+ * (1 << 11) - 1
+ */
+export declare const PILL_COLOR_MASK = 2047;
 export declare const SINGLE_USE_ACTIVE_COLLECTIBLE_TYPES: ReadonlySet<CollectibleType>;
 export declare const STORY_BOSSES: ReadonlySet<EntityType>;
+/**
+ * In vanilla, this is part of the `TrinketType` enum, but we implement it as a constant in
+ * IsaacScript since it is not a real trinket type.
+ *
+ * 1 << 15
+ */
+export declare const TRINKET_GOLDEN_FLAG = 32768;
+/**
+ * In vanilla, this is part of the `TrinketType` enum, but we implement it as a constant in
+ * IsaacScript since it is not a real trinket type.
+ *
+ * (1 << 15) - 1
+ */
+export declare const TRINKET_ID_MASK = 32767;
 /**
  * This is the number of draw coordinates that each heart spans on the UI in the upper left hand
  * corner.

package/dist/constants.lua

@@ -79,7 +79,6 @@ ____exports.FAMILIARS_THAT_SHOOT_PLAYER_TEARS = __TS__New(Set, {
 })
 ____exports.FINAL_STAGE = LevelStage.NUM_STAGES - 1
 ____exports.FIRST_GLITCHED_COLLECTIBLE_TYPE = (1 << 32) - 1
-____exports.GOLDEN_TRINKET_SHIFT = 1 << 15
 ____exports.GRID_INDEX_CENTER_OF_1X1_ROOM = 67
 ____exports.GAME_FRAMES_PER_SECOND = 30
 ____exports.ISAAC_FRAMES_PER_SECOND = 60
@@ -104,6 +103,8 @@ ____exports.NUM_DIMENSIONS = 3
 ____exports.SECOND_IN_MILLISECONDS = 1000
 ____exports.MINUTE_IN_MILLISECONDS = 60 * ____exports.SECOND_IN_MILLISECONDS
 ____exports.ONE_BY_ONE_ROOM_GRID_SIZE = 135
+____exports.PILL_GIANT_FLAG = 2048
+____exports.PILL_COLOR_MASK = 2047
 ____exports.SINGLE_USE_ACTIVE_COLLECTIBLE_TYPES = __TS__New(Set, {
     CollectibleType.COLLECTIBLE_FORGET_ME_NOW,
     CollectibleType.COLLECTIBLE_EDENS_SOUL,
@@ -129,5 +130,7 @@ ____exports.STORY_BOSSES = __TS__New(Set, {
     EntityType.ENTITY_DOGMA,
     EntityType.ENTITY_BEAST
 })
+____exports.TRINKET_GOLDEN_FLAG = 32768
+____exports.TRINKET_ID_MASK = 32767
 ____exports.UI_HEART_WIDTH = 12
 return ____exports

package/dist/features/isPonyActive.lua

@@ -8,16 +8,17 @@ local ____errors = require("errors")
 local getUpgradeErrorMsg = ____errors.getUpgradeErrorMsg
 local ____flag = require("functions.flag")
 local hasFlag = ____flag.hasFlag
-local ____player = require("functions.player")
-local getPlayerIndex = ____player.getPlayerIndex
+local ____playerDataStructures = require("functions.playerDataStructures")
+local setAddPlayer = ____playerDataStructures.setAddPlayer
+local setDeletePlayer = ____playerDataStructures.setDeletePlayer
+local setHasPlayer = ____playerDataStructures.setHasPlayer
 local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 function postPEffectUpdate(self, player)
     local effects = player:GetEffects()
     local entityFlags = player:GetEntityFlags()
     local hasPonyCollectibleEffect = effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_PONY) or effects:HasCollectibleEffect(CollectibleType.COLLECTIBLE_WHITE_PONY)
-    local playerIndex = getPlayerIndex(nil, player)
-    local isPonyActiveOnPreviousFrame = v.run.playersIsPonyActive:has(playerIndex)
+    local isPonyActiveOnPreviousFrame = setHasPlayer(nil, v.run.playersIsPonyActive, player)
     local hasPonyFlags = hasFlag(
         nil,
         entityFlags,
@@ -25,9 +26,9 @@ function postPEffectUpdate(self, player)
     )
     local isPonyActiveNow = hasPonyCollectibleEffect or isPonyActiveOnPreviousFrame and hasPonyFlags
     if isPonyActiveNow then
-        v.run.playersIsPonyActive:add(playerIndex)
+        setAddPlayer(nil, v.run.playersIsPonyActive, player)
     else
-        v.run.playersIsPonyActive:delete(playerIndex)
+        setDeletePlayer(nil, v.run.playersIsPonyActive, player)
     end
 end
 local FEATURE_NAME = "pony activation detector"
@@ -44,7 +45,6 @@ function ____exports.isPonyActive(self, player)
         local msg = getUpgradeErrorMsg(nil, FEATURE_NAME)
         error(msg)
     end
-    local playerIndex = getPlayerIndex(nil, player)
-    return v.run.playersIsPonyActive:has(playerIndex)
+    return setHasPlayer(nil, v.run.playersIsPonyActive, player)
 end
 return ____exports

package/dist/functions/map.d.ts

@@ -1,20 +1,8 @@
 /// <reference types="isaac-typescript-definitions" />
-import { DefaultMap } from "../types/DefaultMap";
-import { PlayerIndex } from "../types/PlayerIndex";
 /** Helper function to copy a map. (You can also use a Map constructor to accomplish this task.) */
 export declare function copyMap<K, V>(oldMap: Map<K, V>): Map<K, V>;
 /**
- * Helper function to make using default maps with an index of `PlayerIndex` easier. Use this
- * instead of the `DefaultMap.getAndSetDefault` method.
+ * Helper function to make using map with `Seed` values easier. Use this instead of manually getting
+ * the current value, incrementing it, and then re-setting it.
  */
-export declare function defaultMapGetPlayer<V>(map: DefaultMap<PlayerIndex, V>, player: EntityPlayer): V | undefined;
-/**
- * Helper function to make using maps with an index of `PlayerIndex` easier. Use this instead of the
- * `Map.get` method.
- */
-export declare function mapGetPlayer<V>(map: Map<PlayerIndex, V>, player: EntityPlayer): V | undefined;
-/**
- * Helper function to make using maps with an index of `PlayerIndex` easier. Use this instead of the
- * `Map.set` method.
- */
-export declare function mapSetPlayer<V>(map: Map<PlayerIndex, V>, player: EntityPlayer, value: V): void;
+export declare function mapGetNextSeed<K>(map: Map<K, Seed>, key: K): Seed | undefined;

package/dist/functions/map.lua

@@ -4,8 +4,8 @@ local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local __TS__Iterator = ____lualib.__TS__Iterator
 local ____exports = {}
-local ____player = require("functions.player")
-local getPlayerIndex = ____player.getPlayerIndex
+local ____random = require("functions.random")
+local nextSeed = ____random.nextSeed
 function ____exports.copyMap(self, oldMap)
     local newMap = __TS__New(Map)
     for ____, ____value in __TS__Iterator(oldMap:entries()) do
@@ -15,16 +15,16 @@ function ____exports.copyMap(self, oldMap)
     end
     return newMap
 end
-function ____exports.defaultMapGetPlayer(self, map, player)
-    local playerIndex = getPlayerIndex(nil, player)
-    return map:getAndSetDefault(playerIndex)
-end
-function ____exports.mapGetPlayer(self, map, player)
-    local playerIndex = getPlayerIndex(nil, player)
-    return map:get(playerIndex)
-end
-function ____exports.mapSetPlayer(self, map, player, value)
-    local playerIndex = getPlayerIndex(nil, player)
-    map:set(playerIndex, value)
+function ____exports.mapGetNextSeed(self, map, key)
+    local seed = map:get(key)
+    if seed == nil then
+        return nil
+    end
+    if seed == 0 then
+        error("The seed map had a value of 0 for the key of: " .. tostring(key))
+    end
+    local newSeed = nextSeed(nil, seed)
+    map:set(key, newSeed)
+    return newSeed
 end
 return ____exports

package/dist/functions/playerDataStructures.d.ts

@@ -0,0 +1,33 @@
+/// <reference types="isaac-typescript-definitions" />
+import { DefaultMap } from "../types/DefaultMap";
+import { PlayerIndex } from "../types/PlayerIndex";
+/**
+ * Helper function to make using default maps with an index of `PlayerIndex` easier. Use this
+ * instead of the `DefaultMap.getAndSetDefault` method if you have a default map of this type.
+ */
+export declare function defaultMapGetPlayer<V, A extends unknown[]>(map: DefaultMap<PlayerIndex, V, A>, player: EntityPlayer, ...extraArgs: A): V;
+/**
+ * Helper function to make using maps with an index of `PlayerIndex` easier. Use this instead of the
+ * `Map.get` method if you have a map of this type.
+ */
+export declare function mapGetPlayer<V>(map: Map<PlayerIndex, V>, player: EntityPlayer): V | undefined;
+/**
+ * Helper function to make using maps with an index of `PlayerIndex` easier. Use this instead of the
+ * `Map.set` method if you have a map of this type.
+ */
+export declare function mapSetPlayer<V>(map: Map<PlayerIndex, V>, player: EntityPlayer, value: V): void;
+/**
+ * Helper function to make using sets with an type of `PlayerIndex` easier. Use this instead of the
+ * `Set.add` method if you have a set of this type.
+ */
+export declare function setAddPlayer(set: Set<PlayerIndex>, player: EntityPlayer): Set<PlayerIndex>;
+/**
+ * Helper function to make using sets with an type of `PlayerIndex` easier. Use this instead of the
+ * `Set.delete` method if you have a set of this type.
+ */
+export declare function setDeletePlayer(set: Set<PlayerIndex>, player: EntityPlayer): boolean;
+/**
+ * Helper function to make using sets with an type of `PlayerIndex` easier. Use this instead of the
+ * `Set.has` method if you have a set of this type.
+ */
+export declare function setHasPlayer(set: Set<PlayerIndex>, player: EntityPlayer): boolean;

package/dist/functions/playerDataStructures.lua

@@ -0,0 +1,32 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____lualib = require("lualib_bundle")
+local Map = ____lualib.Map
+local Set = ____lualib.Set
+local ____exports = {}
+local ____player = require("functions.player")
+local getPlayerIndex = ____player.getPlayerIndex
+function ____exports.defaultMapGetPlayer(self, map, player, ...)
+    local playerIndex = getPlayerIndex(nil, player)
+    return map:getAndSetDefault(playerIndex, ...)
+end
+function ____exports.mapGetPlayer(self, map, player)
+    local playerIndex = getPlayerIndex(nil, player)
+    return map:get(playerIndex)
+end
+function ____exports.mapSetPlayer(self, map, player, value)
+    local playerIndex = getPlayerIndex(nil, player)
+    map:set(playerIndex, value)
+end
+function ____exports.setAddPlayer(self, set, player)
+    local playerIndex = getPlayerIndex(nil, player)
+    return set:add(playerIndex)
+end
+function ____exports.setDeletePlayer(self, set, player)
+    local playerIndex = getPlayerIndex(nil, player)
+    return set:delete(playerIndex)
+end
+function ____exports.setHasPlayer(self, set, player)
+    local playerIndex = getPlayerIndex(nil, player)
+    return set:has(playerIndex)
+end
+return ____exports

package/dist/functions/revive.d.ts

@@ -3,7 +3,7 @@
  * Uses the player's current health and other miscellaneous things to determine if incoming damage
  * will be fatal.
  */
-export declare function isDamageToPlayerFatal(player: EntityPlayer, damageAmount: int, damageSource: EntityRef, lastDamageGameFrame: int): boolean;
+export declare function isDamageToPlayerFatal(player: EntityPlayer, damageAmount: int, damageSource: EntityRef, lastDamageGameFrame: int | null): boolean;
 /**
  * The `EntityPlayer.WillPlayerRevive()` function does not properly account for Mysterious Paper, so
  * use this helper function instead for more robust revival detection.

package/dist/functions/trinketGive.lua

@@ -1,7 +1,7 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
 local ____constants = require("constants")
-local GOLDEN_TRINKET_SHIFT = ____constants.GOLDEN_TRINKET_SHIFT
+local TRINKET_GOLDEN_FLAG = ____constants.TRINKET_GOLDEN_FLAG
 local ____player = require("functions.player")
 local useActiveItemTemp = ____player.useActiveItemTemp
 local ____utils = require("functions.utils")
@@ -18,11 +18,11 @@ function ____exports.temporarilyRemoveTrinket(self, player, trinketType)
         numTrinkets = numTrinkets + 1
     end
     local numSmeltedTrinkets = numTrinkets
-    local trinketWasInSlot1 = trinket1 == trinketType or trinket1 + GOLDEN_TRINKET_SHIFT == trinketType
+    local trinketWasInSlot1 = trinket1 == trinketType or trinket1 + TRINKET_GOLDEN_FLAG == trinketType
     if trinketWasInSlot1 then
         numSmeltedTrinkets = numSmeltedTrinkets - 1
     end
-    local trinketWasInSlot2 = trinket2 == trinketType or trinket2 + GOLDEN_TRINKET_SHIFT == trinketType
+    local trinketWasInSlot2 = trinket2 == trinketType or trinket2 + TRINKET_GOLDEN_FLAG == trinketType
     if trinketWasInSlot2 then
         numSmeltedTrinkets = numSmeltedTrinkets - 1
     end

package/dist/functions/trinkets.lua

@@ -1,7 +1,7 @@
 --[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
 local ____exports = {}
 local ____constants = require("constants")
-local GOLDEN_TRINKET_SHIFT = ____constants.GOLDEN_TRINKET_SHIFT
+local TRINKET_GOLDEN_FLAG = ____constants.TRINKET_GOLDEN_FLAG
 local ____trinketDescriptionMap = require("maps.trinketDescriptionMap")
 local TRINKET_DESCRIPTION_MAP = ____trinketDescriptionMap.TRINKET_DESCRIPTION_MAP
 local ____trinketNameMap = require("maps.trinketNameMap")
@@ -83,7 +83,7 @@ function ____exports.hasOpenTrinketSlot(self, player)
     return openTrinketSlot ~= nil
 end
 function ____exports.isGoldenTrinket(self, trinketType)
-    return trinketType > GOLDEN_TRINKET_SHIFT
+    return trinketType > TRINKET_GOLDEN_FLAG
 end
 function ____exports.smeltTrinket(self, player, trinketType, numTrinkets)
     if numTrinkets == nil then

package/dist/index.d.ts

@@ -41,6 +41,7 @@ export * from "./functions/npc";
 export * from "./functions/pickups";
 export * from "./functions/pills";
 export * from "./functions/player";
+export * from "./functions/playerDataStructures";
 export * from "./functions/playerHealth";
 export * from "./functions/pocketItems";
 export * from "./functions/positionVelocity";

package/dist/index.lua

@@ -337,6 +337,14 @@ do
         end
     end
 end
+do
+    local ____export = require("functions.playerDataStructures")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____export = require("functions.playerHealth")
     for ____exportKey, ____exportValue in pairs(____export) do

package/dist/types/PlayerIndex.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="isaac-typescript-definitions" />
 /**
  * PlayerIndex is a specific type of string; see the documentation for the [[`getPlayerIndex`]]
- * function. Mods can signify that data structures handle EntityPlayers by using this type:
+ * function. Mods can signify that data structures handle EntityPlayers by using this type.
  *
+ * For example:
  * ```
- * const myPlayerMap = new Map<PlayerIndex, string>();
+ * const playersNameMap = new Map<PlayerIndex, string>();
  * ```
  *
  * This type is branded for extra type safety.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.123",
+  "version": "1.2.126",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "@zamiell/typescript-to-lua": "^1.4.2",
-    "isaac-typescript-definitions": "^1.0.360",
+    "isaac-typescript-definitions": "^1.0.361",
     "isaacscript-lint": "^1.0.84",
     "isaacscript-tsconfig": "^1.1.8",
     "typedoc": "^0.22.13",