isaacscript-common 1.2.123 → 1.2.124

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 ____map = require("functions.map")
+local getDefaultMapPlayer = ____map.getDefaultMapPlayer
 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 = getDefaultMapPlayer(nil, v.run.playerPickingUpItemMap, player)
     if player:IsItemQueueEmpty() then
         queueEmpty(nil, player, pickingUpItem)
     else

package/dist/callbacks/postCursedTeleport.lua

@@ -8,8 +8,10 @@ local ____exports = require("features.saveDataManager.exports")
 local saveDataManager = ____exports.saveDataManager
 local ____flag = require("functions.flag")
 local hasFlag = ____flag.hasFlag
+local ____map = require("functions.map")
+local getMapPlayer = ____map.getMapPlayer
+local setMapPlayer = ____map.setMapPlayer
 local ____player = require("functions.player")
-local getPlayerIndex = ____player.getPlayerIndex
 local getPlayerNumHitsRemaining = ____player.getPlayerNumHitsRemaining
 local ____postCursedTeleport = require("callbacks.subscriptions.postCursedTeleport")
 local postCursedTeleportFire = ____postCursedTeleport.postCursedTeleportFire
@@ -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 = getMapPlayer(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}
+    setMapPlayer(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 = getMapPlayer(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}
+    setMapPlayer(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/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/functions/map.d.ts

@@ -5,16 +5,16 @@ import { PlayerIndex } from "../types/PlayerIndex";
 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.
+ * instead of the `DefaultMap.getAndSetDefault` method if you have a default map of this type.
  */
-export declare function defaultMapGetPlayer<V>(map: DefaultMap<PlayerIndex, V>, player: EntityPlayer): V | undefined;
+export declare function getDefaultMapPlayer<V>(map: DefaultMap<PlayerIndex, V>, player: EntityPlayer): V;
 /**
  * Helper function to make using maps with an index of `PlayerIndex` easier. Use this instead of the
- * `Map.get` method.
+ * `Map.get` method if you have a map of this type.
  */
-export declare function mapGetPlayer<V>(map: Map<PlayerIndex, V>, player: EntityPlayer): V | undefined;
+export declare function getMapPlayer<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.
+ * `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;
+export declare function setMapPlayer<V>(map: Map<PlayerIndex, V>, player: EntityPlayer, value: V): void;

package/dist/functions/map.lua

@@ -15,15 +15,15 @@ function ____exports.copyMap(self, oldMap)
     end
     return newMap
 end
-function ____exports.defaultMapGetPlayer(self, map, player)
+function ____exports.getDefaultMapPlayer(self, map, player)
     local playerIndex = getPlayerIndex(nil, player)
     return map:getAndSetDefault(playerIndex)
 end
-function ____exports.mapGetPlayer(self, map, player)
+function ____exports.getMapPlayer(self, map, player)
     local playerIndex = getPlayerIndex(nil, player)
     return map:get(playerIndex)
 end
-function ____exports.mapSetPlayer(self, map, player, value)
+function ____exports.setMapPlayer(self, map, player, value)
     local playerIndex = getPlayerIndex(nil, player)
     map:set(playerIndex, value)
 end

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.123",
+  "version": "1.2.124",
   "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",